From 675b0f52d115d29a6d2dedee88cd5342096d4de6 Mon Sep 17 00:00:00 2001 From: sfeakes Date: Mon, 13 May 2024 18:45:18 -0500 Subject: [PATCH] Update --- extras/aqua.sh | 21 +++++++++++++++++++++ onetouch.c | 2 +- release/aqualinkd | Bin 445488 -> 445508 bytes simulator.c | 8 ++++---- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/extras/aqua.sh b/extras/aqua.sh index c0a805bc..86f1ed6e 100755 --- a/extras/aqua.sh +++ b/extras/aqua.sh @@ -182,12 +182,33 @@ function check_git_installed { function check_curl_installed { command -v curl >/dev/null 2>&1 || { echoerr "curl is not installed. Installing"; exit 1; } } + +# +# Main +# + +# Check we are on a arm 32 bit machine. + +# below is compatable on all linux. +#if file -Lb /usr/bin/ld | grep -s -i armhf > /dev/null; then +# dpkg is good for debain distros. +if dpkg --print-architecture | grep -s -i armhf > /dev/null; then + echo "Architecture is armhf"; +else + echo "Architecture is '`dpkg --print-architecture`'" + echo "This does not look like linux running on a arm 32 platform" + echo "Please use another install method" + echo "https://github.com/sfeakes/AqualinkD/wiki#Install" + exit +fi + # Check something was passed if [[ $# -eq 0 ]]; then print_usage exit fi + # Pass command line if [ "$1" == "release" ]; then check_curl_installed diff --git a/onetouch.c b/onetouch.c index f25ff269..1b928f66 100644 --- a/onetouch.c +++ b/onetouch.c @@ -589,8 +589,8 @@ bool log_qeuiptment_status_VP2(struct aqualinkdata *aq_data) } else if (PANEL_SIZE() >= 16 ) { // Loop over RS 16 buttons. get_RS16buttoninfo_from_menu(aq_data, i); - } #endif + } } return rtn; diff --git a/release/aqualinkd b/release/aqualinkd index 827d7c63136fb4b1497b9e4b0bbb9c4d364eb6af..2652deb06c1b01c6bf30af912c11f8e98062fa9a 100755 GIT binary patch delta 7021 zcmZvh4OCTC7RUF!_q+?Epnw`UP@-aDTB2f-qT)yjhF|$CYM7)X!~6&n@ij6%L{w}s ziHbflT+zxD9V%wT9wsHtSc9dLn$GyaQY@w*al-NWF(c{x_j~8wOK;6t3*Y_iea=4n zoO{kb`&?_vBM+BHmPRXOoBHoo5;qc>^`|*h2G#^i%*9f1=CUqnC>1fr`VuCr@+_7|)$}4(U`?uTu+t z*>VwnGr98yogAk)!M^xC)*##g_+8s5oIy&p>!*t%+!b|N z1S&PI9p}VAcgkszXp;)1#tqrLF4(784DJc-_#ee!XrKR4tm#mmbGKcz9h#^ly7%LpIA*eD`nL^Sb45^$tmbBY zp^ai;g3W#oPB^YozT^|&v;yIEllAAo@pl9b(|q->gN?#&^hzKq_t?CmFg4goF%WFR z`b2-;agG90g`i~ou)#;ct<5SGNPd#_varDym|xbYQaZc>-1v}6b&|`#hp(9((oV2_ zmqr?-21miwyA+D?R=|kBM&SSnNDBOMwxZ0^vIi3e3!@y(+k}={O*}x8NUMr|x@(Mo##o)kvg=%1c9VmAl zc^YqWAH=wB8h(<-S8+|Mm&y!A%~(+vnX6eeM_@s`oX!N7WJ2BN_60XE7I zz78LD_07P&wD^tnuSAaOG-2fpQ%Cx&1rX zQdopMamT>+(;5Z&^dspM1j$Pkvj4(Yp$Qy+StYpXZ7^Vt(H%39;%Z~RyCD?pyrxo> ztkws7rrp}g_k-*A33Ht!f{nsvX8Lh9IK{1)3+QEV2qH`p>ayQ!e_r27+aahKtWuM# z@G-av#}=0m%>TUU-be30+~E=E1NT@HdlFoHK~Q{mUk4rF>UTABKzG2ow^gb@TXrC5 zJYwfLjbgpA1zY!i2%_H6XqKGmhrveS4paO%6Wq`d;GNk1aBvAYHddHh-w7`Mk3#Wi z%N=g>YhMM9sTY*S3&@EIfAyEN(G9}8_ql_Z2}C)sV^2!` zSa8~h3Ux}J3eJ2LTS`XLG-kQQoNV9%T#f6?hl_8@=c7VyvPRX?z^mX};{=_Oyaj9& zo}sMeO&#~Ee-oU5rHSz4^fm~ah&_f)SSAg`f>S2z^4RK0qrmCA zt*A5|Y!r6j89y!oXZ;qN13C^GE^y0RnmMCyftv<$e@>sre}X`KuTc&f@Cc5AOFY

rG4?Z>4IMpkVmf4Pr#isG&5ix1E)n=f&T)S)7ze2 z2gB(yIAaA4KttRyQPT;FA% zXMvk%A%d&E`uX6dbvDYB?Kgn);SgpVGZs#p!9}$iEtdKZz@^ZuQhyK}`=ibmPc@hh1GPFRBB%l31?wUc2V9YX;`bghCc}=%;(Q<0<0WUtPnE`DGxWMX=Mu2xBpN!`ADh{DZ5I8b4%J1znI0qb+Y%>p$mEf`) ziurC=gDY0~I^gZL5uAiP4SsnY+77OMTQ$?c_qqK=l~Sa>4jhEF=8d>~2z>=X!5AzK z&1c|W;L0u@cY@1v1hvSu5;6rH=Hm_qgQ3`jgTOh+cX~_xSa9(+)y%sJ?5HRUzrrV> zProU=GvGahUW9;tX`?i0U=_10++ZWPpi-j>secQcv`nK0==c@9?^pjX;GhA>6XYwo zghKMZ=K@Bk)&D>3Eic;^0o18)2tnX4A=6F4B~z!{J$E39|Du>cv`W{5rCXw)hP zz88E3cMl`3)Pb{48k;4Y8o?!RD@JBW$H8`7&V)4E25!HgQJmy%SQDLx6v~p^2OKxj zW*j9>x{nu)EIg2remogm-DS6?fn)G$<58Cf`i5VAvjF<&F^Ke1zrxSnI<|+v8tv6% zb8LkmzDvUM5xA;Qm@|Fe&%kAH9g+*ff&YT-8}X*(+Kx@d*@VqiBppZwSI1j#(hkmi zN9O9hITk<=g4-5*#Jg=78;G>hgF>+5l4d4ImEc<`)|7t;ZWby zl`@_O=btwYzX)mr*JF)v_}~#=2M>$Us6%omI0w$4mpL-KyMTt(aT`R*Q$9>Sq*N+J;ry{ z4yNs{R~G60@b&Et{5U^>w(~RO_;QJU3-%nwwM_PY7o7W;LbHN>-t?G(CH|F0Npe18 zz((QTM}tGoTgiwWT(QAs9#AiWtAbRj_x0x_Cj?2HlcO=u_v_$#~c0O|*Bo`wO+i5LUk`KI~Jhf=|}ifwYM&JU)Ak0V-LG_tP z@PHk-Z8&5XK^Su*K8paoF7yT)g}ZzJTyzz&2nAmxX$&~w3?@~Mc{aFqhhkol=gvl8 zZQX3nIu)WqX_xO>o57xURr9;c4zN+U!wZrW0UeW`jw@;)jB|rfa83+nKpK1qY!r4N37l}+x?e2-Z|M@h z^1zAdf-+_M5^x+G%0gSVzs+^_C9L+n5GQ}7n#sUHuu;PBa1vbAU8Mv(^Sl2ixFpod z%C3TQaq>k=z3TUw>pnjo39dP*8gbr96CfyvRp_uZkP2?SA2(^q&w~$lxyt8(n{f2T z$v0aJ4mqV#gygN@*ey2m%kBGMqws(}1$&TXm*Y8%1_#q|2oeTi1oB0k2A3AA)G8;g z4eW5;yG)OC-o#^0mm`4e_)4%Ib1eHF1SWiJ3-Q_xrm^6|>ouR1Wv-YwLs~LlN-tc-&HDgA6TZ}ec1iyDt&ja;CagzE}1v~r6o(AU7EGron5cD o_fTfJ=6K%m&5i4q`Uto#HF8X(kIqm2+CKr?mCr*29&syB~#&B)w*@YvAPh2?)f|ML|ie|&ZOD_?#5Zc^>U zcW!*6*+@$?(w=)iX*~apfwPUYH|7j{)-ckZIx}d)nL!4BX86n?>#;}8%8SA2tE^e- z_t&eeRs4pBthS!HU=##*l-a39Y4A<;Qy4s2X3ra3(3c?TgZ$F)WrFy76QnaZd9nRe zM65)rDk2UaT5J!nX#CL<`#~B{T55lKT}g`HYutV$L2CcY(b|)i*(?1xsO0ko{ukw`0@76C8B!sO_2m9d*YwgdhyZZZ5_LQ#{ zbPw}a#NP-*B6gI`GI&1qXZck&s`>SYZ&+uqw0)sreyI=t>S_B{Gx{7nP;1|+A1~F~ zL8CtWi;eb%#KHAwX1qg7{_^TwspEmv<`L*@-)q%7d{F?or*YSI3za38CcYT{3 zNHpq$|2l1_1k;Y%ej^mzal#%IE;wrE`gDa63L|@{A70yO-#m!gX`kCSQ~Sv0_ESB^ zlJL3HzI}HZIpJNyoo}WZ{_tBd5y77oI^&H|!Ci$;z*rW(WhSjn|Mc+RXF21nYwwvZvcxdO zFCs%ENsf*eDGZOD>wIn*X~7%rr%hUL$NkP!V?p>MMaG2S59T}L7xvsPQh6~!hSG4b z43mGtSy{H^YD0tX5NTLtONHi9aM3(VY~Gu4lnuLO2oHEhwj$u-|LHrhL}kK8HZpq>l1&GaZZCJWJ^9j%HV9ctJ9Qf%?nk%F3R9?#Vagn&>arI zZR1SYtN8`E^`hrcehU}BYRLkc4Us^S>_brfcS9EF27iT{UNs~mqQHn?w-j){4 zfj9$OV1Jb%doZ9n@SEVl2Y8cjA#RvtO0yOpg=UTE0XSyxPJS(>aaMxvz1M(<>zWs)zX@zRI`&X7!<8UMmw!p<@ zKF`1laD`>EJ)#Ex2=BjO${5Y>z`4gQ$3A;sg=nMGpVxQDS^lwWNnaT_h3iH@( zYRe?Sxf^0LFdEKI@W}!@>M$>O-2x_V9%4CUc`r1K-QvrpH;yvuLp`Rq#MdZ&T~t4Q z5yvmU4NuzQ*W=iy+P}<}ViBr|I|dgYwInfGKT%F0$X{ki@ikF}zrop`nL;-s4Q`z0 zx>GDNAb3vodnln`=S5Q*wc2p_cz0|oXTdFR*xow17j}y>^Mg2E0T+Y~Zvj=o$wZhu zbXC8f{kncYb|Tnwvnd@~;m>df$CfI|%>RQkBae}P%HfC9`*+1Awgav`WlQ#esDppP zO|Mwqfc(=~AXiNZ(N=ZfTX4wWST5Ks)3n+lX`*8{%!%e-0x5O{029s%^4f?+$ z(!SA-?0w~699;fO_N1=QhYSB`NT238aLE&FDIHDkSFE>KKp8kiSJSRjhf8$Im!eRS zZ%LCjPzzs~YReJLJ7Bk{8ES?TiLMIlTfdC0sS|Pf#+`(JmL}mR5NVKxAeT+J zRU4QH7u@aWV{4F1gXg~%i%S0nyG3=NERMIqr9WqLP^W^%OYqqjEpJA5!5yQNzd*Fd zEePySEh(pg8o^)Tx?Xml<}cvA55&$zwVW&9d|jUir}NIoXdVsM>NTQ*$RxO=){<`O zRfq0^_fE2<68{m0MF@(g##ZT4_{fylfmH|lzfTO)i}Xb}dA23PbXeO1=iX{dt*$=| zZyMl}VztO{_&0dZ1fNt(lzU)Rlz$YkdzX5O7R4jsD`XBTP^%G)h12T@)Y`!ucz&fJ z>C`I+C2-j@mW-i8YJ?SV(c0MgvKDS_^GTl*)!zY=1qQr0`#S_J=WOZKtF#U7n`Lq3{ zn2wKB)DdglN1sE4E{(mafP@jK`wbHjao7sCp%CR1IRdL&mzxy) z1MZ$k%tv2!V8A^hJ>Mrp>#0qLm$X}6K)VgDjyaU6@J{l{bk*ME5SoFYa)BjPL!$xJ|YJb|40$u+$oXA>> zL|k$uq34GcfonfE!j_*|X>wn0dqW;P%5*6Z3nV39Qx@wz4HzNo`g zcuBMEz2lX+1S~S2Car%v^=?rED1aN7^7%X~e~-a!pOU#+DN(^X1U;Mq6_xcylqFf3hq5O6 z_8C&Dc{rRk(dQl|0m)R0Mi(`Z+&G>IH}%`C_rn>y+H7>yKwpl_Z_24pzk^7x>jQE2 zHYs}q*7Qg{o8v_U+5HlpR=9DU?alNjaRx5Idr2X7qPi&bO&a^ zP1&(G`6IaGWu2?5%~6gZncJ4?k=ku*l!4S(dQb;fp0T_H>2>%@L2SzR!=1J%>AC}_ zVYjFm^>M#XBjd~CS6V=$cHnp z8j|ls4bFr2|IU(J-F^|=)o-o;6s}usdz)*$VorYoav%~AHzRP1>hVi(;`gwo7v)=U z&Yxl_;xV}Dq?#qHppRv8&^dOw}GedT2gO9;y?bzX22NxGJ1KPn3xO~4YZCbwtPMqcQ(ua@X zu4-HMx*6J41eILiGIWEaLbeHOq6$`PA_Xoa1tbbYIy@duf0uWt-+4al7Bz#5;f8)k z&KkJq4?Zu64#CB|qJWLE$|oA*479^l{d)Wb+&U(&ft!ahC`)46RvpLnC{&p=90!&J;^r>J%taT;1)HaWpL$(rgtw{3wLsF ziC(RfWLt3KPn_XKQ*akQf&ZYk?*KWyUXrKb-d3(*+Wl3yVum3_Nzv|nV-`#LJxlWR ze5S*0QQjxO$tPpUM-d#_=<^PwN8!dqQ(B__01GkX>C29w+!{u9j z(yoVl08U;VO-R)Xe-Czx>OeOfVtKhsSjdiI7ugg^_*%Avlk0;AmoO1GA>VYL>1AD$ zzosWLBaTbp<2kYG;8Hl}8?oEg`Z)a%T-)zc)NVNMr0t#u0eL&FK}Q@vJBMWD)!6Op zbL#un#EyQ4C{fiMJ8)9r&gl$LPuy+r&gZ>vJaP|wrPimn>Y^lhWG>O^w3}@WlSL@> zzG!)QWI0@y!pAPXG}ggxQ8WJ=xUoKVU;RC-zD(mk61?6C-nYyd6;L0UtF`DvoQWQ| zlG{b4cHw8tZQZd5o(#K1xf~7GTp$)v_yQ@n!8ym7R6XXIaPtns+s$+45JBjkhOhHhcX-F%|%E3Kw*Jy6enis;Y{jTmS;0})3Ed6F{ z;N&Bw4AZTLaV 0 && receive_type == CMD_STATUS ) { - cmd = _commands[0]; + cmd = _sim_commands[0]; _sim_stack_place--; - memmove(&_commands[0], &_commands[1], sizeof(unsigned char) * _sim_stack_place ) ; + memmove(&_sim_commands[0], &_sim_commands[1], sizeof(unsigned char) * _sim_stack_place ) ; } LOG(SIM_LOG,LOG_DEBUG, "Sending '0x%02hhx' to controller\n", cmd);