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/4] 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_%)4fRScFp2q=@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#77sQh{F zCKny!vEotjsChIz))p6?wzJFS|25$YT`3`YQ;44NSn;TM)I1sjb7!i00FJlQJ@d{qWQbb`HUc>8%#&WEH0Wo+3D-nx0#3KQTScNyS z8gF3@l3>JItV1$V0IbIbnD92f}*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|3kO6f34(zVIb%Qi@lNR@79OegYG3ixIbnG~&S6lU!xqfoFJ;O8lH7pJ5jvyqG`?$ zotN(4DgERn>2X)2+xJQ@x+XnnaK!oZUsSQt0_$uT7@5KOW))s z-P=QY!(Gy&Jf&OvFeWt+G8 zY`ewJVhpa+sLc1zZJ%z=PH5Aa^NJ1Gmc`L^^O?D6PFhH+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*-T{02fajdo>%PwCJooc{&OPV3fn6n$ z0Y&_Fp;r3r%%qfw6Lf}Fw%BA7LZ0Zb*T-KfV>14=;lhof4Z@Qlj|`BaB0V~KP}68B z&Apx^|RHRd&P3k(&$tfGyIaI?DSJJ)Mr{^q-<4NM1^z&Z7l;AXH_&i zT!nGYqBy5iSQJ);O<`ArdE=bnU4gj&*MScN3f-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#(y%85zX3okP>h0g) z_ekHu*gkTl#arg_ACun3+}_i@qrg8ur6}3)hvKN>nButNPsLw~6NsetTxt(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(); From b7d2b2106aaccbb14012a962aef3c4d320758b98 Mon Sep 17 00:00:00 2001 From: sunlight <2524828700@qq.com> Date: Sun, 1 Sep 2024 22:38:54 +0800 Subject: [PATCH 2/4] fix some bug --- uappbase/appcfg/appcfg.hpp | 4 ++-- uappbase/service/config_index.cpp | 16 +++++++-------- uappbase/service/config_service.cpp | 2 +- usrc/service/page/submenu/Page_muSettings.cpp | 29 +++++++++++++++------------ 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/uappbase/appcfg/appcfg.hpp b/uappbase/appcfg/appcfg.hpp index 52968b8..833fb2c 100644 --- a/uappbase/appcfg/appcfg.hpp +++ b/uappbase/appcfg/appcfg.hpp @@ -29,7 +29,7 @@ #define STEPMOTOR_IHOLDDELAY 100 #define MOTOR_VSTART 50 // 启动速度 #define MOTOR_A1 15 // 阶段1_加速度 -#define MOTOR_AMAX 50 // 阶段2_加速度 +#define MOTOR_AMAX 30 // 阶段2_加速度 #define MOTOR_V1 300 // 阶段2_开始速度 #define MOTOR_TZEROWAIT 100 // 速度零点点切换时间 @@ -65,4 +65,4 @@ #define ACID_DEFAULT_NAME14 "一氯乙酸" #define ACID_DEFAULT_NAME15 "氢氟酸" -#define PUMPDEFVEL "800" // 100r/min \ No newline at end of file +#define PUMPDEFVEL "500" // 100r/min \ No newline at end of file diff --git a/uappbase/service/config_index.cpp b/uappbase/service/config_index.cpp index aacb5b6..ef0dd13 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, "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"), // + CFG_ITERM(kcfg_mLPR0, kcfgt_float, "0.7000"), // + CFG_ITERM(kcfg_mLPR1, kcfgt_float, "0.6800"), // + CFG_ITERM(kcfg_mLPR2, kcfgt_float, "0.1300"), // + CFG_ITERM(kcfg_mLPR3, kcfgt_float, "0.1400"), // /*********************************************************************************************************************** * 其他配置 * @@ -88,10 +88,10 @@ 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, "31"), // - CFG_ITERM(kcfg_m1irun, kcfgt_int32, "31"), // - CFG_ITERM(kcfg_m2irun, kcfgt_int32, "20"), // - CFG_ITERM(kcfg_m3irun, kcfgt_int32, "20"), // + CFG_ITERM(kcfg_m0irun, kcfgt_int32, "22"), // + CFG_ITERM(kcfg_m1irun, kcfgt_int32, "22"), // + CFG_ITERM(kcfg_m2irun, kcfgt_int32, "22"), // + CFG_ITERM(kcfg_m3irun, kcfgt_int32, "22"), // CFG_ITERM(kcfg_bleClientName, kcfgt_str, ""), // diff --git a/uappbase/service/config_service.cpp b/uappbase/service/config_service.cpp index 461e1f1..78d2c3c 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 0x12345670 +#define CFG_HEADER 0x12345671 /** * @brief CFG内存使用 * diff --git a/usrc/service/page/submenu/Page_muSettings.cpp b/usrc/service/page/submenu/Page_muSettings.cpp index 55b8ea7..969590f 100644 --- a/usrc/service/page/submenu/Page_muSettings.cpp +++ b/usrc/service/page/submenu/Page_muSettings.cpp @@ -147,10 +147,7 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { * addAcidVel * ***********************************************************************************************************************/ // TODO改成4个输入框 - if (bid == ob_muSettings_addAcidVel0 || - bid == ob_muSettings_addAcidVel1 || - bid == ob_muSettings_addAcidVel2 || - bid == ob_muSettings_addAcidVel3) { + if (bid == ob_muSettings_addAcidVel0 || bid == ob_muSettings_addAcidVel1 || bid == ob_muSettings_addAcidVel2 || bid == ob_muSettings_addAcidVel3) { int rpm = atoi(text); if (rpm < 300) { UIS->alert("转速不能小于300"); @@ -162,15 +159,21 @@ void Page_muSettings::OnInputFieldContentChange(uint8_t bid, const char* text) { 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)); - + 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)); } updatePage(); From b42d21ae61c2a5568aeac4162c8eacd25ac8af10 Mon Sep 17 00:00:00 2001 From: sunlight <2524828700@qq.com> Date: Sun, 1 Sep 2024 22:46:00 +0800 Subject: [PATCH 3/4] fix some bug --- ui/ui.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/ui.h b/ui/ui.h index dd11cd8..6cd15e4 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -191,7 +191,7 @@ #define ob_muSettings_pumpCoef2 11 #define ob_muSettings_pumpCoef3 12 #define ob_muSettings_pipeLenTil 13 -#define ob_muSettings_pipeLen0 14 +#define ob_muSettings_pipeLen3 14 #define ob_muSettings_addAcidVelTil 15 #define ob_muSettings_addAcidVel3 16 #define ob_muSettings_bleCliTil 17 @@ -202,6 +202,9 @@ #define ob_muSettings_addAcidVel0 22 #define ob_muSettings_addAcidVel1 23 #define ob_muSettings_addAcidVel2 24 +#define ob_muSettings_pipeLen0 25 +#define ob_muSettings_pipeLen2 26 +#define ob_muSettings_pipeLen1 27 //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_bak 1 From 2ff47fc7cfae27776319da9d86cff29b8d01b76b Mon Sep 17 00:00:00 2001 From: sunlight <2524828700@qq.com> Date: Sun, 1 Sep 2024 22:46:55 +0800 Subject: [PATCH 4/4] fix some bug --- ui/hand_acid_mainboard_ui.HMI | Bin 19065065 -> 19065065 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI index aa375cb4b5e0e71f4ff1d188eac5bf85d7068c32..144a8fe11456f0102ccee8da568b03a30e81576c 100644 GIT binary patch delta 2850 zcmeH}X;@Tc6vy8?Gk^?^;KGE6Nt%98Guuo|C($eylqpvt!5tSwK+tdl<*%q9pn$h< zBh0K^VPx)g9T1mH(@?QuGEpg^P0BmX3}}hZYJcL z7Pek0JblL?@Gi!P2y&_+Cte#9trgmG2Xf2_^sUx}vyIDh&iMMJ2I$iQ^a7zG)P#m` zBiy9`y+>_bz<>8}HFc>*zciztK&S{cp&{G|cgg7IvG>Nmp}}PI%T7XX1fdUJL0|NP z0k5Jzf-wLC@frr)aBOMu7gG^*08*8x+ImksG)@Nb}qd|S#f!`F_mUM+~ejhD(QMNDO5;H)=7j+>?aNo2Z=+(Vd4m3 zAxeod;wVv093zesCy0~8XT&MubK*2{hWLUwOPnLVBr1sW#0BCaQAu1Pz9PORz9Fgz zEAcIHnfQ*lLR1r1iEG4lqK5dM_<^`V)Dm^XkHk;J&%`gpuf$EFp7@RUow!B(Atmc> zM<%)j)-POeXUmjlJcXAf|J2*nm&NL9alT^dajU18G1D3(rg+Z{w$yuRg%c_<`))}$ zb7n)7N{WcJYMt|Y2`;%M#a}D9G#p82aLLaubJ-w8RJg2L>bo~F=#l2qAQ|$kUXLe; z*Er11TSnr(e%!*MaC zZ(nvBIw8AJ&T4h-Safi4|{7Kv+{vz%Z4~U0EV|rzo zkVSA&aZz*8aB<_}&c#EpRMKCb)wA4cOQw%?x}S!tPG8LbH|_BQLwEU~-?Vj_tX%rj zN8-h$ITsz57F@i!_;6{-r4^UfT-tE)<)Y{E1Q$OpZMpb!X~!jiOM5O)a_PV&kjqno LB{#aGFnZD7*GOD; delta 2810 zcmd^>hgVcb6o>DyyL2>`T~P@TOH9L(7*QaK1!F^36pamn9Yv)HHU#8GBF0e7v!GzZ z5)}m9T}521Xe5G0)L=u!LO^3fBZ}k>Je-sK1vw{k&i6atn>TOo%)VN2ex*eP;dllB z=J@%~?L5eHFsa-EAzw*at2Eu`*qyb7e+~HLaKiw0p(tk_J8I4#xtnE+_L;r_tRRz) zJD}R{^1_5~^LD>Z2bHbs_a)D;T-CZ)=Rm)PJq;N>$pB~h*c=X0gMez7k5%|wV(m1HFd-C# zl28$*dOMBTg9^L<$3n|1VzjogT3be#5DG#`s0dTN*48ZR{(oUWj@C9|A@;;x=z^~3 zhF@WC?1S#u7yDs<9Dp7;5WmJjI2ecEP#lJyI2=cy7Du8Nj>6ICjbm^ueuLw1JWjxg zI0=2w7r#Y6oQzX&Do(@cI0I**KhDD07=UwdF3!V148mXx!BCu!VHl1Ja3LT#Y}WglljuuEX`1iW_hv zreQj6!p*n^x8gR;!0osLcj7Mm8F%9z+>4o*h5IlYb8tT%*strEt}@RWTbC&YFK8*R!E6?;c6*ui=iLOl!E#PtEGkMhAdr~PR*pUk@HjZ+6;re zm6RAAv`Z?BGH9fPyl_+L?G2qVZgqKmvURlIg6a2Kp0;ye<*4Z3W4t+j+)zIs z``l}F_m5=8>Vy3A9hm;{%=~mYrDALS=GaIZJz*dY5{HOf;xLg%93hNEK5>*dMjR(j z5GRRKL;-P{I79qGoFxj0Ux{->5m8K>CoT}b5f_OP;u3M0xI+9+loD5oYs7Wp262-p zBW@A5i919&ahJG9+$SCo6~rGzB~e8@Bpwle5|4=|#8cuK@mwEiQ|&unnX>e)gK>(J z1q-`nbYI(!C7BrCu4>0B$H$f&eL=h={vuuxHN|u0Bq>F&Rd~5fVJ#bEC6=PW3UOpIr%#F zY7Q_+?q8=7V+OVr{?tME#ty=VeEiNM;f2$?4cPp-@ZrwFYg_?_$;Ae`1MHFg*#P0` z^rmd=_Z%*~#!L8iy7?N%jGo9nvVOt9{KSsE(}Yi$1yCXv>pD;LUk?!;w?Mdagz)lc z;fc$I_g*QyGBO^(NiJZU0uU>E+8WVcmw-7zR zw8m3u05Flg^dLYeoyz+456=TIlXrL@5!b1Zh=N$(@gl68sQh(2%qO5+`5DCogWDw=p_73 zHwM|C$;DRpVDL!x7*_^L`Co~3V?cANZ}CR=ZWgRW!MaO_LrS~oT|-Ol6;fC4tNo<) z;iVd5x`zdO&ZOdz$EN9vGpb$a37c4LStJ#oHmHpWR+enA;-8O~v@!J6)?11)4Q?Nw zLP}x9!