高配bug处理

output/t113i/pack_dir/etc/init.d/S90PDUApp

@@ -44,14 +44,15 @@ led_on()
     echo in  > /sys/class/gpio/gpio113/direction
     echo 115 > /sys/class/gpio/export
     echo in  > /sys/class/gpio/gpio115/direction
-    echo 107 > /sys/class/gpio/export
-    echo in  > /sys/class/gpio/gpio107/direction
-    echo 108 > /sys/class/gpio/export
-    echo in  > /sys/class/gpio/gpio108/direction
-    echo 109 > /sys/class/gpio/export
-    echo in  > /sys/class/gpio/gpio109/direction
-    echo 110 > /sys/class/gpio/export
-    echo in  > /sys/class/gpio/gpio110/direction
+    echo 142 > /sys/class/gpio/export
+    echo in  > /sys/class/gpio/gpio142/direction
+    echo 143 > /sys/class/gpio/export
+    echo in  > /sys/class/gpio/gpio143/direction
+    echo 144 > /sys/class/gpio/export
+    echo in  > /sys/class/gpio/gpio144/direction
+    echo 145 > /sys/class/gpio/export
+    echo in  > /sys/class/gpio/gpio145/direction
+
 }
 start_lcd()
 {

pro/config/cfg.h

@@ -67,13 +67,13 @@
 //#define PRJ_RAO_AC_I1_O1
 //#define PRJ_GJ20_07K_2IN_OLED
 //#define PRJ_GJ20_08K_2IN_OLED
-#define PRJ_JUNGONG_AC_I1_O1
+//#define PRJ_JUNGONG_AC_I1_O1
 //#define PRJ_CHANGCUN_20260701_AC_I3_O1_OLED
 
 //#define PRJ_WANGXIAOPING_YS10085_AC_I1_O1_MS
 
-
-
+#define PRJ_JIZHUANGXIANG_AC_I1_O1
+//#define PRJ_WANGXIAOPING_202609010023_AC_I1_O1
 
 #define USE_MAIL
 #define MAIL_SEND_BUILTIN
@@ -298,7 +298,7 @@
 
     #define PROD_POWER_TYPE                     0
 
-    #define BRD_MAX                             3
+    #define BRD_MAX                             5
 
     #define ROTATE 0
 
@@ -735,6 +735,57 @@
     
     #define BRD_MAX                             3
 
+#elif defined PRJ_WANGXIAOPING_202609010023_AC_I1_O1
+
+
+    #define LANGUAGE 1      // //english
+    #define SMPLE_TIME 30   // ms
+    #define SAVE_TIME 60000 // ms
+    #define CASCADE_CNT 0
+    #define ROTATE                              180
+    #define PHASE_GROUP 8
+    #define CHANNEL_DELAY 8
+
+    #define PROD_POWER_TYPE 0
+
+    #define USE_WATCHDOG
+
+    #define USE_BEEP                            1
+    #define USE_LED                             1
+    
+    #define BRD_MAX                             5
+
+    #define SURRPORT_20KHZ_PWM       
+               
+    #define KZBSJ_ENABLE
+
+#elif defined PRJ_JIZHUANGXIANG_AC_I1_O1
+
+
+    #define LANGUAGE 1      // //english
+    #define SMPLE_TIME 30   // ms
+    #define SAVE_TIME 60000 // ms
+    #define CASCADE_CNT 0
+    #define ROTATE                              180
+    #define PHASE_GROUP 8
+    #define CHANNEL_DELAY 8
+
+    #define PROD_POWER_TYPE 0
+
+    #define USE_WATCHDOG
+//    #define USE_LOGO_LITECH
+
+    #define NEW_GPIO
+
+    #define USE_BEEP                            1
+    #define USE_LED                             1
+    
+    #define BRD_MAX                             5
+
+    #define SURRPORT_20KHZ_PWM       
+               
+    #define KZBSJ_ENABLE
+
 
 #elif defined PRJ_IP_AC_I3_O3
     #define LANGUAGE                            0

pro/src/appweb_handle.c

@@ -4815,7 +4815,7 @@ static void communicationManagement(void *conn)
         }
 
         info->baudrate = reqInfo._rs_info.baud;
-        info->addr = atoi(reqInfo._rs_info.addr);
+        info->addr = reqInfo._rs_info.addr;
         
         ///////////////////////////////////////////////////////////////////////////////
         r = cascade_set_modbus(info);

pro/src/json_handle.c

@@ -6397,7 +6397,9 @@ cJSON* json_to_communication_manage(const char* str,_CommunicationManageRequestI
         if(cjson_rs_baud!=NULL)
             _communicationRequestInfo->_rs_info.baud = cjson_rs_baud->valueint;
         if(cjson_rs_addr!=NULL)
-            _communicationRequestInfo->_rs_info.addr = cjson_rs_addr->valuestring ;
+        {
+            _communicationRequestInfo->_rs_info.addr = cjson_rs_addr->valueint ;
+        }
     }
     //4G和wifi配置
     if(strcmp(_communicationRequestInfo->type,"fourgPZSave")==0)

pro/src/json_handle.h

@@ -611,7 +611,7 @@ typedef struct
 {
     char* mode;
     int  baud;
-    char* addr;
+    int  addr;
 }_RS_CommunicationRequestInfo;
 
 /// @brief  4G和WiFi参数配置

pro/src/main.c

@@ -7,6 +7,24 @@ int main(int argc,char* argv[])
 {
 
     system("echo \"V\" > /dev/watchdog");
+
+#ifndef NEW_GPIO
+
+    #if (CHIP_TYPE == CHIP_T113i)
+        system("echo 107 > /sys/class/gpio/export");
+        system("echo in  > /sys/class/gpio/gpio107/direction");
+        system("echo 108 > /sys/class/gpio/export");
+        system("echo in  > /sys/class/gpio/gpio108/direction");
+        system("echo 109 > /sys/class/gpio/export");
+        system("echo in  > /sys/class/gpio/gpio109/direction");
+        system("echo 110 > /sys/class/gpio/export");
+        system("echo in  > /sys/class/gpio/gpio110/direction");
+    #endif
+
+#endif
+
+
+
     sys_init();
     app_init();
 

pub

@@ -21,7 +21,7 @@
 #PRJS="PRJ_TEST"
 #PRJS="PRJ_TEST_AC_I1_O1"
 
-PRJS="PRJ_JUNGONG_AC_I1_O1"
+#PRJS="PRJ_JUNGONG_AC_I1_O1"
 
 #PRJS="PRJ_TEST_AC_I3_O1"
 #PRJS="PRJ_TEST_AC_I3_O3"
@@ -69,9 +69,12 @@ PRJS="PRJ_JUNGONG_AC_I1_O1"
 #PRJS="PRJ_IP_XXXXXXXXXX_AC_I1_O1"
 #PRJS="PRJ_IP_AC_WANGXIAOPIN_I3_O3"
 
+
 #PRJS="PRJ_WANGXIAOPING_YS10085_AC_I1_O1_MS"
 
+PRJS="PRJ_JIZHUANGXIANG_AC_I1_O1"
 
+#PRJS="PRJ_WANGXIAOPING_202609010023_AC_I1_O1"
 
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
@@ -263,6 +266,15 @@ function do_copy()
         cp -f $custdir/db/pdu_dat_malaysia_new_back.db $appdir/pdu_dat.db
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
         cp -f $custdir/qt/rgb_lcd/S90PDUApp      $rootdir/etc/init.d/
+    elif [ "$1" = "PRJ_JIZHUANGXIANG_AC_I1_O1" ];then
+        name=ac_jizhuangxiang_out1_release
+        cp -f $custdir/db/pdu_dat_jizhuangxaing.db $appdir/pdu_dat.db
+        cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
+        cp -f $custdir/qt/rgb_lcd/S90PDUApp      $rootdir/etc/init.d/
+    elif [ "$1" = "PRJ_WANGXIAOPING_202609010023_AC_I1_O1" ];then
+        name=ac_jizhuangxiang_202609010023_out1_release
+        cp -f $custdir/db/pdu_dat_202609010023.db $appdir/pdu_dat.db
+        cp -f $custdir/qt/rgb_lcd/S90PDUApp      $rootdir/etc/init.d/
     elif [ "$1" = "PRJ_2405_AC_I1_O1_OLED" ];then
         name=ac_in1_out1_2405_OLED_release
 	    rm -f $appdir/Qt_Test