guohui hai 1 ano
pai
achega
8fc66b386b
Modificáronse 3 ficheiros con 24 adicións e 75 borrados
  1. 16 2
      pro/config/cfg.h
  2. 0 70
      pro/config/sed54F2VO
  3. 8 3
      pub

+ 16 - 2
pro/config/cfg.h

@@ -14,6 +14,7 @@
 //#define PRJ_ITK_AC_I1_O1
 //#define PRJ_ITK_AC_I3_O1
 //#define PRJ_STSC_I3_O3
+//#define PRJ_STSC_I3_O1_OLED
 //#define PRJ_LITECH_AC_I1_O1
 //#define PRJ_LITECH_AC_I3_O1
 //#define PRJ_INSPUR_DC_I_DC_O
@@ -21,12 +22,12 @@
 //#define PRJ_HYPERTEC_AC_I3_O1
 //#define PRJ_SG_I3_O3
 //#define PRJ_TEST
-//#define PRJ_TEST_AC_I1_O1
+#define PRJ_TEST_AC_I1_O1
 //#define PRJ_TEST_AC_I3_O1
 //#define PRJ_IP_AC_I3_O3
 //#define PRJ_INST2302_DC_OLED
 //#define PRJ_INST2106_AC_I1_O1_OLED
-#define PRJ_IP_AC_I3_O1
+//#define PRJ_IP_AC_I3_O1
 
 //#define USE_BOARD_UPGRADE
 
@@ -121,6 +122,19 @@
     #define CHANNEL_DELAY                       8
 
     #define PROD_POWER_TYPE                     3
+
+#elif defined PRJ_STSC_I3_O1_OLED
+    #define LANGUAGE                            0           //english
+    #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                     5
+    #define USE_UI
+    #define USE_BEEP
 #elif defined PRJ_ANDERSON_AC_I3_O3
     #define LANGUAGE                            1           //english
     #define SMPLE_TIME                          30          //ms

+ 0 - 70
pro/config/sed54F2VO

@@ -1,70 +0,0 @@
-#ifndef __CONFIG_Hx__
-#define __CONFIG_Hx__
-
-
-#define VERSION                                 "V0.0.2"
-#define PROD_ID                                 0
-
-
-/////////////customer demannd//////////////////////
-//#define PRJ_XIAN_AC_I1_O1_P4
-//#define PRJ_XIAN_AC_I1_O1_P8
-//#define PRJ_USASL_AC_I3_O1
-//#define PRJ_USASL_AC_I3_O3
-//#define PRJ_ITK_AC_I1_O1
-//#define PRJ_ITK_AC_I3_O1
-//#define PRJ_STSC_I3_O3
-//#define PRJ_LITECH_AC_I1_O1
-//#define PRJ_LITECH_AC_I3_O1
-//#define PRJ_INSPUR_DC_I_DC_O
-//#define PRJ_ANDERSON_AC_I3_O3
-//#define PRJ_HYPERTEC_AC_I3_O1
-//#define PRJ_SG_I3_O3
-//#define PRJ_TEST
-//#define PRJ_TEST_AC_I1_O1
-//#define PRJ_TEST_AC_I3_O1
-//#define PRJ_IP_AC_I3_O3
-//#define PRJ_INST2302_DC_OLED
-//#define PRJ_INST2106_AC_I1_O1_OLED
-#define PRJ_IP_AC_I3_O1
-
-//#define USE_BOARD_UPGRADE
-
-#define USE_MAIL
-#define MAIL_SEND_BUILTIN
-
-
-#define CHIP_T113i   0
-#define CHIP_T113s   1
-
-
-#define USE_MQTT
-#define MQTT_SERVER_BUILTIN
-
-
-#if (defined PRJ_XIAN_AC_I1_O1_P4) || (defined PRJ_XIAN_AC_I1_O1_P8)  //GOM037
-    #define LANGUAGE                            0           //chinese
-    #define SMPLE_TIME                          30          //ms
-    #define SAVE_TIME                           60000       //ms
-    #define CASCADE_CNT                         0
-
-    #define PHASE_GROUP                         8
-
-    #ifdef PRJ_XIAN_AC_I1_O1_P4
-        //#define GOM037PDU_GC20_04K_125H       //ac_in1_out1_40a_p4_5ch_nologo_cn
-        #define CHANNEL_DELAY                   5
-    #else
-        //#define GOM037_PDU_GC10_08K_80H       //ac_in1_out1_40a_p8_5ch_nologo_cn
-        #define CHANNEL_DELAY                   8
-    #endif
-
-    #define PROD_POWER_TYPE                     0
-    #define IN_INDEX_MAP                        {3,2,0,1}
-#elif (defined PRJ_USASL_AC_I3_O1) || (defined PRJ_USASL_AC_I3_O3)
-    #define LANGUAGE                            1           //english
-    #define SMPLE_TIME                          30          //ms
-    #define SAVE_TIME                           60000       //ms
-    #define CASCADE_CNT                         0
-
-    #define PHASE_GROUP                         8
-    #define CHANNEL_DELAY                       8

+ 8 - 3
pub

@@ -15,12 +15,13 @@
 #PRJS="PRJ_RELEASE_AC_I3_O1"
 #PRJS="PRJ_RELEASE_AC_I3_O3"
 #PRJS="PRJ_STSC_I3_O3"
+#PRJS="PRJ_STSC_I3_O1_OLED"
 #PRJS="PRJ_SG_I3_O3"
 #PRJS="PRJ_TEST"
 #PRJS="PRJ_TEST_AC_I1_O1"
 #PRJS="PRJ_TEST_AC_I3_O1"
 #PRJS="PRJ_INST2302_DC_OLED"
-#PRJS="PRJ_INST2106_AC_I3_O1_OLED"
+#PRJS="PRJ_INST2106_AC_I1_O1_OLED"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
@@ -149,8 +150,12 @@ function do_copy()
         name=dc_in_dc_out_oled
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
         rm -f $appdir/Qt_Test
-    elif [ "$1" = "PRJ_INST2106_AC_I3_O1_OLED" ];then
-        name=ac_in3_out1_inst2106_oled
+    elif [ "$1" = "PRJ_INST2106_AC_I1_O1_OLED" ];then
+        name=ac_in1_out1_inst2106_oled
+        cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
+        rm -f $appdir/Qt_Test
+    elif [ "$1" = "PRJ_STSC_I3_O1_OLED" ];then
+        name=ac_in3_out1_stsc_oled
         cp -f $custdir/logo/logo_neuter.png $appdir/image/logo.png
         rm -f $appdir/Qt_Test
     elif [ "$1" = "PRJ_IP_AC_I3_O1" ];then