|
@@ -2380,22 +2380,20 @@ static void* sensor_thread(void* arg)
|
|
|
alarmflag = true;
|
|
alarmflag = true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
|
|
|
|
|
+ set_dry_val_modbus(_globalDeviceManager,_globalSensorMangerTemp->sensor_status,_globalSensorMangerTemp->sensor_addr);
|
|
|
if (alarmflag){
|
|
if (alarmflag){
|
|
|
dev_sensor_Alarm_send_message(&__globalDeviceManage, _globalSensorMangerTemp, -1);
|
|
dev_sensor_Alarm_send_message(&__globalDeviceManage, _globalSensorMangerTemp, -1);
|
|
|
time_t now;
|
|
time_t now;
|
|
|
time(&now);
|
|
time(&now);
|
|
|
t = localtime(&now);
|
|
t = localtime(&now);
|
|
|
|
|
+ _globalSensorMangerTemp->Cur_sensor_info.product_log_time = now;
|
|
|
ret = dev_insert_sensor_info(_globalDeviceManager->db, &_globalSensorMangerTemp->Cur_sensor_info, &nSaveIndex);
|
|
ret = dev_insert_sensor_info(_globalDeviceManager->db, &_globalSensorMangerTemp->Cur_sensor_info, &nSaveIndex);
|
|
|
if (ret != 0)
|
|
if (ret != 0)
|
|
|
{
|
|
{
|
|
|
log_e("sensor_temp_write database error.");
|
|
log_e("sensor_temp_write database error.");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- _globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
|
|
|
|
|
- set_dry_val_modbus(_globalDeviceManager,_globalSensorMangerTemp->sensor_status,_globalSensorMangerTemp->sensor_addr);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|