1、增加byd项目配置

pro/config/cfg.h

@@ -24,17 +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_Malaysia_AC_I3_O1
 //#define PRJ_TEST_AC_I3_O3
 //#define PRJ_ESOUTH_DC_I1_O4_RGB5
-#define PRJ_CHANGCHUN_AC_I1_O1_OLED
+//#define PRJ_CHANGCHUN_AC_I1_O1_OLED
 
 //#define PRJ_TIDA_AC_I3_O1
 //#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_BYD_UPS_AC_I1_O1
 //#define PRJ_DUALWIRES_AC_I3_O2
 //#define PRJ_2405_AC_I1_O1_OLED
 
@@ -445,8 +446,8 @@
     #define SAVE_TIME                           60000       //ms
     #define CASCADE_CNT                         0
 
-    #define PHASE_GROUP                         6
-    #define CHANNEL_DELAY                       6
+    #define PHASE_GROUP                         8
+    #define CHANNEL_DELAY                       8
 
     #define PROD_POWER_TYPE                     0
 	
@@ -457,7 +458,26 @@
 
     #define USE_Cellular
 
-    #define BRD_MAX                             8
+    #define BRD_MAX                             5
+    #define ROTATE                              270
+
+#elif defined PRJ_BYD_UPS_AC_I1_O1
+    #define LANGUAGE                            0           //chinese
+    #define SMPLE_TIME                          30          //ms
+    #define SAVE_TIME                           60000       //ms
+    #define CASCADE_CNT                         0
+
+    #define PHASE_GROUP                         6
+    #define CHANNEL_DELAY                       6
+
+    #define PROD_POWER_TYPE                     0
+	
+	#define USE_BREAKER_ALARM
+
+    #define USE_BEEP                            1
+    #define USE_LED                             1
+
+    #define BRD_MAX                             5
 
 #elif defined PRJ_DUALWIRES_AC_I3_O2
     #define LANGUAGE                            0           //chinese

pro/src/sqlite_handle.c

@@ -4304,25 +4304,25 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         switch (_AlarmType)
         {
         case SENSOR_VAL1_UPPER:
-            sprintf(AlarmText, "%s |$温度$| $%s$", __globalPowerTemp->sensor_name, language_alarm_Up[languagesID]);
+            sprintf(AlarmText, "%s |$温度$|$%s$", __globalPowerTemp->sensor_name, language_alarm_Up[languagesID]);
             if(ss->Cur_sensor_info.val1>LIMIT_HOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
             }
             break;
         case SENSOR_VAL1_LOWER:
-            sprintf(AlarmText, "%s |$温度$| $%s$", __globalPowerTemp->sensor_name, language_alarm_Down[languagesID]);
+            sprintf(AlarmText, "%s |$温度$|$%s$", __globalPowerTemp->sensor_name, language_alarm_Down[languagesID]);
             if(ss->Cur_sensor_info.val1<LIMIT_LOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
             }
             break;
         case SENSOR_VAL2_UPPER:
-            sprintf(AlarmText, "%s |$湿度$| $%s$", __globalPowerTemp->sensor_name, language_alarm_Up[languagesID]);
+            sprintf(AlarmText, "%s |$湿度$|$%s$", __globalPowerTemp->sensor_name, language_alarm_Up[languagesID]);
             if(ss->Cur_sensor_info.val2>LIMIT_HOF(ss->over_manager.sensor_val2_upper_threshold)) {
                 limit_flag = 1;
             }
             break;
         case SENSOR_VAL2_LOWER:
-            sprintf(AlarmText, "%s |$湿度$| $%s$", __globalPowerTemp->sensor_name, language_alarm_Down[languagesID]);
+            sprintf(AlarmText, "%s |$湿度$|$%s$", __globalPowerTemp->sensor_name, language_alarm_Down[languagesID]);
             if(ss->Cur_sensor_info.val2<LIMIT_LOF(ss->over_manager.sensor_val2_upper_threshold)) {
                 limit_flag = 1;
             }
@@ -4339,13 +4339,13 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         switch (_AlarmType)
         {
         case SENSOR_VAL1_UPPER:
-            sprintf(AlarmText, "%s |$温度$| $%s$", __globalPowerTemp->sensor_name, language_alarm_Up[languagesID]);
+            sprintf(AlarmText, "%s |$温度$|$%s$", __globalPowerTemp->sensor_name, language_alarm_Up[languagesID]);
             if(ss->Cur_sensor_info.val1>LIMIT_HOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
             }
             break;
         case SENSOR_VAL1_LOWER:
-            sprintf(AlarmText, "%s |$温度$| $%s$", __globalPowerTemp->sensor_name, language_alarm_Down[languagesID]);
+            sprintf(AlarmText, "%s |$温度$|$%s$", __globalPowerTemp->sensor_name, language_alarm_Down[languagesID]);
             if(ss->Cur_sensor_info.val1<LIMIT_LOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
             }

pub

@@ -26,12 +26,13 @@
 #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_DUALWIRES_AC_I3_O2"
+#PRJS="PRJ_GOWONE_125A_AC_I3_O1"
 #PRJS="PRJ_Malaysia_AC_I3_O1"
 #PRJS="PRJ_2405_AC_I1_O1_OLED"
-PRJS="PRJ_CHANGCHUN_AC_I1_O1_OLED"
+#PRJS="PRJ_CHANGCHUN_AC_I1_O1_OLED"
 #PRJS="PRJ_TIDA_AC_I3_O1"
+PRJS="PRJ_BYD_UPS_AC_I1_O1"
 
 #PRJS="PRJ_USASL_AC_I3_O1 PRJ_USASL_AC_I3_O3"
 #PRJS="PRJ_XIAN_AC_I1_O1_P4 PRJ_XIAN_AC_I1_O1_P8"
@@ -165,6 +166,9 @@ function do_copy()
         name=ac_in3_out3_ip
     elif [ "$1" = "PRJ_YST_AC_I1_O1" ];then
         name=ac_in1_out1_YST
+    elif [ "$1" = "PRJ_BYD_UPS_AC_I1_O1" ];then
+        name=ac_in1_out1_byd_ups
+	cp -f $custdir/db/pdu_dat_byd_ups.db $appdir/pdu_dat.db
     elif [ "$1" = "PRJ_INST2302_DC_OLED" ];then
         name=dc_in_dc_out_oled
         rm -f $appdir/Qt_Test
@@ -187,6 +191,7 @@ function do_copy()
         name=ip_ac_yunnan_in1_out1_release
     elif [ "$1" = "PRJ_YUNNAN_AC_I1_O1" ];then
         name=ac_yunnan_in1_out1_release
+	cp -f $custdir/logo/logo_gowone.png $appdir/image/logo.png
     elif [ "$1" = "PRJ_GOWONE_125A_AC_I3_O1" ];then
         name=ac_in3_out1_gowone_125A
 	cp -f $custdir/logo/logo_gowone.png $appdir/image/logo.png