diff --git a/src/configs/project_setting.hpp b/src/configs/project_setting.hpp index f79d8d2..3d1d925 100644 --- a/src/configs/project_setting.hpp +++ b/src/configs/project_setting.hpp @@ -28,6 +28,8 @@ #define SPRAY_LIQUID_PUMP_MIRROR 0 #define GPM_TO_SPEED(gpm) (gpm * 14.7) #define SPEED_TO_GPM(speed) ((speed / 14.7) + 0.5) +#define SPRAYLIQUID_PUMP_MAX_GPM 40 + #endif #ifdef PROJECT_TYPE_SMALL_SPACE_DISINFECTION @@ -40,6 +42,8 @@ #define SPRAY_LIQUID_PUMP_MIRROR 0 #define GPM_TO_SPEED(gpm) (gpm * 14.7) #define SPEED_TO_GPM(speed) ((speed / 14.7) + 0.5) +#define SPRAYLIQUID_PUMP_MAX_GPM 40 + #endif #ifdef PROJECT_TYPE_PIPE_DISINFECTION @@ -52,6 +56,8 @@ #define SPRAY_LIQUID_PUMP_MIRROR 0 #define GPM_TO_SPEED(gpm) (gpm * 14.7) #define SPEED_TO_GPM(speed) ((speed / 14.7) + 0.5) +#define SPRAYLIQUID_PUMP_MAX_GPM 40 + #endif #ifdef PROJECT_TYPE_DRAW_BAR_BOX @@ -64,9 +70,9 @@ #define SPRAY_LIQUID_PUMP_MIRROR 1 #define GPM_TO_SPEED(gpm) (gpm * 41.97) #define SPEED_TO_GPM(speed) ((speed / 41.97) + 0.5) +#define SPRAYLIQUID_PUMP_MAX_GPM 8 #endif -#define SPRAYLIQUID_PUMP_MAX_GPM 40 #define EMTPTY_LINE_WHEN_DISINFECTION 60 #define MAX_DISINFECTIONLOGGER_FILE_NUM 10 // 最大日志文件数量 diff --git a/src/service/disfection_ctl/add_liquid_service.cpp b/src/service/disfection_ctl/add_liquid_service.cpp index 650e252..7066294 100644 --- a/src/service/disfection_ctl/add_liquid_service.cpp +++ b/src/service/disfection_ctl/add_liquid_service.cpp @@ -69,7 +69,7 @@ void AddLiquidService::startReplenishingFluids(int stopatg) { // 排空管路中的消毒液 logger->info("start drain the liquid from the line"); - m_deviceIoControlService->sprayLiquidPump_open(-40); // 40gpm 约等于450RPM + m_deviceIoControlService->sprayLiquidPump_open(-SPRAYLIQUID_PUMP_MAX_GPM); // 40gpm 约等于450RPM thisThread.sleepForMs(1000); m_deviceIoControlService->replenishingFluidsPump_open(-23);