|
|
@@ -1495,8 +1495,8 @@ static void* sensor_thread(void* arg)
|
|
|
}
|
|
|
}
|
|
|
_globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
|
|
|
- _globalDeviceManager->g_modebus_read.temprature=temperature;
|
|
|
- _globalDeviceManager->g_modebus_read.humidity=humidity;
|
|
|
+ _globalDeviceManager->g_modebus_read.temprature=temperature*100;
|
|
|
+ _globalDeviceManager->g_modebus_read.humidity=humidity*100;
|
|
|
}
|
|
|
break;
|
|
|
case SENSOR_TYPE_SMOKE: // 烟雾
|
|
|
@@ -1577,8 +1577,8 @@ static void* sensor_thread(void* arg)
|
|
|
_globalSensorInfo.val1 = temperature;
|
|
|
_globalSensorInfo.val2 = temperature2;
|
|
|
_globalSensorMangerTemp->Cur_sensor_info=_globalSensorInfo;
|
|
|
- _globalDeviceManager->g_modebus_read.temprature=temperature;
|
|
|
- _globalDeviceManager->g_modebus_read.temprature2=temperature2;
|
|
|
+ _globalDeviceManager->g_modebus_read.temprature=temperature*100;
|
|
|
+ _globalDeviceManager->g_modebus_read.temprature2=temperature2*100;
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
@@ -1678,8 +1678,8 @@ static void* shm_thread(void *arg)
|
|
|
_globalDeviceManager->g_shm_Data->fF = _pTreeACPowerPhData->_PowerInfo.factor;
|
|
|
_globalDeviceManager->g_shm_Data->fS = _pTreeACPowerPhData->_PowerInfo.consumption;
|
|
|
_globalDeviceManager->g_shm_Data->nStatus = _pTreeACPowerPhData->_PowerInfo.status;
|
|
|
- _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature;
|
|
|
- _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity;
|
|
|
+ _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature/100.0f;
|
|
|
+ _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity/100.0f;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -1691,8 +1691,8 @@ static void* shm_thread(void *arg)
|
|
|
_globalDeviceManager->g_shm_Data->fF = _globalDeviceManager->_globalPowerManger._PowerInfo.factor;
|
|
|
_globalDeviceManager->g_shm_Data->fS = _globalDeviceManager->_globalPowerManger._PowerInfo.consumption;
|
|
|
_globalDeviceManager->g_shm_Data->nStatus = _globalDeviceManager->_globalPowerManger._PowerInfo.status;
|
|
|
- _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature;
|
|
|
- _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity;
|
|
|
+ _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature/100.0f;
|
|
|
+ _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity/100.0f;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -1726,8 +1726,8 @@ static void* shm_thread(void *arg)
|
|
|
_globalDeviceManager->g_shm_Data->fF = _pTreeACPowerPhData->_PowerInfo.factor;
|
|
|
_globalDeviceManager->g_shm_Data->fS = _pTreeACPowerPhData->_PowerInfo.consumption;
|
|
|
_globalDeviceManager->g_shm_Data->nStatus = _pTreeACPowerPhData->_PowerInfo.status;
|
|
|
- _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature;
|
|
|
- _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity;
|
|
|
+ _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature/100.0f;
|
|
|
+ _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity/100.0f;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -1738,8 +1738,8 @@ static void* shm_thread(void *arg)
|
|
|
_globalDeviceManager->g_shm_Data->fF = _globalPowerMangerTemp->_PowerInfo.factor;
|
|
|
_globalDeviceManager->g_shm_Data->fS = _globalPowerMangerTemp->_PowerInfo.consumption;
|
|
|
_globalDeviceManager->g_shm_Data->nStatus = _globalPowerMangerTemp->_PowerInfo.status;
|
|
|
- _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature;
|
|
|
- _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity;
|
|
|
+ _globalDeviceManager->g_shm_Data->fT = _globalDeviceManager->g_modebus_read.temprature/100.0f;
|
|
|
+ _globalDeviceManager->g_shm_Data->fH = _globalDeviceManager->g_modebus_read.humidity/100.0f;
|
|
|
}
|
|
|
}
|
|
|
lock_s_release(LOCK_ID_POWER_UPDATE);
|