From b472cb65721dbdcbc97f806aec85b873471e6fd2 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 23 May 2024 17:42:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A9=BA=E9=97=B4=E6=B6=88=E6=AF=92?= =?UTF-8?q?=E6=9C=BA=E6=94=AF=E6=8C=81=E6=B0=B4=E6=B5=B8=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/configs/project_setting.hpp | 4 ++-- src/service/device_io_control_service.cpp | 17 +++++++++++++++++ transmit_disinfection_protocol_v1 | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/configs/project_setting.hpp b/src/configs/project_setting.hpp index ee28ead..11182a5 100644 --- a/src/configs/project_setting.hpp +++ b/src/configs/project_setting.hpp @@ -11,8 +11,8 @@ #if (!defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) && (!defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) && (!defined PROJECT_TYPE_PIPE_DISINFECTION) && (!defined PROJECT_TYPE_DRAW_BAR_BOX) -#define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1 // 大空间 -// #define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间 +// #define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1 // 大空间 +#define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间 // #define PROJECT_TYPE_PIPE_DISINFECTION 1 // 管道消毒机 // #define PROJECT_TYPE_DRAW_BAR_BOX 1 // 拉感箱 #endif diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index cf839dd..d3bf7ad 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -175,6 +175,23 @@ void DeviceIoControlService::startScan() { // logger->info("DeviceBottomWaterDetectionSensor:{}", m_deviceBottomWaterDetectionSensor); } #endif + +#if (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) + if (i % 100 == 0) { + int32_t ack0 = 0; + int32_t ack1 = 0; + m_zcanHost->call(kcmd_read_device_bottom_water_detection_sensor, &ack0); + m_zcanHost->call(kcmd_read_evaporation_bin_water_detection, &ack1); + + m_deviceBottomWaterDetectionSensor = ack0; + m_evaporationBinWaterDetection = ack1; + + // logger->info("DeviceBottomWaterDetectionSensor:{} EvaporationBinWaterDetection:{}", m_deviceBottomWaterDetectionSensor, m_evaporationBinWaterDetection); + } +#endif + + // kcmd_read_device_bottom_water_detection_sensor + // kcmd_read_evaporation_bin_water_detection } })); #endif diff --git a/transmit_disinfection_protocol_v1 b/transmit_disinfection_protocol_v1 index 6eb4a87..c39bd36 160000 --- a/transmit_disinfection_protocol_v1 +++ b/transmit_disinfection_protocol_v1 @@ -1 +1 @@ -Subproject commit 6eb4a87eb4bdb1226db1d0e92f277b1c20d49b05 +Subproject commit c39bd364d809a9a6ad965c83fd3ea28c67514317