diff --git a/README.md b/README.md index b1bf27a..cedc410 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ 1.添加H2O2-RS计算算法 V5 1.添加传感器预热检查 + V5.1 + 1.排液最后的默认排空管道时间修改成8秒 ``` diff --git a/src/service/disfection_ctl/drain_liquid_service.cpp b/src/service/disfection_ctl/drain_liquid_service.cpp index 171e7a5..85c0c7f 100644 --- a/src/service/disfection_ctl/drain_liquid_service.cpp +++ b/src/service/disfection_ctl/drain_liquid_service.cpp @@ -63,14 +63,14 @@ void DrainLiquidService::startDraining() { while (!thisThread.getExitFlag()) { int32_t nowvolume = m_deviceIoControlService->getDisinfectantVolume_g(); logger->info("draining remain {} g", nowvolume); - if (!volumeReachZeroFlag && nowvolume == 0) { + if (!volumeReachZeroFlag && nowvolume <= 0) { volumeReachZeroTime = zsteady_clock().now(); volumeReachZeroFlag = true; } if (volumeReachZeroFlag) { - logger->info("stopDraining after {} s", 30 - zsteady_clock().elapsedTimeS(volumeReachZeroTime)); - if (zsteady_clock().elapsedTimeS(volumeReachZeroTime) > 30) { + logger->info("stopDraining after {} s", 8 - zsteady_clock().elapsedTimeS(volumeReachZeroTime)); + if (zsteady_clock().elapsedTimeS(volumeReachZeroTime) > 8) { break; } } diff --git a/src/version.hpp b/src/version.hpp index 2f15e80..d67d9b6 100644 --- a/src/version.hpp +++ b/src/version.hpp @@ -1,2 +1,2 @@ #pragma once -#define VERSION "5.0" \ No newline at end of file +#define VERSION "5.1" \ No newline at end of file