Просмотр исходного кода

Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

liyuezong 1 год назад
Родитель
Сommit
6f0cfe9351
4 измененных файлов с 18 добавлено и 0 удалено
  1. BIN
      cust_data/db/pdu_dat_ip.db
  2. 12 0
      pro/config/cfg.h
  3. 2 0
      pro/src/sys.c
  4. 4 0
      pub

BIN
cust_data/db/pdu_dat_ip.db


+ 12 - 0
pro/config/cfg.h

@@ -39,6 +39,7 @@
 //#define PRJ_IP_AC_I3_O1
 //#define PRJ_IP_AC_I1_O1
 //#define PRJ_IP_YUNNAN_AC_I1_O1
+//#define PRJ_IP_CHONGQING_AC_I1_O1
 
 #define USE_MAIL
 #define MAIL_SEND_BUILTIN
@@ -404,6 +405,17 @@
     #define USE_BEEP                            1
     #define USE_LED                             1
     #define USE_Cellular
+#elif (defined PRJ_IP_CHONGQING_AC_I1_O1)
+    #define LANGUAGE                            0
+    #define SMPLE_TIME                          30          //ms
+    #define SAVE_TIME                           60000       //ms
+    #define CASCADE_CNT                         0
+
+    #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

+ 2 - 0
pro/src/sys.c

@@ -1544,7 +1544,9 @@ static void* polling_thread(void *arg)
     while(h->quit==0) {
         net_check();
         mem_check();
+#if(CHIP_TYPE != CHIP_T113S)
         send_check();
+#endif
         sleep(1);
     }
     pthread_exit(NULL);

+ 4 - 0
pub

@@ -39,6 +39,7 @@ PRJS="PRJ_TEST_AC_I1_O1"
 #PRJS="PRJ_IP_AC_I3_O1"
 #PRJS="PRJ_IP_AC_I1_O1"
 #PRJS="PRJ_IP_YUNNAN_AC_I1_O1"
+#PRJS="PRJ_IP_CHONGQING_AC_I1_O1"
 
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
@@ -179,6 +180,9 @@ function do_copy()
         name=ac_in3_out1_gowone_125A
     elif [ "$1" = "PRJ_DUALWIRES_AC_I3_O2" ];then
         name=ac_DualWires_in3_out2_release
+    elif [ "$1" = "PRJ_IP_CHONGQING_AC_I1_O1" ];then
+        cp -f $custdir/logo/logo_gowone.png $appdir/image/logo.png
+        name=ip_ac_chongqing_in1_out1_release
     else
         echo error! $RPJ not define!!!
         exit 1