更新打包及配置文件

cust_data/cfg/cfg_anderson.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 //#define PRJ_XIAN_GOM037
@@ -28,6 +27,7 @@
 #define PRJ_ANDERSON
 //#define PRJ_HYPERTEC
 //#define PRJ_RUSSIA_ITK
+//#define PRJ_GENERAL
 //#define PRJ_TEST
 
 
@@ -61,13 +61,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -80,7 +79,7 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 

cust_data/cfg/cfg_general.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 //#define PRJ_XIAN_GOM037
@@ -33,12 +32,16 @@
 
 
 #ifdef PRJ_TEST
+    #define SMTP_SEND_BUILTIN
+    
     #undef MAX_CHN_COUNT
     #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_XIAN_GOM037
+    #define SMTP_SEND_BUILTIN
+    
     #define GOM037_PDU_GC10_08K_80H        //ac_in1_out1_40a_p8_5ch_nologo_cn
     //#define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
   
@@ -50,6 +53,8 @@
 #endif
 
 #ifdef PRJ_USA_SL
+    #define SMTP_SEND_BUILTIN
+    
     #define PDU_GC40_03K_125H           //ac_in3_out3_40a_p8_12ch_nologo_en
 
     //#define PDU_GC60_04K_125H         //ac_in3_out1_40a_p4_24ch_nologo_en
@@ -62,13 +67,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -81,12 +85,13 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_HYPERTEC
     //ac_in3_out1_36ch_nologo_en_hypertec
+    #define SMTP_SEND_BUILTIN
     
     #undef PHASE_GROUP_CNT
     #undef CHANNEL_DELAY_SEC

cust_data/cfg/cfg_hypertec.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 //#define PRJ_XIAN_GOM037
@@ -28,16 +27,21 @@
 //#define PRJ_ANDERSON
 #define PRJ_HYPERTEC
 //#define PRJ_RUSSIA_ITK
+//#define PRJ_GENERAL
 //#define PRJ_TEST
 
 
 #ifdef PRJ_TEST
+    #define SMTP_SEND_BUILTIN
+    
     #undef MAX_CHN_COUNT
     #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_XIAN_GOM037
+    #define SMTP_SEND_BUILTIN
+    
     #define GOM037_PDU_GC10_08K_80H        //ac_in1_out1_40a_p8_5ch_nologo_cn
     //#define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
   
@@ -49,6 +53,8 @@
 #endif
 
 #ifdef PRJ_USA_SL
+    #define SMTP_SEND_BUILTIN
+    
     #define PDU_GC40_03K_125H           //ac_in3_out3_40a_p8_12ch_nologo_en
 
     //#define PDU_GC60_04K_125H         //ac_in3_out1_40a_p4_24ch_nologo_en
@@ -61,13 +67,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -80,12 +85,13 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_HYPERTEC
     //ac_in3_out1_36ch_nologo_en_hypertec
+    #define SMTP_SEND_BUILTIN
     
     #undef PHASE_GROUP_CNT
     #undef CHANNEL_DELAY_SEC

cust_data/cfg/cfg_russia_itk.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 //#define PRJ_XIAN_GOM037
@@ -28,16 +27,21 @@
 //#define PRJ_ANDERSON
 //#define PRJ_HYPERTEC
 #define PRJ_RUSSIA_ITK
+//#define PRJ_GENERAL
 //#define PRJ_TEST
 
 
 #ifdef PRJ_TEST
+    #define SMTP_SEND_BUILTIN
+    
     #undef MAX_CHN_COUNT
     #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_XIAN_GOM037
+    #define SMTP_SEND_BUILTIN
+    
     #define GOM037_PDU_GC10_08K_80H        //ac_in1_out1_40a_p8_5ch_nologo_cn
     //#define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
   
@@ -49,6 +53,8 @@
 #endif
 
 #ifdef PRJ_USA_SL
+    #define SMTP_SEND_BUILTIN
+    
     #define PDU_GC40_03K_125H           //ac_in3_out3_40a_p8_12ch_nologo_en
 
     //#define PDU_GC60_04K_125H         //ac_in3_out1_40a_p4_24ch_nologo_en
@@ -61,13 +67,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -80,12 +85,13 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_HYPERTEC
     //ac_in3_out1_36ch_nologo_en_hypertec
+    #define SMTP_SEND_BUILTIN
     
     #undef PHASE_GROUP_CNT
     #undef CHANNEL_DELAY_SEC

cust_data/cfg/cfg_test.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 //#define PRJ_XIAN_GOM037
@@ -28,16 +27,21 @@
 //#define PRJ_ANDERSON
 //#define PRJ_HYPERTEC
 //#define PRJ_RUSSIA_ITK
+//#define PRJ_GENERAL
 #define PRJ_TEST
 
 
 #ifdef PRJ_TEST
+    #define SMTP_SEND_BUILTIN
+    
     #undef MAX_CHN_COUNT
     #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_XIAN_GOM037
+    #define SMTP_SEND_BUILTIN
+    
     #define GOM037_PDU_GC10_08K_80H        //ac_in1_out1_40a_p8_5ch_nologo_cn
     //#define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
   
@@ -49,6 +53,8 @@
 #endif
 
 #ifdef PRJ_USA_SL
+    #define SMTP_SEND_BUILTIN
+    
     #define PDU_GC40_03K_125H           //ac_in3_out3_40a_p8_12ch_nologo_en
 
     //#define PDU_GC60_04K_125H         //ac_in3_out1_40a_p4_24ch_nologo_en
@@ -61,13 +67,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -80,12 +85,13 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_HYPERTEC
     //ac_in3_out1_36ch_nologo_en_hypertec
+    #define SMTP_SEND_BUILTIN
     
     #undef PHASE_GROUP_CNT
     #undef CHANNEL_DELAY_SEC

cust_data/cfg/cfg_usa_sl.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 //#define PRJ_XIAN_GOM037
@@ -28,16 +27,21 @@
 //#define PRJ_ANDERSON
 //#define PRJ_HYPERTEC
 //#define PRJ_RUSSIA_ITK
+//#define PRJ_GENERAL
 //#define PRJ_TEST
 
 
 #ifdef PRJ_TEST
+    #define SMTP_SEND_BUILTIN
+    
     #undef MAX_CHN_COUNT
     #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_XIAN_GOM037
+    #define SMTP_SEND_BUILTIN
+    
     #define GOM037_PDU_GC10_08K_80H        //ac_in1_out1_40a_p8_5ch_nologo_cn
     //#define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
   
@@ -49,6 +53,8 @@
 #endif
 
 #ifdef PRJ_USA_SL
+    #define SMTP_SEND_BUILTIN
+    
     #define PDU_GC40_03K_125H           //ac_in3_out3_40a_p8_12ch_nologo_en
 
     //#define PDU_GC60_04K_125H         //ac_in3_out1_40a_p4_24ch_nologo_en
@@ -61,13 +67,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -80,12 +85,13 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_HYPERTEC
     //ac_in3_out1_36ch_nologo_en_hypertec
+    #define SMTP_SEND_BUILTIN
     
     #undef PHASE_GROUP_CNT
     #undef CHANNEL_DELAY_SEC

cust_data/cfg/cfg_xian_p4.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 #define PRJ_XIAN_GOM037
@@ -28,16 +27,21 @@
 //#define PRJ_ANDERSON
 //#define PRJ_HYPERTEC
 //#define PRJ_RUSSIA_ITK
+//#define PRJ_GENERAL
 //#define PRJ_TEST
 
 
 #ifdef PRJ_TEST
+    #define SMTP_SEND_BUILTIN
+    
     #undef MAX_CHN_COUNT
     #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_XIAN_GOM037
+    #define SMTP_SEND_BUILTIN
+    
     //#define GOM037_PDU_GC10_08K_80H        //ac_in1_out1_40a_p8_5ch_nologo_cn
     #define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
   
@@ -49,6 +53,8 @@
 #endif
 
 #ifdef PRJ_USA_SL
+    #define SMTP_SEND_BUILTIN
+    
     #define PDU_GC40_03K_125H           //ac_in3_out3_40a_p8_12ch_nologo_en
 
     //#define PDU_GC60_04K_125H         //ac_in3_out1_40a_p4_24ch_nologo_en
@@ -61,13 +67,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -80,12 +85,13 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_HYPERTEC
     //ac_in3_out1_36ch_nologo_en_hypertec
+    #define SMTP_SEND_BUILTIN
     
     #undef PHASE_GROUP_CNT
     #undef CHANNEL_DELAY_SEC

cust_data/cfg/cfg_xian_p8.h

@@ -20,7 +20,6 @@
 #define CHANNEL_DELAY_SEC               8
 
 #define USE_SMTP
-#define SMTP_SEND_BUILTIN
 
 /////////////customer demannd//////////////////////
 #define PRJ_XIAN_GOM037
@@ -28,16 +27,21 @@
 //#define PRJ_ANDERSON
 //#define PRJ_HYPERTEC
 //#define PRJ_RUSSIA_ITK
+//#define PRJ_GENERAL
 //#define PRJ_TEST
 
 
 #ifdef PRJ_TEST
+    #define SMTP_SEND_BUILTIN
+    
     #undef MAX_CHN_COUNT
     #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_XIAN_GOM037
+    #define SMTP_SEND_BUILTIN
+    
     #define GOM037_PDU_GC10_08K_80H        //ac_in1_out1_40a_p8_5ch_nologo_cn
     //#define GOM037PDU_GC20_04K_125H        //ac_in1_out1_40a_p4_5ch_nologo_cn
   
@@ -49,6 +53,8 @@
 #endif
 
 #ifdef PRJ_USA_SL
+    #define SMTP_SEND_BUILTIN
+    
     #define PDU_GC40_03K_125H           //ac_in3_out3_40a_p8_12ch_nologo_en
 
     //#define PDU_GC60_04K_125H         //ac_in3_out1_40a_p4_24ch_nologo_en
@@ -61,13 +67,12 @@
 
 
 #ifdef PRJ_ANDERSON
-    #define USE_MQTT
+    //#define USE_MQTT
     //#define MQTT_SERVER_BUILTIN
 
     #define SMTP_SEND_BUILTIN
 
-
-    //#define USE_NETSWITCH
+    #define USE_NETSWITCH
 
     #define SW_STATIC_PORT_START
     #define SW_PORT_INDEX_START         0
@@ -80,12 +85,13 @@
     #endif
     
     #undef MAX_CHN_COUNT
-    #define MAX_CHN_COUNT               4//24
+    #define MAX_CHN_COUNT               24
 #endif
 
 
 #ifdef PRJ_HYPERTEC
     //ac_in3_out1_36ch_nologo_en_hypertec
+    #define SMTP_SEND_BUILTIN
     
     #undef PHASE_GROUP_CNT
     #undef CHANNEL_DELAY_SEC

pub

@@ -15,7 +15,9 @@
 #PRJ="PRJ_GOWONE_AC_I3_O3"
 #PRJ="PRJ_TEST"
 
-PRJS="PRJ_ITK_AC_I1_O1 PRJ_ITK_AC_I3_O1"
+#PRJS="PRJ_ITK_AC_I1_O1 PRJ_ITK_AC_I3_O1 PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3 PRJ_XIAN_P4 PRJ_XIAN_P8"
+#PRJS="PRJ_TEST"
+PRJS="PRJ_ANDERSON"
 
 fulldir=$(realpath $0)
 curdir=$(dirname $fulldir)