From 0878ecaf55b497c69e2e0cae67c4dfdee0c71445 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 24 May 2024 19:57:04 +0800 Subject: [PATCH] v6.0 --- scripter/disable_debug_mode_all.sh | 0 scripter/enable_debug_mode_all.sh | 0 src/configs/project_setting.hpp | 3 ++- src/service/device_io_control_service_test.cpp | 2 +- src/service/disfection_ctl/add_liquid_service.cpp | 2 +- src/service/disfection_ctl/disinfection_service.cpp | 10 +++++++++- src/version.hpp | 2 +- 7 files changed, 14 insertions(+), 5 deletions(-) mode change 100644 => 100755 scripter/disable_debug_mode_all.sh mode change 100644 => 100755 scripter/enable_debug_mode_all.sh diff --git a/scripter/disable_debug_mode_all.sh b/scripter/disable_debug_mode_all.sh old mode 100644 new mode 100755 diff --git a/scripter/enable_debug_mode_all.sh b/scripter/enable_debug_mode_all.sh old mode 100644 new mode 100755 diff --git a/src/configs/project_setting.hpp b/src/configs/project_setting.hpp index 2fb904d..961a782 100644 --- a/src/configs/project_setting.hpp +++ b/src/configs/project_setting.hpp @@ -52,7 +52,7 @@ #define MAX_H2O2_SENSOR_NUM (1) #define MIN_DISINFECTANT_VOLUME 500 #define DEVICE_IP "192.168.8.12" -#define EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES 80 +#define EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES 100 #define SPRAY_LIQUID_PUMP_MIRROR 0 #define GPM_TO_SPEED(gpm) (gpm * 14.7) #define SPEED_TO_GPM(speed) ((speed / 14.7) + 0.5) @@ -71,6 +71,7 @@ #define GPM_TO_SPEED(gpm) (gpm * 41.97) #define SPEED_TO_GPM(speed) ((speed / 41.97) + 0.5) #define SPRAYLIQUID_PUMP_MAX_GPM 8 +#define DBDB_MINI_PWM_BLOWER_VAL 25 #endif #define EMTPTY_LINE_WHEN_DISINFECTION 60 diff --git a/src/service/device_io_control_service_test.cpp b/src/service/device_io_control_service_test.cpp index d35fdeb..5a5905f 100644 --- a/src/service/device_io_control_service_test.cpp +++ b/src/service/device_io_control_service_test.cpp @@ -196,7 +196,7 @@ void DeviceIoControlServiceTest::selfTest_setEvaporationBinWaterDetection(int va evaporationBinWaterDetection = val; } -int DeviceIoControlServiceTest::getDisinfectantVolume_g() { return 123; } // g +int DeviceIoControlServiceTest::getDisinfectantVolume_g() { return 800; } // g void DeviceIoControlServiceTest::warningLightCtrl(int r, int g, int b, int w) { logger->info("warningLightCtrl r:{} g:{} b:{} w:{}", r, g, b, w); } #endif diff --git a/src/service/disfection_ctl/add_liquid_service.cpp b/src/service/disfection_ctl/add_liquid_service.cpp index f1de34d..4916193 100644 --- a/src/service/disfection_ctl/add_liquid_service.cpp +++ b/src/service/disfection_ctl/add_liquid_service.cpp @@ -41,7 +41,7 @@ void AddLiquidService::startReplenishingFluids(int stopatg) { int32_t nowvolume = m_deviceIoControlService->getDisinfectantVolume_g(); int maxg = DISINFECTANT_BUCKET_CAPACITY; - stopatg += 50; // 由于加液过程中，测量到的液体要比真实的小，所以这里要比预设值大100 + stopatg += 30; // 由于加液过程中，测量到的液体要比真实的小，所以这里要比预设值大100 if (stopatg > maxg) { logger->warn("start Replenishing fail, stopatg {} > maxg {}", stopatg, maxg); diff --git a/src/service/disfection_ctl/disinfection_service.cpp b/src/service/disfection_ctl/disinfection_service.cpp index 5395481..98eca2d 100644 --- a/src/service/disfection_ctl/disinfection_service.cpp +++ b/src/service/disfection_ctl/disinfection_service.cpp @@ -14,7 +14,7 @@ using namespace std; #define DVALUE_COMPUTEPERIOD_TIME_S (10.0) #define DUMP_LOG_PERIOD (5 * 60.0) // #define DUMP_LOG_PERIOD (10.0) -#define DBDB_MINI_PWM_BLOWER_VAL 50 + namespace iflytop { extern bool g_in_test; @@ -304,6 +304,14 @@ int32_t DisinfectionService::getEstimatedRemainingTimeS() { return context.remaintime; } else if (sm.getState() == kstate_preheat) { return getPreHeatRaminTimeS(); + } else if (sm.getState() == kstate_empty_liquid_from_the_line) { + int32_t remaintime = EMTPTY_LINE_WHEN_DISINFECTION - sm.getStateHasPassedTimeMs(); + if (remaintime < 0) remaintime = 0; + return remaintime; + } else if (sm.getState() == kstate_finished) { + return 0; + } else { + return -1; } return 0; } diff --git a/src/version.hpp b/src/version.hpp index 9dcf5f6..691f7ec 100644 --- a/src/version.hpp +++ b/src/version.hpp @@ -1,2 +1,2 @@ #pragma once -#define VERSION "5.3" \ No newline at end of file +#define VERSION "6.0" \ No newline at end of file