中配移植高配的LED 和 BEEP

pro/CMakeLists.txt

@@ -198,6 +198,8 @@ include_directories (${PROJECT_SOURCE_DIR}/upgrade)
 include_directories (${PROJECT_SOURCE_DIR}/config)
 include_directories (${PROJECT_SOURCE_DIR}/qrcode)
 include_directories (${PROJECT_SOURCE_DIR}/src)
+include_directories (${PROJECT_SOURCE_DIR}/ui)
+
 include_directories (${SYS_ROOT})
 
 link_directories(${PROJECT_SOURCE_DIR}/snmp/lib_ip)
@@ -236,7 +238,7 @@ set(PDU_SRC_LIST
 
 	${PROJECT_SOURCE_DIR}/src/io.c
 	${PROJECT_SOURCE_DIR}/src/lcd_app.c
-	${PROJECT_SOURCE_DIR}/src/lcd_drv.c
+	#${PROJECT_SOURCE_DIR}/src/lcd_drv.c
 	${PROJECT_SOURCE_DIR}/src/sensor_handle.c
 	${PROJECT_SOURCE_DIR}/src/cJSON.c
 	${PROJECT_SOURCE_DIR}/src/language_common.c
@@ -274,6 +276,18 @@ set(PDU_SRC_LIST
 	${PROJECT_SOURCE_DIR}/src/Cellular.c
 	${PROJECT_SOURCE_DIR}/src/wifi.c
 
+    ${PROJECT_SOURCE_DIR}/ui/font.c
+	${PROJECT_SOURCE_DIR}/ui/lang.c
+	${PROJECT_SOURCE_DIR}/ui/gpio.c
+	${PROJECT_SOURCE_DIR}/ui/beep.c
+	${PROJECT_SOURCE_DIR}/ui/menu.c
+	${PROJECT_SOURCE_DIR}/ui/timer.c
+	${PROJECT_SOURCE_DIR}/ui/key.c
+	${PROJECT_SOURCE_DIR}/ui/led.c
+    ${PROJECT_SOURCE_DIR}/ui/lcd.c
+    ${PROJECT_SOURCE_DIR}/ui/ui.c
+
+
 	${PROJECT_SOURCE_DIR}/modbus/src/modbus.c
 	${PROJECT_SOURCE_DIR}/modbus/src/modbus-data.c
 	${PROJECT_SOURCE_DIR}/modbus/src/modbus-rtu.c

pro/config/cfg.h

@@ -265,6 +265,7 @@
     #define PHASE_GROUP                         8
     #define CHANNEL_DELAY                       8
     #define PROD_POWER_TYPE                     5
+    #define USE_BEEP                            1
     //#define NOT_USE_CONTROL
 #elif (defined PRJ_IP_AC_I1_O1)
     #define LANGUAGE                            0
@@ -275,6 +276,8 @@
     #define PHASE_GROUP                         8
     #define CHANNEL_DELAY                       8
     #define PROD_POWER_TYPE                     0
+    #define USE_BEEP                            1
+    #define USE_LED                             1
 #else
     #error define a PRJ_XXXX please!
 #endif

pro/src/dflt.c

@@ -75,9 +75,12 @@ GlobalDeviceInfo DFLT_PARAS={
         #else
             .flip_time = 0,
         #endif
-
+        #if USE_LED
+            .led = 1,
+        #else
             .led = 0,
-        #ifdef USE_BEEP
+        #endif
+        #if USE_BEEP
             .beep = 1,
         #else
             .beep = 0,

pro/src/sqlite_handle.c

@@ -9,10 +9,8 @@
 #include "mqtt.h"
 #include "file.h"
 #include "sys.h"
-#if (CHIP_TYPE != CHIP_T113s)
 #include "led.h"
 #include "beep.h"
-#endif
 #include "switch_ctrl.h"
 #include "pduMIB_trap.h"
 
@@ -41,13 +39,13 @@ static int utc_to_time(uint32_t *utc, char *time)
     return 0;
 }
 
-#if (CHIP_TYPE != CHIP_T113s)
+
 static void set_led_beep(int led_mode, int beep_mode)
 {
     led_set(led_mode);
     beep_set(beep_mode);
 }
-#endif
+
 
 
 static int get_count(sqlite3 *db, char *table)
@@ -3987,14 +3985,14 @@ int dev_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,GlobalPowerMa
     if (_globalSNMPManager.trapmode == 1)
     send_pduPowerAlarm_trap(1, (void *)&pAlarmTrapinfo);
     // if(_globalSNMPManager.trapmode==1)snmp_alarm_register(1,SA_REPEAT,send_pduPowerAlarm_trap,(void *)&pAlarmTrapinfo);
-#if (CHIP_TYPE != CHIP_T113s)
+
     if(limit_flag) {
         set_led_beep(LED_MODE_WARN2, BEEP_MODE_WARN2);
     }
     else {
         set_led_beep(LED_MODE_WARN1, BEEP_MODE_WARN1);
     }
-#endif
+
     //只管理总体电源阈值超限动作防护
     int ret = -1 ;
     int nchID = __globalPowerTemp->product_ch_id;
@@ -4147,14 +4145,14 @@ int dev_Alarm_T_AC_message(GlobalDeviceManager* globalDeviceManger, GlobalTreeAC
     if (_globalSNMPManager.trapmode == 1)
     send_pduPowerAlarm_trap(1, (void *)&pAlarmTrapinfo);
     // if(_globalSNMPManager.trapmode==1)snmp_alarm_register(1,SA_REPEAT,send_pduPowerAlarm_trap,(void *)&pAlarmTrapinfo);
-#if (CHIP_TYPE != CHIP_T113s)
+
     if(limit_flag) {
         set_led_beep(LED_MODE_WARN2, BEEP_MODE_WARN2);
     }
     else {
         set_led_beep(LED_MODE_WARN1, BEEP_MODE_WARN1);
     }
-#endif
+
     return 0;
 }
 /**
@@ -4325,14 +4323,14 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
     if (_globalSNMPManager.trapmode == 1)
         send_pduSensorAlarm_trap(1, (void *)&pAlarmTrapinfo);
     // if(_globalSNMPManager.trapmode==1)snmp_alarm_register(1,SA_REPEAT,send_pduSensorAlarm_trap,(void *)&pAlarmTrapinfo);
-#if (CHIP_TYPE != CHIP_T113s)
+
     if(limit_flag) {
         set_led_beep(LED_MODE_WARN2, BEEP_MODE_WARN2);
     }
     else {
         set_led_beep(LED_MODE_WARN1, BEEP_MODE_WARN1);
     }
-#endif
+
     return 0;
 }
 int dev_Alarm_Run_message(GlobalDeviceManager* globalDeviceManger, const char* strRunMSG, const char *strOther)

pro/src/sys.c

@@ -1680,9 +1680,8 @@ int sys_restart_app(void)
 }
 
 
-#if (CHIP_TYPE != CHIP_T113s)
 #include "ui.h"
-#endif
+
 int sys_init(void)
 {
     initLogger();
@@ -1694,9 +1693,8 @@ int sys_init(void)
     
     net_init();
 
-#if (CHIP_TYPE != CHIP_T113s)
     ui_init();
-#endif
+
     thread_start(THREAD_ID_POLLING, polling_thread, NULL);
 
     return 0;

pro/ui/beep.c

@@ -15,7 +15,14 @@
     #define LOGE  printf
 #endif
 
-#define BEEP_GPIO               103     //PD7=96+7
+#if (CHIP_TYPE == CHIP_T113s)
+    #define BEEP_GPIO               (128 + 0)
+#else
+    #define BEEP_GPIO               103     /* PD7=96+7 */
+#endif
+
+
+
 #define BEEP_ON_LEVEL           1
 #define BEEP_OFF_LEVEL          0
 
@@ -77,6 +84,8 @@ int beep_init(void)
     
     h->io = gpio_init(BEEP_GPIO, GPIO_OUT);
     h->tmr = timer_init();
+    gpio_set(h->io, BEEP_ON_LEVEL);
+    sleep(1);
     gpio_set(h->io, BEEP_OFF_LEVEL);
     h->mode = -1;
 

pro/ui/key.c

@@ -5,6 +5,7 @@
 #include "key.h"
 #include "gpio.h"
 #include "elog.h"
+#include "cfg.h"
 
 
 #if 1
@@ -20,10 +21,23 @@
 #define KEY_LONG_TIME       500
 #define KEY_PRESS_LEVEL     0
 
+
+#if (CHIP_TYPE != CHIP_T113s)
 #define K1_GPIO             101     //PD5, K1
 #define K2_GPIO             102     //PD6, K2
 #define K3_GPIO             104     //PD8, K3
 
+#else
+
+#define K1_GPIO             160     //PF0, K1
+#define K2_GPIO             161     //PF1, K2
+#define K3_GPIO             162     //PF2, K3
+
+#endif
+
+
+
+
 
 typedef struct {
     int      gpio;

pro/ui/led.c

@@ -4,6 +4,7 @@
 #include "elog.h"
 #include "common.h"
 
+
 #if 1
     #define LOGD  log_d
     #define LOGE  log_e
@@ -12,8 +13,14 @@
     #define LOGE  printf
 #endif
 
-#define LEDR_GPIO  106      //PD10=96+10
-#define LEDG_GPIO  105      //PD9=96+9
+#if (CHIP_TYPE == CHIP_T113s)
+    #define LEDR_GPIO  (192 + 10 )     
+    #define LEDG_GPIO  (192 + 9  )     
+#else
+    #define LEDR_GPIO  106      //PD10=96+10
+    #define LEDG_GPIO  105      //PD9=96+9
+
+#endif
 
 
 typedef struct {

pro/ui/menu.c

@@ -7,7 +7,7 @@
 #include "paras.h"
 #include "cascade.h"
 #include "elog.h"
-#include "thread.h"
+#include "../src/thread.h"
 #include "common.h"
 #include "lang.h"
 #include "timer.h"

pro/ui/timer.c

@@ -1,7 +1,13 @@
 #include <time.h>
-#include <signal.h>
+
 #include <stdlib.h>
 #include "timer.h"
+#include "cfg.h"
+#if (CHIP_TYPE == CHIP_T113s)
+#include "asm-generic/siginfo.h"
+#else
+#include <signal.h>
+#endif
 
 typedef struct {
     timer_t tid;

pro/ui/ui.c

@@ -5,7 +5,7 @@
 #include "beep.h"
 #include "menu.h"
 #include "sys.h"
-#include "thread.h"
+#include "../src/thread.h"
 #include "cfg.h"