From bd28d847fa5fc0c5b34879aa306d76d24074aa37 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 18 May 2024 11:23:37 +0800 Subject: [PATCH] app --- service/disinfection_ctl_service.cpp | 4 ++++ service/disinfection_ctl_service.hpp | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/service/disinfection_ctl_service.cpp b/service/disinfection_ctl_service.cpp index 8353fb0..659ca17 100644 --- a/service/disinfection_ctl_service.cpp +++ b/service/disinfection_ctl_service.cpp @@ -11,8 +11,10 @@ void DisinfectionCtrlService::startDisinfection(int loglevel, // int continued_humi // ) { stopDisinfection(); +#if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) || (defined PROJECT_TYPE_PIPE_DISINFECTION) stopDraining(); stopReplenishingFluids(); +#endif m_disinfectionService->startDisinfection(loglevel, // injection_pump_speed, // stoped_gs, // @@ -39,6 +41,7 @@ void DisinfectionCtrlService::changeDisinfectionParameter(int injection_pump_spe continued_humi); } void DisinfectionCtrlService::stopDisinfection() { m_disinfectionService->stopDisinfection(); } +#if (defined PROJECT_TYPE_LARGE_SPACE_DISINFECTION) || (defined PROJECT_TYPE_SMALL_SPACE_DISINFECTION) || (defined PROJECT_TYPE_PIPE_DISINFECTION) void DisinfectionCtrlService::startReplenishingFluids(int stopatg) { m_addLiquidService->startReplenishingFluids(stopatg); } void DisinfectionCtrlService::stopReplenishingFluids() { @@ -55,3 +58,4 @@ void DisinfectionCtrlService::stopDraining() { stopReplenishingFluids(); m_drainLiquidService->stopDraining(); } +#endif diff --git a/service/disinfection_ctl_service.hpp b/service/disinfection_ctl_service.hpp index 8d1ba76..0f25422 100644 --- a/service/disinfection_ctl_service.hpp +++ b/service/disinfection_ctl_service.hpp @@ -15,9 +15,9 @@ #include #include "disfection_ctl/add_liquid_service.hpp" +#include "disfection_ctl/disinfection_service.hpp" #include "disfection_ctl/disinfection_state.hpp" #include "disfection_ctl/drain_liquid_service.hpp" -#include "disfection_ctl/disinfection_service.hpp" /** * @brief * @@ -44,7 +44,7 @@ class DisinfectionCtrlService : public enable_shared_from_this m_disinfectionService; public: - DisinfectionCtrlService(){} + DisinfectionCtrlService() {} public: void initialize() { @@ -80,12 +80,16 @@ class DisinfectionCtrlService : public enable_shared_from_this