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

cust_data/smartPDU_PhList.ini

@@ -0,0 +1,98 @@
+[pdu_board]
+size="24"
+
+[board_1]
+left=2
+right=3
+
+[board_2]
+left=1
+right=3
+
+[board_3]
+left=1
+right=2
+
+[board_4]
+left=1
+right=2
+
+[board_5]
+left=2
+right=3
+
+[board_6]
+left=2
+right=3
+
+[board_7]
+left=2
+right=3
+
+[board_8]
+left=2
+right=3
+
+[board_9]
+left=1
+right=3
+
+[board_10]
+left=1
+right=3
+
+[board_11]
+left=1
+right=3
+
+[board_12]
+left=1
+right=3
+
+[board_13]
+left=1
+right=2
+
+[board_14]
+left=1
+right=2
+
+[board_15]
+left=1
+right=2
+
+[board_16]
+left=1
+right=2
+
+[board_17]
+left=1
+right=2
+
+[board_18]
+left=1
+right=2
+
+[board_19]
+left=1
+right=2
+
+[board_20]
+left=1
+right=2
+
+[board_21]
+left=1
+right=2
+
+[board_22]
+left=1
+right=2
+
+[board_23]
+left=1
+right=2
+
+[board_24]
+left=1
+right=2

pro/config/cfg.h

@@ -24,16 +24,18 @@
 //#define PRJ_TEST
 //#define PRJ_TEST_AC_I1_O1
 //#define PRJ_TEST_AC_I3_O1
-#define PRJ_GOWONE_125A_AC_I3_O1
+//#define PRJ_GOWONE_125A_AC_I3_O1
 //#define PRJ_TEST_AC_I3_O3
 //#define PRJ_ESOUTH_DC_I1_O4_RGB5
 
-//#define PRJ_IP_AC_I3_O3
 //#define PRJ_INST2302_DC_OLED
 //#define PRJ_INST2106_AC_I1_O1_OLED
 //#define PRJ_YST_AC_I1_O1
 //#define PRJ_YUNNAN_AC_I1_O1
 
+#define PRJ_DUALWIRES_AC_I3_O2
+
+//#define PRJ_IP_AC_I3_O3
 //#define PRJ_IP_AC_I3_O1
 //#define PRJ_IP_AC_I1_O1
 //#define PRJ_IP_YUNNAN_AC_I1_O1
@@ -354,6 +356,19 @@
 
     #define USE_Cellular
 
+#elif defined PRJ_DUALWIRES_AC_I3_O2
+    #define LANGUAGE                            0           //chinese
+    #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                     6
+
+    #define BRD_MAX                             12
+    #define MONWAY                              1
 
 #elif (defined PRJ_IP_AC_I3_O1)
     #define LANGUAGE                            0

pro/src/appweb_handle.c

@@ -91,17 +91,12 @@ static char* g_product_type_str[] = {
     "SmartPDU(DC)",
     "SmartPDU(AC)",
     "SmartPDU",
-    "SmartPDU(Three_AC_Tree)",
-    "SmartPDU(Three_AC_One)",
-    "SmartPDU(Three_AC_One_B)",
-};
-static char* g_product_pwr_type_str[] = {
-    "xxx",
-    "直流",
-    "交流单相",
-    "交流三相三出",
-    "交流三相单出",
+    "SmartPDU(AC_3P-IN & 3P-OUT)",
+    "SmartPDU(AC_3P-IN & 1P-OUT)",
+    "SmartPDU(AC_3P-IN & 1P-OUT)",
+    "SmartPDU(AC_3P-IN & 2P-OUT)",
 };
+
 static web_handle_t webHandle;
 static int webSetCallback(void);
 
@@ -5353,7 +5348,7 @@ static void equipmentMintenance(void *conn)
         _over_back_sts_info.product_Code = __globalDeviceManage._globalDevInfo.product.pnumber;
        // _over_back_sts_info.product_type = malloc(32);
         //strcpy(_over_back_sts_info.product_type, "GC Series");
-        _over_back_sts_info.product_type=g_product_type_str[__globalDeviceManage._globalDevInfo.product.type];
+        _over_back_sts_info.product_type=g_product_type_str[__globalDeviceManage._globalDevInfo.product.pwr_type];
         _over_back_sts_info.productVersion = __globalDeviceManage._globalDevInfo.product.version;
  
         _over_back_sts_info.product_sysTime = malloc(32);
@@ -5412,7 +5407,7 @@ static void equipmentMintenance(void *conn)
         breaker_info.product_id = __globalDeviceManage._globalDevInfo.product.id;
         breaker_info.product_name = __globalDeviceManage._globalDevInfo.product.name;
         breaker_info.product_number = __globalDeviceManage._globalDevInfo.product.number;
-        breaker_info.product_type = __globalDeviceManage._globalDevInfo.product.type;
+        breaker_info.product_type = __globalDeviceManage._globalDevInfo.product.pwr_type;
         ack_str = over_breaker_product_list_info_to_json(&__globalDeviceManage,&breaker_info,false);
     }else if(strcmp(_Over_equipment_mintenance.type,"listKgTdQuery")==0)
     {

pub

@@ -18,14 +18,15 @@
 #PRJS="PRJ_SG_I3_O3"
 #PRJS="PRJ_ESOUTH_DC_I1_O4_RGB5"
 #PRJS="PRJ_TEST"
-#PRJS="PRJ_TEST_AC_I1_O1"
+PRJS="PRJ_TEST_AC_I1_O1"
 #PRJS="PRJ_TEST_AC_I3_O1"
 #PRJS="PRJ_TEST_AC_I3_O3"
 #PRJS="PRJ_INST2302_DC_OLED"
 #PRJS="PRJ_INST2106_AC_I1_O1_OLED"
 #PRJS="PRJ_YST_AC_I1_O1"
 #PRJS="PRJ_YUNNAN_AC_I1_O1"
-PRJS="PRJ_GOWONE_125A_AC_I3_O1"
+#PRJS="PRJ_GOWONE_125A_AC_I3_O1"
+#PRJS="PRJ_DUALWIRES_AC_I3_O2"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
@@ -90,6 +91,7 @@ function do_copy()
     cp -f $custdir/db/pdu_dat.db         $appdir/
     cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
     cp -f $custdir/qt/S90PDUApp          $rootdir/etc/init.d/
+    cp -f $custdir/smartPDU_PhList.ini   $appdir/
 
     if [ $ip_flag -eq 1 ]; then
         cp -f $custdir/qt/IP/Qt_Test     $appdir/
@@ -171,10 +173,12 @@ function do_copy()
         name=ip_ac_in1_out1_release
     elif [ "$1" = "PRJ_IP_YUNNAN_AC_I1_O1" ];then
         name=ip_ac_yunnan_in1_out1_release
-   elif [ "$1" = "PRJ_YUNNAN_AC_I1_O1" ];then
+    elif [ "$1" = "PRJ_YUNNAN_AC_I1_O1" ];then
         name=ac_yunnan_in1_out1_release
-   elif [ "$1" = "PRJ_GOWONE_125A_AC_I3_O1" ];then
+    elif [ "$1" = "PRJ_GOWONE_125A_AC_I3_O1" ];then
         name=ac_in3_out1_gowone_125A
+    elif [ "$1" = "PRJ_DUALWIRES_AC_I3_O2" ];then
+        name=ac_DualWires_in3_out2_release
     else
         echo error! $RPJ not define!!!
         exit 1