From ca5bb7481cf2702557127ff8eb03e41333217cf7 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 1 Sep 2024 21:28:22 +0800 Subject: [PATCH] update --- README.md | 3 +++ appsrc/appsetting/project_port/basic/zappversion.hpp | 2 +- appsrc/service/app/add_liquid_service.cpp | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9f7ba65..7576f48 100644 --- a/README.md +++ b/README.md @@ -40,4 +40,7 @@ VERSION 1.0.8 2. 修复日志打印过多的BUG 3. 删除掉 sendPrompt 方法 4. 删除掉testPage中的triggerOnePrompt + +VERSION 1.0.9 + 1. 修改加液时,排液时间 ``` \ No newline at end of file diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp index 6218659..1468cfa 100644 --- a/appsrc/appsetting/project_port/basic/zappversion.hpp +++ b/appsrc/appsetting/project_port/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "1.0.8" +#define VERSION "1.0.9" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/service/app/add_liquid_service.cpp b/appsrc/service/app/add_liquid_service.cpp index dbc52bf..a69db3c 100644 --- a/appsrc/service/app/add_liquid_service.cpp +++ b/appsrc/service/app/add_liquid_service.cpp @@ -4,7 +4,7 @@ using namespace iflytop; * @brief * */ -#define EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES 2000 +#define EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES 1500 void AddLiquidService::initialize() { logger->info("AddLiquidService initialize"); @@ -117,10 +117,10 @@ void AddLiquidService::addLiquidWork(int stopatg, bool& errorflag) { m_dics->SprayPump_startInRPM(-PORT.getEmptyPipeSprayPumpRPM()); thisThread.sleepForMs(1000); m_dics->AddLiquidPump_run(-23); // @TODO:提取常数到系统配置中 - for (size_t i = 0; i < EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES; i+2) { + for (size_t i = 0; i < EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES; i++) { if (thisThread.getExitFlag()) break; thisThread.sleepForMs(100); - if (i % 10 == 0) logger->info("empty line liquid {}:{} s", i * 100 / 1000, EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES * 100 / 1020); + if (i % 10 == 0) logger->info("empty line liquid {}:{} s", i * 100 / 1000, EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES * 100 / 1000.0); } m_dics->AddLiquidPump_stop(); m_dics->SprayPump_stop();