diff --git a/src/service/device_io_service.cpp b/src/service/device_io_service.cpp index 387f48d..0060604 100644 --- a/src/service/device_io_service.cpp +++ b/src/service/device_io_service.cpp @@ -7,8 +7,9 @@ using namespace iflytop; using namespace core; using namespace std; -const static int ksubboarddeviceid = 0x01; -const int kovertime = 33; +const static int ksubboarddeviceid = 0x01; +const int kovertime = 33; +const int ktemperature_overtime = 1200; #define EXEC_MODBUS(exptr) \ int ret = exptr; \ @@ -103,7 +104,7 @@ DeviceIOService::env_sensor_state_t DeviceIOService::getEnvSensorState() { 59(16Byte) | light_intensity H 60(16Byte) | light_intensity L */ - EXEC_MODBUS(modbusMaster->modbus03(ksubboarddeviceid, 48, 13, modbus03rx, kovertime)); + EXEC_MODBUS(modbusMaster->modbus03(ksubboarddeviceid, 48, 13, modbus03rx, ktemperature_overtime)); env_sensor_state.wind_speed = modbus03rx.getReg(48); env_sensor_state.wind_direction = modbus03rx.getReg(49); env_sensor_state.temperature = modbus03rx.getReg(50); diff --git a/src/service/device_io_service.hpp b/src/service/device_io_service.hpp index e766330..7a01802 100644 --- a/src/service/device_io_service.hpp +++ b/src/service/device_io_service.hpp @@ -60,9 +60,9 @@ class DeviceIOService : public enable_shared_from_this { public: typedef enum { - kEmergency, // 紧急按钮 - kWaterImmersionSensor, // 水浸传感器 - kHumanProximitySensor, // 人体接近传感器 + kEmergency, // 紧急按钮 + kWaterImmersionSensor = 5, // 水浸传感器 + kHumanProximitySensor = 4, // 人体接近传感器 } input_device_type_t; class InputDeviceState { public: