Browse Source

港科大3相进单相出。

liyi 10 months ago
parent
commit
230815b647
3 changed files with 28 additions and 2 deletions
  1. 20 2
      pro/config/cfg.h
  2. 4 0
      pro/src/appweb_handle.c
  3. 4 0
      pub

+ 20 - 2
pro/config/cfg.h

@@ -51,9 +51,11 @@
 //#define PRJ_IP_AOSENS_DC_I_O
 //#define PRJ_IP_DEBIAO_AC_I3_O1
 
-//#define  PRJ_IP_GOX001_7_AC_I3_O1
+//#define PRJ_IP_GOX001_7_AC_I3_O1
 
-//#define  PRJ_IP_GOX001_4_AC_I3_O1
+//#define PRJ_IP_GOX001_4_AC_I3_O1
+
+#define PRJ_IP_GANGKEDA_AC_I3_O1
 
 #define USE_MAIL
 #define MAIL_SEND_BUILTIN
@@ -109,6 +111,22 @@
     #define USE_LED                             1
 
     #define BRD_MAX                             6
+#elif (defined PRJ_IP_GANGKEDA_AC_I3_O1)
+
+    #define LANGUAGE                            0           //english
+    #define SMPLE_TIME                          30          //ms
+    #define SAVE_TIME                           60000       //ms
+    #define CASCADE_CNT                         0
+
+    #define PHASE_GROUP                         7
+    #define CHANNEL_DELAY                       7
+    #define PROD_POWER_TYPE                     5
+
+    #define USE_BEEP                            1
+    #define USE_LED                             1
+    #define SENSOR_ACCESS_NONE        
+    #define BRD_MAX                             6
+    #define MONWAY                              3               // 1总检测  2分监分控  3分监不控
 
 #elif (defined PRJ_USASL_AC_I3_O1) || (defined PRJ_USASL_AC_I3_O3)
     #define LANGUAGE                            1           //english

+ 4 - 0
pro/src/appweb_handle.c

@@ -2183,13 +2183,16 @@ static void channelStatusMonitoring(void* conn)
         if (_globalPowerMangerTemp != NULL)
         {
             //1三项2单项3二相
+#ifndef  MONWAY
             if (_globalPowerMangerTemp->_PowerInfo.status== 1)
+
             {
                 ack_str=ctrl_breaker_err_ack_to_json("To change channel phase, turn it off first!");
                 http_reply(conn, 201, ack_str);
                 cJSON_free((void *)ack_str);
                 return;
             }
+#endif
         }
 
         if (__globalDeviceManage._globalDevInfo.product.pwr_type == SmartPDU_Tree_AC_One
@@ -2205,6 +2208,7 @@ static void channelStatusMonitoring(void* conn)
                 cJSON_free((void *)ack_str);
                 return;
             }
+
         }
         if (_globalPowerMangerTemp != NULL)
         {            

+ 4 - 0
pub

@@ -54,6 +54,8 @@ PRJS="PRJ_2503_AC_I1_O1_OLED"
 #PRJS="PRJ_IP_DEBIAO_AC_I3_O1"
 #PRJS="PRJ_IP_GOX001_7_AC_I3_O1"
 #PRJS="PRJ_IP_GOX001_4_AC_I3_O1"
+#PRJS="PRJ_IP_GANGKEDA_AC_I3_O1"
+
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)
 ip_flag=0
@@ -129,6 +131,8 @@ function do_copy()
         name=dc_in_dc_out_release
     elif [ "$1" = "PRJ_RELEASE_AC_I1_O1" ]; then
         name=ac_in1_out1_release
+    elif [ "$1" = "PRJ_IP_GANGKEDA_AC_I3_O1" ];then
+        name=ip_gangkeda_ac_i3_o1
     elif [ "$1" = "PRJ_RELEASE_AC_I3_O1" ]; then
         name=ac_in3_out1_release
     elif [ "$1" = "PRJ_RELEASE_AC_I3_O3" ]; then