From c8169b1aeaa2d3f43e4e6791c47863254669b7e8 Mon Sep 17 00:00:00 2001 From: sunlight <2524828700@qq.com> Date: Mon, 2 Sep 2024 15:43:57 +0800 Subject: [PATCH] update ui --- ui/hand_acid_mainboard_ui upadte.HMI | Bin 19270797 -> 19270797 bytes ui/ui.h | 102 +++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/ui/hand_acid_mainboard_ui upadte.HMI b/ui/hand_acid_mainboard_ui upadte.HMI index 346bb343129435eb0e3eaf0cebffe42ad9fb594b..dc1478d6e9105b584228e735ecd88b610ecac3a1 100644 GIT binary patch delta 6959 zcmeI0dsviZ7Qo+kZXgUgB@9qr##`$K87PW(q0PLkyV7c;>y@m`O>=HQlgdE8%6dVt zL0<1*Ub0YwknaTsodGN@Qvq9DT@|v@G+Ql2$y=RwzHj(|sGev4*k|{7{GR7`o-^~E zbKcvWb6&_;x3*mdkkxth=N(r^6e{msQ5SyMh%s`URRm+~Xi!)u^qD|sWSz3*x>kpY-~kE&A#)G91f%qT_+e!ULOa+E8LIMVTiDp-j^ zkzw4lq9?+kUu#E4d_3tMaTtPa5{#CLo|@v$DWdRE8Zp_4A81E#}{xnnyi zNBAV7Jy={_(Ns;I0=Dp;FKl5^P`hYs?-$W>ii%H*(ai}Err8udpW&;Q8f(SbaDYDXqk_=HrSLF2X!~F#Iq3GhTr$El%P6==-0o`90=U> zIG*<(`CMenP^eczDN30FHk?*-*jiqS-t-q^MYW8DdL1f7g&%>>y<+ts$9Mk0YIG1j zIRdo&C)`V$4`)%M4IYXs-$#A>w;Yr{=|-KNhF#&b8neh!fl3yNV;1!cIOD6DRIcCe zCNx<_UuV52e{k|*@@@m$9 zmRDJq7RQC8$Aw@(0Vn|#pawK7F2twc;{Sp{QCvutjSM7%$Y3&r3?;+Ja593#kXZ5* z`2%^Hj3m#HQDih3L&lOnl5ylu)N9J7XQ4>Tiso z<$lIIy3pUKqot>fAuLN}%vPxU1|AoXiIvAzmaA5n`-Nse~e{JG);NtbuGJE zZgE9BU~B1~j>2ME;54adR@!MDYusvj+n*K9HV+)Z#-*Arg|g4wW`$M#XyAcwtTbY+ zb-cYo>8SyzGc?{tNe|K?bWYN*cSOi8>E>XBmPq=oM-XZcb(ufvPO{#yv#fXPBI{3f zMJPn_9n~G7P*Jy|nY|F2EWIf0jnExQ-wU?{ok|?wK!iNG@+jGc4U}yT4wY?OF|tkB z)3VJc(4M`EtQ^N}e8mCw#nG$=%W$geVOG(3R+Ek`|IzfN5ABfe*3*JStA;N3G3)5D z*D5r$-DZo97WkM8se7d(=I=Fc?PgQe0we4#-|ko0wa z(D9@_S>IkhjIIyM-y8I@-VF}PYu_CXBiS3Lo2=_#|KWRx3{N^7Kr*dKH4R~g*DXU7 zIoV}88nMq5PYo5;FdDPcRzN!(74-CIBh%zWmgsT|v_3c-$J3g4a}cg)g?CI-aIRb9 zgP+UI3-!S&S452l&%msU-BO~&D=0o{4Z=HUY_=^H`_Y*U&3sGw53?3sIu4a{fUv3SjC%JpJBu4Cd%3@1$I@N#jkGsST2#JR2)S4dN1&9T&Q zG$~MhWM{EElEOLfq{e((5bd%6eg(QvV=C@0PG1Z_JM_2daog^FMR$9uGl<#`C*@#g zb5A^2TuIx${Y2mDw_HKAbGS_$n$9S^smIdHYk$qXKdl&VN`qo}PRsV(uq@j8v%116 zcO>TH^vk}9KoXD)ybjoaH-H7eLSPY)0@#66APsmESPT$g39uAM2mTH$1C|3TfR#W7 zunNcovVhgVTYv+|2G#&M00q_p>wxvZ24Eww3D^we0(rm|;B8;T>Yb^`AL z?*aM1E?_sX2Y4SS01AN*fFfWoyX;#WQWfythR03(ZvmdSdK$V&2($Y_5&Trj+s`1s zyt%p@ZsloGzWKxLc(tT&guGQrIh+T1>(#eG-g@<&khfla7v!zC7W9R}sg!*CKZejs zC9-?+w&M2)X`~kipOEzB(Z#aE+!YNUM_ryai%B#M6;Z7A)F2u%JkH5!?c0by9K?18g`kY=+~J-A^x2w zUu07#FubxfH?H1ni=xwxnF4dNg-zJq+F^tzNt!!A^nN+lO+jGqn_Jze!E2~HuS}XY zpASCyGavT`;euyz_%1C>vc`>$T!iXNfb9%f%Q+HIW>PO~ovp=@1^@YO|C)lkD-cDqv8 zukHXP9?hEjQi8cpQo`I}5flfPM9}%m8nn6hnIAskxi+z@9}9QK!A)IDV@4(h((0B`p8`jKqrfqs8mIwkf#bkuz(0T!z)9erz$xG~@GsyDa27ZR z)B*Lt=fHX33*bxOE8qff5%?Oo1Y8Eb0j>bw0{;fC0@r}=fbW6pzzv`QxCz_>8i5~x z+rS;*E^rUH5B#_yZvoB(xKMDR6(T)p0F8sOBauL8qdoDU~q2uBq zE*|EhBNu^O1aYC~BAAO1E<(9@go{VH=)^^5F1m2hl?wwG-MHw^MGr1|VpraRUijOr Fp8%ehV*mgE delta 7523 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 diff --git a/ui/ui.h b/ui/ui.h index da7625e..d5b9ec7 100644 --- a/ui/ui.h +++ b/ui/ui.h @@ -12,19 +12,19 @@ #define pg_muAcidType 10 #define pg_changePasswd 11 #define pg_muSettings 12 -#define pg_muDeviceInfo 13 -#define pg_muAudit 14 -#define pg_muPumpTest 15 -#define pg_alert 16 -#define pg_confirm 17 -#define pg_keybAcidCh 18 -#define pg_keybdB 19 -#define pg_keybdAP 20 -#define pg_keybdA 21 -#define pg_keyPasswd 22 -#define pg_muBleHandSett 23 -#define pg_muMotorSett 24 -#define pg_muPumpSett 25 +#define pg_muBleHandSett 13 +#define pg_muMotorSett 14 +#define pg_muPumpSett 15 +#define pg_muDeviceInfo 16 +#define pg_muAudit 17 +#define pg_muPumpTest 18 +#define pg_alert 19 +#define pg_confirm 20 +#define pg_keybAcidCh 21 +#define pg_keybdB 22 +#define pg_keybdAP 23 +#define pg_keybdA 24 +#define pg_keyPasswd 25 //gvar.objs #define ob_gvar_gvar 0 #define ob_gvar_menupageid 1 @@ -193,6 +193,48 @@ #define ob_muSettings_pumpSett 4 #define ob_muSettings_motorSett 5 #define ob_muSettings_muBleHandSett 6 +//muBleHandSett.objs +#define ob_muBleHandSett_muBleHandSett 0 +#define ob_muBleHandSett_bak 1 +#define ob_muBleHandSett_pageTitle 2 +#define ob_muBleHandSett_bleCliName 3 +#define ob_muBleHandSett_bleScan 4 +//muMotorSett.objs +#define ob_muMotorSett_muMotorSett 0 +#define ob_muMotorSett_irunTil 1 +#define ob_muMotorSett_bak 2 +#define ob_muMotorSett_irun0 3 +#define ob_muMotorSett_pageTitle 4 +#define ob_muMotorSett_irun1 5 +#define ob_muMotorSett_irun2 6 +#define ob_muMotorSett_irun3 7 +#define ob_muMotorSett_t0 8 +#define ob_muMotorSett_t1 9 +#define ob_muMotorSett_t2 10 +#define ob_muMotorSett_t3 11 +//muPumpSett.objs +#define ob_muPumpSett_muPumpSett 0 +#define ob_muPumpSett_bak 1 +#define ob_muPumpSett_pageTitle 2 +#define ob_muPumpSett_pumpCoefTil 3 +#define ob_muPumpSett_pumpCoef0 4 +#define ob_muPumpSett_pumpCoef1 5 +#define ob_muPumpSett_pumpCoef2 6 +#define ob_muPumpSett_pumpCoef3 7 +#define ob_muPumpSett_pipeLenTil 8 +#define ob_muPumpSett_pipeLen3 9 +#define ob_muPumpSett_addAcidVelTil 10 +#define ob_muPumpSett_addAcidVel3 11 +#define ob_muPumpSett_addAcidVel0 12 +#define ob_muPumpSett_addAcidVel1 13 +#define ob_muPumpSett_addAcidVel2 14 +#define ob_muPumpSett_pipeLen0 15 +#define ob_muPumpSett_pipeLen2 16 +#define ob_muPumpSett_pipeLen1 17 +#define ob_muPumpSett_t0 18 +#define ob_muPumpSett_t1 19 +#define ob_muPumpSett_t2 20 +#define ob_muPumpSett_t3 21 //muDeviceInfo.objs #define ob_muDeviceInfo_muDeviceInfo 0 #define ob_muDeviceInfo_bak 1 @@ -463,37 +505,3 @@ #define ob_keyPasswd_loadcmname 25 #define ob_keyPasswd_m0 26 #define ob_keyPasswd_clear 27 -//muBleHandSett.objs -#define ob_muBleHandSett_muBleHandSett 0 -#define ob_muBleHandSett_bak 1 -#define ob_muBleHandSett_pageTitle 2 -#define ob_muBleHandSett_bleCliName 3 -#define ob_muBleHandSett_bleScan 4 -//muMotorSett.objs -#define ob_muMotorSett_muMotorSett 0 -#define ob_muMotorSett_irunTil 1 -#define ob_muMotorSett_bak 2 -#define ob_muMotorSett_irun0 3 -#define ob_muMotorSett_pageTitle 4 -#define ob_muMotorSett_irun1 5 -#define ob_muMotorSett_irun2 6 -#define ob_muMotorSett_irun3 7 -//muPumpSett.objs -#define ob_muPumpSett_muPumpSett 0 -#define ob_muPumpSett_bak 1 -#define ob_muPumpSett_pageTitle 2 -#define ob_muPumpSett_pumpCoefTil 3 -#define ob_muPumpSett_pumpCoef0 4 -#define ob_muPumpSett_pumpCoef1 5 -#define ob_muPumpSett_pumpCoef2 6 -#define ob_muPumpSett_pumpCoef3 7 -#define ob_muPumpSett_pipeLenTil 8 -#define ob_muPumpSett_pipeLen3 9 -#define ob_muPumpSett_addAcidVelTil 10 -#define ob_muPumpSett_addAcidVel3 11 -#define ob_muPumpSett_addAcidVel0 12 -#define ob_muPumpSett_addAcidVel1 13 -#define ob_muPumpSett_addAcidVel2 14 -#define ob_muPumpSett_pipeLen0 15 -#define ob_muPumpSett_pipeLen2 16 -#define ob_muPumpSett_pipeLen1 17