Selaa lähdekoodia

1、添加传感器报警有效判断,为0值时无效

liyuezong 2 vuotta sitten
vanhempi
commit
8c1d1412c5
1 muutettua tiedostoa jossa 23 lisäystä ja 4 poistoa
  1. 23 4
      pro/src/appweb_handle.c

+ 23 - 4
pro/src/appweb_handle.c

@@ -3004,8 +3004,17 @@ static void alarmProtect(void *conn)
             {
                 _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
                 _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
-                _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_enabled = 1;
-                _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_enabled = 1;
+                if (_globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_threshold>=-0.05  )
+                {
+                    _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_enabled = 0;
+                }
+                else  _globalSensorMangerSaveTemp->over_manager->sensor_val1_upper_enabled = 1;
+             
+                 if (_globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_threshold>=-0.05  )
+                {
+                     _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_enabled = 0;
+                }
+                else _globalSensorMangerSaveTemp->over_manager->sensor_val1_lower_enabled =1;
                 
                 if (_alarm_request_info._sensor_info.thresholdUpperAction && strcmp(_alarm_request_info._sensor_info.thresholdUpperAction,Alarm_Ctrl_type) == 0)
                 {
@@ -3028,8 +3037,18 @@ static void alarmProtect(void *conn)
             {
                 _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold = atof(_alarm_request_info._sensor_info.thresholdUpperValue);
                 _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold = atof(_alarm_request_info._sensor_info.thresholdDownValue);
-                _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_enabled = 1;
-                _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_enabled = 1;
+               if (_globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold>=-0.05  )
+                {
+                     _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_enabled = 0;
+                }
+                else  _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_enabled = 1;
+
+               if (_globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold<=0.05 &&_globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_threshold>=-0.05  )
+                {
+                    _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_enabled = 0;
+                }
+                else _globalSensorMangerSaveTemp->over_manager->sensor_val2_lower_enabled = 1;
+
                 if (_alarm_request_info._sensor_info.thresholdUpperAction && strcmp(_alarm_request_info._sensor_info.thresholdUpperAction, Alarm_Ctrl_type) == 0)
                 {
                     _globalSensorMangerSaveTemp->over_manager->sensor_val2_upper_threshold_ctrl = ALARM_CTRL_CLOSE_CH;