From 5b0d6d742ad8f4141f323e747e9c8554de75f918 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sun, 1 Sep 2024 23:28:29 +0800
Subject: [PATCH] update

---
 uappbase/appcfg/appcfg.hpp                        | 10 +++++-----
 uappbase/service/config_index.cpp                 |  8 ++++----
 uappbase/service/config_service.cpp               |  4 ++--
 usrc/service/page/submenu/Page_muSettings.cpp     |  8 ++++----
 usrc/service/remote_controler_event_processer.cpp |  1 +
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/uappbase/appcfg/appcfg.hpp b/uappbase/appcfg/appcfg.hpp
index 79c9dc1..1b732b2 100644
--- a/uappbase/appcfg/appcfg.hpp
+++ b/uappbase/appcfg/appcfg.hpp
@@ -65,10 +65,10 @@
 #define ACID_DEFAULT_NAME14 "一氯乙酸"
 #define ACID_DEFAULT_NAME15 "氢氟酸"
 
-#define PUMPDEFVEL "800"  // 100r/min
+#define PUMPDEFVEL "400"  // 100r/min
 
 // 通道每次小回流的液体长度
-#define CH0APPENDML 2.5
-#define CH1APPENDML 2.5
-#define CH2APPENDML 1
-#define CH3APPENDML 1
+#define CH0APPENDML 0.2
+#define CH1APPENDML 0.2
+#define CH2APPENDML 0.1
+#define CH3APPENDML 0.1
diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp
index a6cc66f..cc98fe8 100644
--- a/uappbase/service/config_index.cpp
+++ b/uappbase/service/config_index.cpp
@@ -98,10 +98,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
     /***********************************************************************************************************************
      *                                                    回流参数配置                                                     *
      ***********************************************************************************************************************/
-    CFG_ITERM(kcfg_pipeLengthML0, kcfgt_float, "300"),  //
-    CFG_ITERM(kcfg_pipeLengthML1, kcfgt_float, "300"),  //
-    CFG_ITERM(kcfg_pipeLengthML2, kcfgt_float, "100"),  //
-    CFG_ITERM(kcfg_pipeLengthML3, kcfgt_float, "100"),  //
+    CFG_ITERM(kcfg_pipeLengthML0, kcfgt_float, "14"),  //
+    CFG_ITERM(kcfg_pipeLengthML1, kcfgt_float, "14"),  //
+    CFG_ITERM(kcfg_pipeLengthML2, kcfgt_float, "7"),  //
+    CFG_ITERM(kcfg_pipeLengthML3, kcfgt_float, "7"),  //
 };
 
 const char *cfgName(int32_t index) {
diff --git a/uappbase/service/config_service.cpp b/uappbase/service/config_service.cpp
index 78d2c3c..02c74b0 100644
--- a/uappbase/service/config_service.cpp
+++ b/uappbase/service/config_service.cpp
@@ -3,7 +3,7 @@
 #include "uappbase\service\app_event_bus.hpp"
 //
 
-#define CFG_HEADER 0x12345671
+#define CFG_HEADER 0x12345670
 /**
  * @brief CFG内存使用
  *
@@ -98,7 +98,7 @@ void ConfigService::setcfgAndFlush(config_index_t index, int32_t val) {
 void ConfigService::setcfgAndFlush(config_index_t index, float val) {
   zlock_guard lg(mutex);
   char        buf[CONTENT_MAX_LEN];
-  snprintf(buf, CONTENT_MAX_LEN, "%.2f", val);
+  snprintf(buf, CONTENT_MAX_LEN, "%.3f", val);
 
   _setcfgAndFlush(index, buf);
 }
diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/service/page/submenu/Page_muSettings.cpp
index e1d22d0..69a0670 100644
--- a/usrc/service/page/submenu/Page_muSettings.cpp
+++ b/usrc/service/page/submenu/Page_muSettings.cpp
@@ -150,22 +150,22 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
   }
 
   if (bid == ob_muSettings_pipeLen0) {
-    CS->setcfg(kcfg_pipeLengthML0, text);
+    setCfgPipeLengthML(0, atof(text));
     UIS->setTxt(bid, zfmt("%.2f", getCfgPipeLengthML(0)));
   }
 
   if (bid == ob_muSettings_pipeLen1) {
-    CS->setcfg(kcfg_pipeLengthML1, text);
+    setCfgPipeLengthML(1, atof(text));
     UIS->setTxt(bid, zfmt("%.2f", getCfgPipeLengthML(1)));
   }
 
   if (bid == ob_muSettings_pipeLen2) {
-    CS->setcfg(kcfg_pipeLengthML2, text);
+    setCfgPipeLengthML(2, atof(text));
     UIS->setTxt(bid, zfmt("%.2f", getCfgPipeLengthML(2)));
   }
 
   if (bid == ob_muSettings_pipeLen3) {
-    CS->setcfg(kcfg_pipeLengthML3, text);
+    setCfgPipeLengthML(3, atof(text));
     UIS->setTxt(bid, zfmt("%.2f", getCfgPipeLengthML(3)));
   }
 
diff --git a/usrc/service/remote_controler_event_processer.cpp b/usrc/service/remote_controler_event_processer.cpp
index 50346e5..cb7b657 100644
--- a/usrc/service/remote_controler_event_processer.cpp
+++ b/usrc/service/remote_controler_event_processer.cpp
@@ -96,6 +96,7 @@ void RemoteControlerEventProcesser::processKeyEventFromRemoter(hand_acid_remoter
   if (PUMPCS->isWorking()) {
     PUMPCS->stop();
     RCTRL->setRemoterState(GSM->getRunMode(), PUMPCS->isWorking());
+    return;
   }
 
   if (UIS->getNowPage() == pg_muPumpTest) {