709 相关修改

pro/config/cfg.h

@@ -235,7 +235,7 @@
     #define CASCADE_CNT                         0
 
     #define PHASE_GROUP                         5
-    #define CHANNEL_DELAY                       5
+    #define CHANNEL_DELAY                       14
 
     #define PROD_POWER_TYPE                     5
 

pro/src/app.c

@@ -1900,7 +1900,7 @@ void AlarmCtrlChn(int nChID, int nCtrl)
                                                 nCtrl, false);
             }
 
-            sprintf(buff, "Over limit protection |$关闭$|$通道$|%d", _globalPowerMangerTemp->product_ch_id);
+            sprintf(buff, "%s |$关闭$|$通道$|%d",language_alarm_over_limit[0], _globalPowerMangerTemp->product_ch_id);
             int nAlarmID=dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, ALARM_TYPE_SENSOR, buff,"");
 
             struct tm *t;
@@ -1938,7 +1938,7 @@ void AlarmCtrlAll(int nCtrl)
             int rec=g_switch_set_all_ctrl(&__globalDeviceManage._globalRelaySampManger,_globalPowerMangerTemp->product_ch_type,_globalPowerMangerTemp->product_saddr,nCtrl);
             if(rec<0)log_i("Close All address:%d rec:%d:%s",nSendAddr,rec,modbus_strerror(errno));
         }      
-        sprintf(buff,"Over limit protection |$关闭$|$所有$|$通道$");
+        sprintf(buff,"%s |$关闭$|$所有$|$通道$",language_alarm_over_limit[0]);
         int nAlarmID=dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, ALARM_TYPE_SENSOR, buff,"");
 
         struct tm *t;

pro/src/language_common.c

@@ -1305,7 +1305,18 @@ const char * language_alarm_immerse[LANG_MAX] =
     "漏洩",                                        //日语
 };
 
-
+const char *language_alarm_over_limit[LANG_MAX] = 
+{
+    "超限保护",
+    "Over limit protection",
+    "Защита от превышения лимита",
+    "Protection contre le dépassement de limite",
+    "Schutz vor Limitüberschreitung",
+    "Protección contra exceso de límite",
+    "Proteção contra excesso de limite",
+    "Protezione contro il superamento del limite",
+    "リミットオーバー保護"
+};
 
 const char* language_alarm_phase_lose[LANG_MAX] = 
 {

pro/src/language_common.h

@@ -56,6 +56,10 @@ extern const char* language_opera_log_operation[LANG_MAX];
 extern const char* language_run_log_running[LANG_MAX];
 extern const char* language_pressure[LANG_MAX];
 //============================================================================
+
+
+extern const char *language_alarm_over_limit[LANG_MAX];
+
 extern const char* language_alarm_Ch[LANG_MAX];
 extern const char* language_alarm_V[LANG_MAX];
 extern const char* language_alarm_A[LANG_MAX];

pro/src/language_hashmap.c

@@ -361,6 +361,8 @@ retry:
     r = insert_Newhash(table,(const char*)language_update[0],language_update, nMaxSize);
     if(r==HASH_REPEAT) goto repeat; else if(r<HASH_REPEAT) goto failed;
 
+    r = insert_Newhash(table,(const char *)language_alarm_over_limit[0],language_alarm_over_limit,nMaxSize);
+    if(r==HASH_REPEAT) goto repeat; else if(r<HASH_REPEAT) goto failed;
 
 
 

pro/src/sqlite_handle.c

@@ -5643,6 +5643,40 @@ int dev_sensor_Alarm_send_message(GlobalDeviceManager* globalDeviceManger,Global
         }
     }
     break;
+    case SENSOR_TYPE_TEMP_PRESS:
+    {
+        switch (_AlarmType)
+        {
+        case SENSOR_VAL1_UPPER:
+            sprintf(AlarmText, "%s |$温度$| 1 |$%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 |$温度$| 1 |$%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 |$液压$| 2 |$%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 |$液压$| 2 |$%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;
+            }
+            break;
+        default:
+            sprintf(AlarmText, "%s |$%s$", __globalPowerTemp->sensor_name, language_alarm_NULL_ERROR[languagesID]);
+            break;
+        }
+    }
+    break;
     case SENSOR_TYPE_GAS:
     {
         switch (_AlarmType)