diff --git a/src/db/db_service.cpp b/src/db/db_service.cpp index 174c25f..1502bd7 100644 --- a/src/db/db_service.cpp +++ b/src/db/db_service.cpp @@ -130,10 +130,10 @@ id setting_name setting_name_ch val_upper_limit val_lower_limi storage.insert(Setting{5, "max_humidity", "允许消毒最大湿度", 0, 100, 0, 90}); if (storage.get_all(where(c(&Setting::id) == 6)).size() == 0) - storage.insert(Setting{6, "drainage_pump_speed", "排液蠕动泵转速", 0, 40, 0, 40}); // g/min + storage.insert(Setting{6, "drainage_pump_speed", "排液蠕动泵转速", 0, 90, 0, 90}); // g/min if (storage.get_all(where(c(&Setting::id) == 7)).size() == 0) - storage.insert(Setting{7, "injection_pump_speed", "喷射蠕动泵转速", 0, 40, 0, 40}); // g/min + storage.insert(Setting{7, "injection_pump_speed", "喷射蠕动泵转速", 0, 50, 0, 50}); // g/min if (storage.get_all(where(c(&Setting::id) == 8)).size() == 0) // storage.insert(Setting{8, "pre_heat_time_s", "预热时间", 0, 600, 0, 120}); diff --git a/src/service/device_io_control_service.cpp b/src/service/device_io_control_service.cpp index 8b0c2a8..4d0b23a 100644 --- a/src/service/device_io_control_service.cpp +++ b/src/service/device_io_control_service.cpp @@ -13,6 +13,9 @@ using namespace std; -通断电磁阀 3 PC7 5 #endif +#define GPM_TO_SPEED(gpm) (gpm * 3.07) +#define SPEED_TO_GPM(speed) (speed / 3.07) + DeviceIoControlService::DeviceIoControlService() {} void DeviceIoControlService::initialize() { GET_TO_SERVICE(m_zcanHost); } @@ -173,7 +176,7 @@ void DeviceIoControlService::replenishingFluidsPump_close() { void DeviceIoControlService::replenishingFluidsPump_open_for_test(int gpm) { logger->info("replenishingFluidsPump_open_for_test {}", gpm); - int speed = gpm * 7.5; + int speed = GPM_TO_SPEED(gpm); if (speed > 300) { speed = 300; } else if (speed < -300) { @@ -190,7 +193,7 @@ void DeviceIoControlService::replenishingFluidsPump_close_for_test() { *******************************************************************************/ void DeviceIoControlService::sprayLiquidPump_open(int gpm) { logger->info("sprayLiquidPump_open"); - int speed = gpm * 7.5; + int speed = GPM_TO_SPEED(gpm); if (speed > 300) { speed = 300; } else if (speed < 0) { @@ -205,7 +208,7 @@ void DeviceIoControlService::sprayLiquidPump_close() { void DeviceIoControlService::sprayLiquidPump_open_for_test(int gpm) { logger->info("sprayLiquidPump_open"); - int speed = gpm * 7.5; + int speed = GPM_TO_SPEED(gpm); if (speed > 300) { speed = 300; } else if (speed < -300) { @@ -219,7 +222,7 @@ void DeviceIoControlService::sprayLiquidPump_close_for_test() { } int DeviceIoControlService::sprayLiquidPump_getRPM() { return m_zcanHost->pumpctrl_c1004_get_speed_cache(2); } -int DeviceIoControlService::sprayLiquidPump_getGPM() { return sprayLiquidPump_getRPM() / 7.5; } +int DeviceIoControlService::sprayLiquidPump_getGPM() { return SPEED_TO_GPM(sprayLiquidPump_getRPM()); } int DeviceIoControlService::sprayLiquidPump_getState() { // lock_guard lock(lock_);