Explorar el Código

1、修复传感器报警翻译错误

liyuezong hace 1 año
padre
commit
5d3967f084
Se han modificado 2 ficheros con 6 adiciones y 7 borrados
  1. 0 1
      pro/config/cfg.h
  2. 6 6
      pro/src/sqlite_handle.c

+ 0 - 1
pro/config/cfg.h

@@ -459,7 +459,6 @@
     #define USE_Cellular
     #define USE_Cellular
 
 
     #define BRD_MAX                             5
     #define BRD_MAX                             5
-    #define ROTATE                              270
 
 
 #elif defined PRJ_BYD_UPS_AC_I1_O1
 #elif defined PRJ_BYD_UPS_AC_I1_O1
     #define LANGUAGE                            0           //chinese
     #define LANGUAGE                            0           //chinese

+ 6 - 6
pro/src/sqlite_handle.c

@@ -4304,25 +4304,25 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         switch (_AlarmType)
         switch (_AlarmType)
         {
         {
         case SENSOR_VAL1_UPPER:
         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)) {
             if(ss->Cur_sensor_info.val1>LIMIT_HOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
                 limit_flag = 1;
             }
             }
             break;
             break;
         case SENSOR_VAL1_LOWER:
         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)) {
             if(ss->Cur_sensor_info.val1<LIMIT_LOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
                 limit_flag = 1;
             }
             }
             break;
             break;
         case SENSOR_VAL2_UPPER:
         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)) {
             if(ss->Cur_sensor_info.val2>LIMIT_HOF(ss->over_manager.sensor_val2_upper_threshold)) {
                 limit_flag = 1;
                 limit_flag = 1;
             }
             }
             break;
             break;
         case SENSOR_VAL2_LOWER:
         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)) {
             if(ss->Cur_sensor_info.val2<LIMIT_LOF(ss->over_manager.sensor_val2_upper_threshold)) {
                 limit_flag = 1;
                 limit_flag = 1;
             }
             }
@@ -4339,13 +4339,13 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         switch (_AlarmType)
         switch (_AlarmType)
         {
         {
         case SENSOR_VAL1_UPPER:
         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)) {
             if(ss->Cur_sensor_info.val1>LIMIT_HOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
                 limit_flag = 1;
             }
             }
             break;
             break;
         case SENSOR_VAL1_LOWER:
         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)) {
             if(ss->Cur_sensor_info.val1<LIMIT_LOF(ss->over_manager.sensor_val1_upper_threshold)) {
                 limit_flag = 1;
                 limit_flag = 1;
             }
             }