From e3c4463613a1d930a3beb897808256333be9919c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 16 May 2024 19:32:39 +0800 Subject: [PATCH] update --- src/configs/project_setting.hpp | 4 ++-- src/service/device_io_control_service.cpp | 4 ++++ transmit_disinfection_protocol_v1 | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/configs/project_setting.hpp b/src/configs/project_setting.hpp index 9438f73..9ac76cf 100644 --- a/src/configs/project_setting.hpp +++ b/src/configs/project_setting.hpp @@ -10,8 +10,8 @@ #define REG_EXCEPTION_FLAG 0x0100 // 异常标志位 // #define PROJECT_TYPE_LARGE_SPACE_DISINFECTION 1 // 大空间 -// #define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间 -#define PROJECT_TYPE_PIPE_DISINFECTION 1 // 管道消毒机 +#define PROJECT_TYPE_SMALL_SPACE_DISINFECTION 1 // 小空间 +// #define PROJECT_TYPE_PIPE_DISINFECTION 1 // 管道消毒机 #ifdef PROJECT_TYPE_SMALL_SPACE_DISINFECTION #define DISINFECTANT_BUCKET_CAPACITY 2300 diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index 45091cc..13c6eae 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -151,6 +151,10 @@ void DeviceIoControlService::startScan() { void DeviceIoControlService::airCompressor_setState(bool val) { logger->info("airCompressor_setState:{}", val); if (val) { +#ifdef PROJECT_TYPE_PIPE_DISINFECTION + airCompressor_setValve1(1); + airCompressor_setValve2(1); +#endif m_zcanHost->writeio(0, 1); usleep(500 * 100); m_zcanHost->writeio(1, 1); diff --git a/transmit_disinfection_protocol_v1 b/transmit_disinfection_protocol_v1 index a3bc27c..d5af72c 160000 --- a/transmit_disinfection_protocol_v1 +++ b/transmit_disinfection_protocol_v1 @@ -1 +1 @@ -Subproject commit a3bc27ca9ca6c3d636d4a924c5d8bc9f7f4b5fc8 +Subproject commit d5af72cb615c31b9107ce66e9288f0503d3fe940