From b99866ae050d2577dcfee421c7aab3e91920813b Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 17 Sep 2024 21:18:10 +0800 Subject: [PATCH] v1.2.4 --- README.md | 3 +++ appsrc/appsetting/project_port/basic/zappversion.hpp | 2 +- .../app/disinfection_ctrl/disinfection_ctrl_service.hpp | 17 ++++++++++++----- appsrc/service/app/disinfection_ctrl_service_ext.cpp | 3 ++- appsrc/service/app/drain_liquid_service.cpp | 8 +++++++- .../hardware/disinfectant_weight_update_service.cpp | 2 +- appsrc/service/test_page_mgr_service.cpp | 4 ++++ 7 files changed, 30 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7648b76..401cb80 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,9 @@ VERSION 1.2.2 VERSION 1.2.3 1. 所有应用服务添加状态主动上报接口 + +VERSION 1.2.4 + 1. fix some bug TODO: 1.添加用户增加用户查重检查 diff --git a/appsrc/appsetting/project_port/basic/zappversion.hpp b/appsrc/appsetting/project_port/basic/zappversion.hpp index 719c593..6131227 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.2.3" +#define VERSION "1.2.4" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp index 5022d5c..1d4f887 100644 --- a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp +++ b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp @@ -85,11 +85,18 @@ class DisinfectionCtrlService : public enable_shared_from_this& getRealtimeCfg() { return m_realtimeCfg; } - DisinfectionState getState() { return sm.getState(); } - int getCurStateRemainTimeS() { return s_remaintime; } - float getTlog() { return m_tlog; } - float getNlog() { return s_nlog; } + map& getRealtimeCfg() { return m_realtimeCfg; } + DisinfectionState getState() { return sm.getState(); } + int getCurStateRemainTimeS() { return s_remaintime; } + float getTlog() { return m_tlog; } + float getNlog() { return s_nlog; } + int getInjectedVelocity() { + if (sm.getState() == DisinfectionState::disinfection && !s_isDisinfectionTakeBreak) { + return getSettingAsInt(SettingId::injection_pump_speed); + } + return 0; + } + shared_ptr getH2O2Snapshot() { return dics->getH2O2SensorMgr()->takeSnapshot(); } private: diff --git a/appsrc/service/app/disinfection_ctrl_service_ext.cpp b/appsrc/service/app/disinfection_ctrl_service_ext.cpp index b875602..babbba9 100644 --- a/appsrc/service/app/disinfection_ctrl_service_ext.cpp +++ b/appsrc/service/app/disinfection_ctrl_service_ext.cpp @@ -101,6 +101,7 @@ json DisinfectionCtrlServiceExt::getState(DisinfectionState& state) { rely["curStateRemainTimeS"] = dcs->getCurStateRemainTimeS(); rely["tlog"] = dcs->getTlog(); rely["nlog"] = dcs->getNlog(); + rely["injectedVelocity"] = dcs->getInjectedVelocity(); auto h2o2 = dcs->getH2O2Snapshot(); @@ -134,7 +135,7 @@ void DisinfectionCtrlServiceExt::startStateReport(shared_ptr DisinfectionState state; json report = getState(state); SEND_CLASS_REPORT(thisClass.className, "stateUpdate", report); - ThisThread().sleepForMs(900); + ThisThread().sleepForMs(500); } })); } diff --git a/appsrc/service/app/drain_liquid_service.cpp b/appsrc/service/app/drain_liquid_service.cpp index 6329866..3636ead 100644 --- a/appsrc/service/app/drain_liquid_service.cpp +++ b/appsrc/service/app/drain_liquid_service.cpp @@ -1,6 +1,6 @@ #include "drain_liquid_service.hpp" using namespace iflytop; -#define DRAINLIQUID_EXT_TIME_S 30 +#define DRAINLIQUID_EXT_TIME_S 50 void DrainLiquidService::initialize() { logger->info("DrainLiquidService initialize"); @@ -102,6 +102,7 @@ void DrainLiquidService::workThread() { zsteady_tp volumeReachZeroTime; bool volumeReachZeroFlag = false; + bool sprayPumpStopflag = false; while (!thisThread.getExitFlag()) { int32_t nowvolume = m_dwus->getWeight(); @@ -116,6 +117,11 @@ void DrainLiquidService::workThread() { break; } + if (!sprayPumpStopflag && zsteady_clock().elapsedTimeS(startdrainingtime) > 60) { + sprayPumpStopflag = true; + m_dics->SprayPump_stop(); + } + if (volumeReachZeroFlag) { logger->info("stopDraining after {} s", DRAINLIQUID_EXT_TIME_S - zsteady_clock().elapsedTimeS(volumeReachZeroTime)); if (zsteady_clock().elapsedTimeS(volumeReachZeroTime) > DRAINLIQUID_EXT_TIME_S) { diff --git a/appsrc/service/hardware/disinfectant_weight_update_service.cpp b/appsrc/service/hardware/disinfectant_weight_update_service.cpp index 2b460bc..641c200 100644 --- a/appsrc/service/hardware/disinfectant_weight_update_service.cpp +++ b/appsrc/service/hardware/disinfectant_weight_update_service.cpp @@ -53,7 +53,7 @@ void DisinfectantWeightUpdateService::updateWeightThread() { try { float pa = deviceIoControlService->LiquidWeightPS_readPa(); pa = filter.filter(pa); - pa = pa - 280; + pa = pa - 50; if (pa < 0) { pa = 0; } diff --git a/appsrc/service/test_page_mgr_service.cpp b/appsrc/service/test_page_mgr_service.cpp index f2428ab..a6ca9e8 100644 --- a/appsrc/service/test_page_mgr_service.cpp +++ b/appsrc/service/test_page_mgr_service.cpp @@ -73,8 +73,12 @@ void TestPageMgrService::initialize() { [this](string buttonName, vector param) { // logger->info("on AddDischargePumpCtrl.{}", buttonName); if (buttonName == "addingLiquid") { + dcs->AddLiquidPump_stop(); + usleep(100 * 1000); dcs->AddLiquidPump_addLiquid(); } else if (buttonName == "drainLiquid") { + dcs->AddLiquidPump_stop(); + usleep(100 * 1000); dcs->AddLiquidPump_drainLiquid(); } else { dcs->AddLiquidPump_stop();