From ee609c7756364bf30fd39728c94a20de31dc8ebf Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 23 May 2024 20:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E9=81=93=E5=BC=8F=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B0=B4=E6=B5=B8=E4=BC=A0=E6=84=9F=E5=99=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/device_io_control_service.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index b00ee8c..4ab7484 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -197,6 +197,20 @@ void DeviceIoControlService::startScan() { } #endif +#if (defined PROJECT_TYPE_PIPE_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 = false; + + // logger->info("DeviceBottomWaterDetectionSensor:{} EvaporationBinWaterDetection:{}", m_deviceBottomWaterDetectionSensor, m_evaporationBinWaterDetection); + } +#endif + // kcmd_read_device_bottom_water_detection_sensor // kcmd_read_evaporation_bin_water_detection } @@ -540,9 +554,9 @@ int32_t DeviceIoControlService::AirProportionalValve_isBusy(int32_t* isbusy) { #ifdef PROJECT_TYPE_PIPE_DISINFECTION int DeviceIoControlService::airCompressor_channelSelect(int32_t val) { m_airCompressor_channelIndex = val; - if (m_airCompressor_channelIndex == 1) { + if (m_airCompressor_channelIndex == 1) { // m_zcanHost->call(kcmd_air_compressor_ch_select, 1); - } else if (m_airCompressor_channelIndex == 2) { + } else if (m_airCompressor_channelIndex == 2) { // 气密性测试 m_zcanHost->call(kcmd_air_compressor_ch_select, 2); } else { return err::kfail;