diff --git a/src/service/device_io_control_service_test.cpp b/src/service/device_io_control_service_test.cpp index 0ebef84..f168010 100644 --- a/src/service/device_io_control_service_test.cpp +++ b/src/service/device_io_control_service_test.cpp @@ -137,9 +137,11 @@ void DeviceIoControlServiceTest::replenishingFluidsPump_close_for_test() { * sprayLiquidPump * *******************************************************************************/ static bool sprayLiquidPump_state; +static int sprayLiquidPump_gpm; void DeviceIoControlServiceTest::sprayLiquidPump_open(int gpm) { logger->info("sprayLiquidPump_open"); sprayLiquidPump_state = true; + sprayLiquidPump_gpm = gpm; } void DeviceIoControlServiceTest::sprayLiquidPump_close() { logger->info("sprayLiquidPump_close"); @@ -157,14 +159,14 @@ void DeviceIoControlServiceTest::sprayLiquidPump_close_for_test() { int DeviceIoControlServiceTest::sprayLiquidPump_getRPM() { if (sprayLiquidPump_state) { - return 300; + return sprayLiquidPump_gpm; } else { return 0; } } int DeviceIoControlServiceTest::sprayLiquidPump_getGPM() { if (sprayLiquidPump_state) { - return 30; + return sprayLiquidPump_gpm; } else { return 0; } diff --git a/src/service/disinfection_ctl_service.cpp b/src/service/disinfection_ctl_service.cpp index 6b31bad..6c4fa2f 100644 --- a/src/service/disinfection_ctl_service.cpp +++ b/src/service/disinfection_ctl_service.cpp @@ -29,7 +29,8 @@ using namespace std; #define MAX_VOLUME (5000) namespace iflytop { -extern bool g_preheat; +extern bool g_in_test; + } DisinfectionCtrlService::DisinfectionCtrlService() {} @@ -172,6 +173,11 @@ void DisinfectionCtrlService::initContext(DisinfectionContext& context, context.injection_pump_speed = injection_pump_speed; context.injection_pump_speed_changed = true; + if (g_in_test) { + logger->warn("in test mode, pre_heat_time_s = 5"); + context.pre_heat_time_s = 5; + } + logger->info("startDisinfection {} {}", m_context.m_targetLoglevel, m_context.m_disinfectionID); logger->info(" stoped_gs {}", context.stoped_gs); logger->info(" continued_gs {}", context.continued_gs);