diff --git a/sdk/components/api/zi_temperature_sensor.hpp b/sdk/components/api/zi_temperature_sensor.hpp index 9037934..c1a3c76 100644 --- a/sdk/components/api/zi_temperature_sensor.hpp +++ b/sdk/components/api/zi_temperature_sensor.hpp @@ -10,9 +10,10 @@ using namespace std; class ZITemperatureSensor { public: virtual ~ZITemperatureSensor() {} - virtual float getTemperature() = 0; // 摄氏度 - virtual bool isOnline() = 0; - virtual bool isError() = 0; - virtual const char* errorInfo() = 0; + virtual float getTemperature() = 0; // 摄氏度 + virtual bool isOnline() = 0; + virtual bool isError() = 0; + virtual const char* errorInfo() = 0; + virtual bool isOnlineWhenPowerOn() = 0; }; } // namespace iflytop diff --git a/sdk/components/sensors/tmp117/tmp117.hpp b/sdk/components/sensors/tmp117/tmp117.hpp index 13f6acb..f90b9d3 100644 --- a/sdk/components/sensors/tmp117/tmp117.hpp +++ b/sdk/components/sensors/tmp117/tmp117.hpp @@ -69,6 +69,8 @@ class TMP117 : public ZITemperatureSensor { */ void initializate(I2C_HandleTypeDef* i2c, i2c_reset_cb_t i2cResetCb, ID_t id); + virtual bool isOnlineWhenPowerOn() override { return m_isOnlineWhenPowerOn; } + /** * @brief 读取温度 * diff --git a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp index 8f78abc..914e529 100644 --- a/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp +++ b/sdk/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp @@ -45,10 +45,10 @@ void WaterCoolingTemperatureControlModule::initialize(int32_t id, config_t* cfg, while (true) { m_sensor_update_thread.sleep(1000); if (module_status != 1) m_feedbak_temperature = read_pid_temperature_from_upper(); - if (m_temperature_sensor[0]->isError()) m_temperature_sensor_cache[0] = getTemperatureSensorVal(0); - if (m_temperature_sensor[1]->isError()) m_temperature_sensor_cache[1] = getTemperatureSensorVal(1); - if (m_temperature_sensor[2]->isError()) m_temperature_sensor_cache[2] = getTemperatureSensorVal(2); - if (m_temperature_sensor[3]->isError()) m_temperature_sensor_cache[3] = getTemperatureSensorVal(3); + if (m_temperature_sensor[0]->isOnlineWhenPowerOn()) m_temperature_sensor_cache[0] = getTemperatureSensorVal(0); + if (m_temperature_sensor[1]->isOnlineWhenPowerOn()) m_temperature_sensor_cache[1] = getTemperatureSensorVal(1); + if (m_temperature_sensor[2]->isOnlineWhenPowerOn()) m_temperature_sensor_cache[2] = getTemperatureSensorVal(2); + if (m_temperature_sensor[3]->isOnlineWhenPowerOn()) m_temperature_sensor_cache[3] = getTemperatureSensorVal(3); if (module_status != 1) { ZLOGI(TAG, "T0:%0.2f T1:%0.2f T2:%0.2f T3:%0.2f", m_temperature_sensor_cache[0], m_temperature_sensor_cache[1], m_temperature_sensor_cache[2], m_temperature_sensor_cache[3]); diff --git a/usrc/version.h b/usrc/version.h index d05e14b..aeaddff 100644 --- a/usrc/version.h +++ b/usrc/version.h @@ -1,2 +1,2 @@ #pragma once -#define APP_VERSION 1200 +#define APP_VERSION 1201