From 679cbec6867f2c2ace567c8404a5a360c4642f9e Mon Sep 17 00:00:00 2001
From: sunlight <2524828700@qq.com>
Date: Sun, 1 Sep 2024 21:46:40 +0800
Subject: [PATCH] 1.fix some bug

---
 uappbase/service/config_index.cpp             |  12 ++++-----
 uappbase/service/config_service.cpp           |   2 +-
 ui/hand_acid_mainboard_ui.HMI                 | Bin 19065065 -> 19065065 bytes
 usrc/service/page/submenu/Page_muSettings.cpp |  34 ++++++++++++--------------
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp
index b6917fb..aacb5b6 100644
--- a/uappbase/service/config_index.cpp
+++ b/uappbase/service/config_index.cpp
@@ -70,10 +70,10 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
     /***********************************************************************************************************************
      *                                                    电机默认配置                                                     *
      ***********************************************************************************************************************/
-    CFG_ITERM(kcfg_mLPR0, kcfgt_float, "10"),  //
-    CFG_ITERM(kcfg_mLPR1, kcfgt_float, "10"),  //
-    CFG_ITERM(kcfg_mLPR2, kcfgt_float, "10"),  //
-    CFG_ITERM(kcfg_mLPR3, kcfgt_float, "10"),  //
+    CFG_ITERM(kcfg_mLPR0, kcfgt_float, "0.6372"),  //
+    CFG_ITERM(kcfg_mLPR1, kcfgt_float, "0.6372"),  //
+    CFG_ITERM(kcfg_mLPR2, kcfgt_float, "0.1538"),  //
+    CFG_ITERM(kcfg_mLPR3, kcfgt_float, "0.1538"),  //
 
     /***********************************************************************************************************************
      *                                                      其他配置                                                       *
@@ -88,8 +88,8 @@ static cfg_iterm_info_t cfg_iterm_infos[] = {
     CFG_ITERM(kcfg_pumpDefVel2, kcfgt_int32, PUMPDEFVEL),  //
     CFG_ITERM(kcfg_pumpDefVel3, kcfgt_int32, PUMPDEFVEL),  //
 
-    CFG_ITERM(kcfg_m0irun, kcfgt_int32, "20"),  //
-    CFG_ITERM(kcfg_m1irun, kcfgt_int32, "20"),  //
+    CFG_ITERM(kcfg_m0irun, kcfgt_int32, "31"),  //
+    CFG_ITERM(kcfg_m1irun, kcfgt_int32, "31"),  //
     CFG_ITERM(kcfg_m2irun, kcfgt_int32, "20"),  //
     CFG_ITERM(kcfg_m3irun, kcfgt_int32, "20"),  //
 
diff --git a/uappbase/service/config_service.cpp b/uappbase/service/config_service.cpp
index 4ebc59b..461e1f1 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 0x12345679
+#define CFG_HEADER 0x12345670
 /**
  * @brief CFG内存使用
  *
diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI
index 9139320698b32d0f43659ff26ee2c224e03df26e..aa375cb4b5e0e71f4ff1d188eac5bf85d7068c32 100644
GIT binary patch
delta 2187
zcmdUvi&s=d9LImd?y_J?A+aq8LLJWO2_%)4fRScFp<!gG8A?fsg)Yg<OjhBmTTuc+
zt_37&VG)=-YB4}w`HT<}e1NI>2q=@xfY6X;;KH2KUr=+-_p_fnckcbo-MMqSnp17N
zc-#*WQFKJqa<9NyL0pw)pc*yT0kw6p`-9Ah{x#s9%HaX5G@4ztXFiz`4i2t;(-={G
z-%!H&m8Tw>q!N9twY{{oG{Yf`-{%1@L&Qi8{=3N2mbLI9ER#77s<R{d4`wzv>Qh{F
zCKny!vEotjsChIz))p6?wzJFS|25$YT`3`YQ;44NSn;TM)I1s<YfFe;ySwARFrYL<
zpS}tY;}J}SFZ|$-X?PR?cns4q1CL`Sp1_j`L=c|B(+I{a%*Hba!5ln`P&|jZcphPx
zhxu557qAd7A{>jb7!i00FJlQJ@d{qWQbb`HUc>8%#&WEH0Wo+3D-nx0#3KQTScNyS
z8gF3@l3>JItV1$V0IbIbnD92<!MjMsdw3rkk%n|+U=uQtg%7Y9W^BQS_z2m^K`uVV
zR^(wDwqplA!KcW_PJD*XQGhQ{h$8I5m)MPBl%N!4_zGXcf^zJ^H>f}*s<0Q;s6j32
zP>*l15BqTd2XP38@f{lQJsNQYO=!jsIEogu;uwzO1Wuw2?Kp)WaT;fE7C+$}&f@|u
z;%9WA6J7WPzv2>p!)0{icU-|AxQai^dQK;6vXXAN^=)0kx5X5rm)L>4ozoJH<6BF#
zZX2SpieI-SDpbbov?FR%4UdT%PZX&1SLx)Ks0q>?-KE!hNRPgI)Q#liHF`k%e5A)r
zk?!h86s#1B3Lq*{TsKpCJ^!$b^c!YNcMX+(I81uNLgB{Yr}5z5i;;_)Bc&%TBWhKO
zg|3kO6f3<bQTl>4(zVIb%Qi@lNR@79OegYG3ixIbnG~<vBKx~@i0;%3PgJ*E_Rq+d
zZYYqRyNjrwFQI6gEkuzcOIc22rTD-eqFBC^L(d;mMWj_uB<_{(!TM@`fifXeJ<+|2
zmmH8w6W$;Tr#4A1Z;|(`Zk4|O7?G_~>&S6lU!xqfoFJ;O8lH7pJ5jvyqG`?$<tT->
zotN(4DgERn>2X)2+xJQ@x+XnnaK!oZUsSQt0_$uT<toJ{^6fC<7538S>7@5KOW))s
z-P=QY!(Gy&Jf&OvFe<rEDONt2(PhQ+eHp2hf2F{W5uejgE2$2cWXoDrY_hp>Wt+G8
zY`ewJVhpa+sLc1zZJ%z=PH5Aa^NJ1Gmc`L^^O?D6PF<uWFTZChGu34DSZXqQJG?Ei
z@%5#wdad&qw!_MjUfSNzEE{8cN4+t*eRZJ8-?5M9FP?s$YdqI^{^l9rxxq7->hH+X
zcm%8jR03)Njexa)R=`HUR$z?4O#)*D#tGO7+$?a5fW5$Y0SAFw1%?Xggxw~f7jP1A
b7MLL5BH$`8QNT^WUEp?B?eBO8D?IuSqZmbQ

delta 1663
zcmdUv|99169KfIFe%Y5am36PXS=#VJhqI|TNUbl3g>pki(JYB*-<VO!vc0rvv9-~{
zGE`WGty?Z?yM2*~X{CKBmyx1fGLlV2uIK4~>T{02fajdo>%PwCJooc{&OPV3fn6n$
z0Y&_Fp;r3r%%qfw6Lf}Fw%BA7LZ0Zb*T-KfV>14=;lhof4Z@Qlj|`BaB0V~KP}68B
z<dzm86w}o=>&Apx^|RHRd&P3k(&$tfGyIaI?DSJJ)Mr{^q-<4NM1^z&Z7l;AXH_&i
zT!nGYqBy5iSQJ);O<`ArdE=bnU4gj&*MScN3f-<Ew@WH43ai4Vuq(p6ZdZ8S!T-Vr
zkK0u?mn#^-m5gK*$&6+UV;RR)T+KC%=UT2Kg$Z2G4cy2?CUFyPCUY~la4S=|jZ|*u
z4yH1VJGqPLq;WUt%-|koaxb&EkNcU;13btaGRP#0Y;t&rhsos;@_3ZTn9Dro^EeB5
zf_xV8Bn1=#PqBz1ig}vFl(2+nc$QMiSV}n+Jje4aqmt#kz>B;@6)Sj|YF^=0USlPz
zSk3Fa!JE{uhPSBYZQkKs>ZoTe9@ep*_we#QAMha?*hmA7_}Ii|wy>3t*v7{+@d?}c
zl+S49b9T_ePImDHyJ@A3b~@O@UcSW7SA0z;-|#K__>TP?;Cp`HAYBCbk)Jrk&vf$(
zzjB!0IKuDidO8d2i!v^l(^NfEU5m?oQ`aQOqcT6&8oDs!8iWW}S4FRsMj@h%p5hb2
zqAsgmsau7($moJ5A!?0IY8E2V=xIC6E^am7S=wgyvUVXNL+{TQ)g40EjbW?y2(iHu
z8kXi4BF{KnTc;3J#(<ptW=D0IU319n@rTXc*JJjA<7USMb?1kMt+&e4113jEvBDVE
z-Pi0A^-px_`4Fes+hWb0G1%<j`DRxQF?&R!+3iDzNwL-#R(zQh-A3n)l)`5GD)UB3
zq0V%275K&ui<E6vUu%7W+#6n*<?}l$Ck@YWRt9Ub!-`tUd%P{>y%85zX3okP>h0g)
z_ekHu*gkTl#arg_ACun3+}_i@qrg8ur6}3)hvKN>nButNPsLw~6N<kT!IET$ELCV(
zw5(b-ExT5jR=8G#R-{%RtuwUxYDH<Csnt)bzt#Y)v$UeM25Oxg<kWSxmP;!}D^}|q
YtvIbgTIXsF){56kkiKNcd9rr*Kfy%$*Z=?k

diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/service/page/submenu/Page_muSettings.cpp
index fef49e0..55b8ea7 100644
--- a/usrc/service/page/submenu/Page_muSettings.cpp
+++ b/usrc/service/page/submenu/Page_muSettings.cpp
@@ -65,10 +65,10 @@ void Page_muSettings::updatePage() {
   UIS->setTxt(PAGE, ob_muSettings_irun1, zitoa(getMxIRun(1)));
   UIS->setTxt(PAGE, ob_muSettings_irun2, zitoa(getMxIRun(2)));
   UIS->setTxt(PAGE, ob_muSettings_irun3, zitoa(getMxIRun(3)));
-  UIS->setTxt(PAGE, ob_muSettings_pumpCoef0, zfmt("%.1f", getMotorMLPR(0)));
-  UIS->setTxt(PAGE, ob_muSettings_pumpCoef1, zfmt("%.1f", getMotorMLPR(1)));
-  UIS->setTxt(PAGE, ob_muSettings_pumpCoef2, zfmt("%.1f", getMotorMLPR(2)));
-  UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.1f", getMotorMLPR(3)));
+  UIS->setTxt(PAGE, ob_muSettings_pumpCoef0, zfmt("%.4f", getMotorMLPR(0)));
+  UIS->setTxt(PAGE, ob_muSettings_pumpCoef1, zfmt("%.4f", getMotorMLPR(1)));
+  UIS->setTxt(PAGE, ob_muSettings_pumpCoef2, zfmt("%.4f", getMotorMLPR(2)));
+  UIS->setTxt(PAGE, ob_muSettings_pumpCoef3, zfmt("%.4f", getMotorMLPR(3)));
   UIS->setTxt(PAGE, ob_muSettings_pipeLen0, getCfgStr(kcfg_pipeLengthML));
   // TODO:改成4个输入框
   UIS->setTxt(PAGE, ob_muSettings_addAcidVel0, zitoa(getMxRunRPM(0)));
@@ -122,16 +122,16 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
 
   if (bid == ob_muSettings_pumpCoef0) {
     setMotorMLPR(0, atof(text));
-    UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(0)));
+    UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(0)));
   } else if (bid == ob_muSettings_pumpCoef1) {
     setMotorMLPR(1, atof(text));
-    UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(1)));
+    UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(1)));
   } else if (bid == ob_muSettings_pumpCoef2) {
     setMotorMLPR(2, atof(text));
-    UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(2)));
+    UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(2)));
   } else if (bid == ob_muSettings_pumpCoef3) {
     setMotorMLPR(3, atof(text));
-    UIS->setTxt(bid, zfmt("%.1f", getMotorMLPR(3)));
+    UIS->setTxt(bid, zfmt("%.4f", getMotorMLPR(3)));
   }
 
   /***********************************************************************************************************************
@@ -161,18 +161,16 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) {
       UIS->alert("转速不能大于1000");
       return;
     }
+
+    switch(bid)
+  {
+    case ob_muSettings_addAcidVel0:setMxRunRPM(0, rpm);break;
+    case ob_muSettings_addAcidVel1:setMxRunRPM(1, rpm);break;
+    case ob_muSettings_addAcidVel2:setMxRunRPM(2, rpm);break;
+    case ob_muSettings_addAcidVel3:setMxRunRPM(3, rpm);break;
   }
+  UIS->setTxt(bid, zitoa(rpm));
 
-if (bid == ob_muSettings_addAcidVel0 || 
-    bid == ob_muSettings_addAcidVel1 || 
-    bid == ob_muSettings_addAcidVel2 || 
-    bid == ob_muSettings_addAcidVel3) {
-    int rpm = atoi(text);
-    setMxRunRPM(0, rpm);
-    setMxRunRPM(1, rpm);
-    setMxRunRPM(2, rpm);
-    setMxRunRPM(3, rpm);
-    UIS->setTxt(bid, zitoa(rpm));
   }
 
   updatePage();