|
|
@@ -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;
|