From 8e96b4623f8501ea8b350010ab704cb1ea192b4e Mon Sep 17 00:00:00 2001 From: Andrey Klimov Date: Mon, 2 Aug 2021 12:36:26 +0300 Subject: [PATCH] doubleclick fix & TIMER_INT compiler option --- build-flags/build_flags_due | 1 + build-flags/build_flags_due-5100 | 1 + build-flags/build_flags_due-5500 | 1 + build-flags/build_flags_lighthub21 | 1 + compiled/lighthub21/firmware.bin | Bin 163520 -> 163552 bytes lighthub/inputs.cpp | 6 ++++-- lighthub/main.cpp | 6 +++--- 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/build-flags/build_flags_due b/build-flags/build_flags_due index e06c4cf..a45c7e9 100644 --- a/build-flags/build_flags_due +++ b/build-flags/build_flags_due @@ -11,4 +11,5 @@ -DMDNS_ENABLE -DMCP23017 -DCORS=\"http://lazyhome.ru\" +-DTIMER_INT diff --git a/build-flags/build_flags_due-5100 b/build-flags/build_flags_due-5100 index e94cde9..3457cb4 100644 --- a/build-flags/build_flags_due-5100 +++ b/build-flags/build_flags_due-5100 @@ -6,3 +6,4 @@ #-DPID_DISABLE -DARDUINO_OTA_MDNS_DISABLE -DMDNS_ENABLE +-DTIMER_INT diff --git a/build-flags/build_flags_due-5500 b/build-flags/build_flags_due-5500 index 6be5c9e..b3872a3 100644 --- a/build-flags/build_flags_due-5500 +++ b/build-flags/build_flags_due-5500 @@ -6,3 +6,4 @@ #-DPID_DISABLE -DARDUINO_OTA_MDNS_DISABLE -DMDNS_ENABLE +-DTIMER_INT diff --git a/build-flags/build_flags_lighthub21 b/build-flags/build_flags_lighthub21 index 1911320..67df496 100644 --- a/build-flags/build_flags_lighthub21 +++ b/build-flags/build_flags_lighthub21 @@ -11,3 +11,4 @@ #-DPID_DISABLE -DARDUINO_OTA_MDNS_DISABLE -DMDNS_ENABLE +-DTIMER_INT diff --git a/compiled/lighthub21/firmware.bin b/compiled/lighthub21/firmware.bin index 5c0d3adc10e7017ab3fd553bc24e0b1463c4e4ea..7f8b42d1651f9804bdbf3ea9791894d9116c2460 100644 GIT binary patch delta 12693 zcmb`Od0bP+`u}H65=a6lVP7=?Q4lHMQbD95=z)L~H>#*qQPJRzOBJm}>u&3H8Ev$! zc2TOa7;NmU^rrVa@L|A=u@6zpvjvKVH7`%=66l%rkT5 zoH>anTU57ORK;YOQrj|5MRsrbpOC-(l{m_9^M0fc{+Bv`Zzq39Tf4kY$tx;y6L^nO zkxYQUV*WwAFDXfpqu?rstUa$JcK~mY|8coFPe~4f^WYw!6O|+w#Di>52>$NC%mx2* zVD4p#A)$+UmCG|WxB3KcpQ|RyGFe8TNv4;j9eRS0RPY{$xH@aMvsjuyo7hYmN*}V# zv~!=?)->~EvrbG3F^GZE$F0#iE_*bGmxqe7kR)g>lD;J=Bv$11fL7NujdY6Lqn+u0 zm_mr4^I5bIN~f_ALWK8>I5kNMaMs3@$whB*RVlAqz%~oPbR0V*bf#U{w?c67fW`?1 zDt+E6gu7NL!qruI27x%)DsLhuR$|<9Qd0~GrqTvAp=`P= z%3IN@Ma|>(&lj4Kj&bc(c2MT)`=~`75+S~T7G}2gz-LPf&)dbW%fj+zHd8TNq*AQC z-jrqu15ok{d&#lQ>JTdWKp)xah0lvEG_10Q=y)p$O@85SH^S}dlBPn8 zTPrH0MGaX`wRv+4g0!6F$ve9hB8o#gI&0TJE@m6#I`3Cn8)`6te;HqQc1oT|Z!@a6 z;(Hq<3C8%>5?k3Lg|DV-lTxpppiFa>Hnck9a}4u!iu6ox3dwX9shB0%dZ|Og4KC6F zmhGgYK5U^=WN>|ptKJR1uWF{fuhleH(U3O-hKb)DjuBm@2keBCe?-}kHXnWB)#QD| zcMpgwQw|9=B$Q`8&7R{eecGrHHBv02&Lbipw8}+gIo0Ofmc1^MI?5E0)@mw}kmxiw z>HAh1Qrh6PNhkJz_BAVZo=LZ{TIZ=Wk7X;@Xj&S$kMQ*AJ9ERap2o9UrGMO2dz8aP zFX`td+B+7r;w5D^X?i@WR-{$jwBaT@s_Q9*q0P%6wDubQ1ig@;t%7>P-Y*jSf z!B(mCbO!rYl~w#obFA12!HH_7A)h8IZfrVCbhi4!R@$?^#$WG`P?#EBq~%t>Ayia{ zctekC;*)#4QEO0|yrpKVA;?>*w`wwouG2Cas-18kS#~4DP(70NYN&D5t59|mT9{zv zi$ej;uc_kxoFu+b-~B)2W%zf`G3z{%Jfctdoc?vj8{1cODIe4GJUJQ(YLunfb04}$ zLF}PAp_sHNO(_MTh1&E849!ilHk0tEs+59Bg+b{$gFh^fniZn*Sb%-)c576JC%}lVRu{t=>gW_64vo#LxfmyKQ2ifqC{6O zu~^qY`aa8ay*cRzTif)f{vI=2i|LQEYR#VM5e83mE;Y%;qo%ecC6Dx|_L5H6s7Uv@ zNYv_@<}L}%NhX&J)<9xH%ju_i1EUwj4gl~>diKFw(8s_z2%4J@&u4yo=9p$I}K{8-(j5Dn&bKfNoexMx z&KeExDg51P0c$|MPbTeV-kzy+Aj|diEp|a*dCu|kX9F91j!xK$WQ5I6Uty%g^$P=&(6f=-YY}MoQ zV#}-MUiLe)JhE$bQb=I|-?qlJ48l6wV7+fju`k!J%GLuOM2& zHhKj*PqxbU5orlCd3E;9Y@nfpZN2Y=+n9VGm2AyC?^9Oe)t8=QoxOF%JQh4gJRUqY zJVu)VkL7}~e{5o1lhmX;m{X<@x0ec^twfvgY5nw`*g^Rsei1_`Y3Zx)4e5-BFq!nP zmIy=d^xn9mSK3G@wuN5p8-`l)YK|~Or$?o^c96`r2rRv*^zJBlkX`ilE#BB1ty5y` z{upE1maW8={bCadbq^uT?V&)ko|1XIi%rdeX&t2lwlq_KJvx!)G*tena=#B^cBSE8 zruKMxR2LQ~G4OY7{L|DLXZj;7N`z%lGq*o#_A8xJK>|*+Z|Hpd8yxYmuNk(~CxXsl zdwqgwEIZ>9n%~hT3miE=O!3*yF+xm`dj6*H>_kXQE#hx`<8p%carmydQtI zeCU^uu(J6?4aGjN5>CZpucth2HG3&^mUYQ)fL)HxHug6 z&92Gq+8`cdAA5|a*egs%1)@u=@sgfedBnyp;!o=2h0H4FNX^w-_hr%`cey+MrFy{? z7r3HqVSa(y;t#P>ogFLnf7{LYPRDn=UZ~m&Rd3>c`h9gzXnY0z0PXAQXlOm4eGBaj zCYb6@*K`-vy2=`w;2QbGRr>L8Yp6s{+zeEbZs6xOitWk+hcPlpN&XHm*j*HKJJFm% z_il|3I`TkA?=|yTb=GaJ;m@@lVA+DM>#AL$siD0E?YC;3L6y$WO)GKsBjLZmu_ClX zbg$LObQgX}jqljDhw;6e@AWY(EGW8I)=IRAx054bh^B|NRM)qAzn)yRtE7|CPD zNbbPZi{J`a2x=UXr~ezZuu~k6op7yxTSIliJ|}5l%LTOkAM2O+%(0%vr;oL=CaZ&F zi&5B5zi;E5Hjdp1>J#}>tL(i_6Fj9T+hoI&8u@2~tggBIRN7i!-746xmW4Js--AwU zU;~3sDB5Z&I(-|`fMI#{!|e)$g9H!@dH@M|@_y`Dr?XL7sLfE5AYFkUPy%-l1O|gH zfPi%Npz{ZUvOim|ok-tcwc1o11p4ScpdXqq>k_Eo-rwvI`cE3{H(X7uczjt4xf0TK zsG7WoY>P>9{e_v+}j$p=SBP7?2g7k>!bCoieVFVJhj6VPB@7dKs?lDV#*Owg?9 zuO>WFn;<^~@0eAI9jRuQqk$ZlVg{*6zB%HhL$cf;sO`fIL7Ml$`|E-93!o<;q)SqF zROyX$CKv{4clCd1_)(AK!I&>C^sxYMCz9JIV?1;d>yy0KtuIo%RbF$f`9bm;ftp$2 zU{CL}@aQY>H4c%-QD8OFea$-tM^f6r&WJ1M5wkwESoOjYROAm`6vLJSe)3U5dVr3= z8xV3XIS?}FCH8FS7{zaihz!dfw#KasjJ$WgD9)K5467ArZ}XLrVbp&c%CzV35$=V4 z1k^C^SDL)PaO9qY{0960eqv#xGH9c@a8!mY@yAhZ)nCFY8w4hSTNueY$bW!$!7=a^ zxCu%CAH{8~oFlAZ%mBKD#gEORhuFHY8&zfcw%kgl8@D^yHW2Sy;Pg@SQH3`7|(kgEJ1x!hRKOPnu|t|DYWwq#qz% zTP^IDA^mfcVg_D0c9iO@cWZ9Iy?i{iad)#Jm1S}i`4R6ulu3fU)W47NG7AT{l~Ic-mliHmtcwTmr_3QW}orN0zGHW z$(tmEU31LE3#c3mdV?8o=n^_U2{{n@5O!zMBuzg=kh{ufN;OSQa#;4{VWH_(TmAbs zC%to82g%U#J5JwwQ0^$;t#J1*u=A5wXv)&mik=oYA zX-DUqpkKyI;>jq;8z_a&+pmHYpu3}=t?1_p^mNp@2gy$-{AJifq?K@&55y~tIZbzSQj;8X1D3-4XI=bMCBETD%55^LF<`9tRh| zci*?AU8z#mA7z*EpXeiuI($ntOr)@wuu*9-p7HkOt^qL-JYp1@b>&3!g{m zPAJdkb1Clgd>+q%d^qa{`vgzagC2&o0&CZP8yt%Z1NE>TW!m5Y=7|gYQB@efmSK!A zmn`Zf44#GdxjG+mHSUcwkY0@RdeC<7^h@UVB0{7A@4&VUlz;=k43rqhITpMmhrVrI zxWtN44WJcgh6sgc`!a<7hm5Sp}|t+J2nr) zR_so^7T?Kxz|LKagIozYfbCowOOKkrUAlw{&5dkG@%&-mW6rFg8^ZP!b@`np0qK_= zVdUY=1?_FlLz=fa8eaT}dh4NY2L$y#fGjs_mMsy&_^!Ys(gOqHZlyQ|HUx44SPC{V z)0=vFfi=DP7F}sxvm!^JaqP}2PjBwW(9vp=gm+)qpPsJ;cd@tLMP@llsm9=;HCt2ZEJ?+GfZOzOy+jd%g-IpD%um9b;)9T}{ zT~}XUYo$2+JgYB3p0_>ku9Y8$p5eB?6K{Bz9X?j$E-G;_@)MhIfBMnk%{`XAZ4y0h zF5lLXdh>7UxQn}9#xp3=ZzA$WcJrM`nrT)UuhSG2Hs={A&-7w`gKj&DG+&_u-p(yZetFa}(~fznIEQt$IqKa&A!<2P-U&aH z^XqFhbncxlr|sc@e--l&*cO8~%nRN>MZN#&D8hX>gfy>aW|_OD<4fZ5U8huhV7!T= z=2ag=%XIw6e;TfF(|3?R0DceSkJ2}gzRNCuT#4sb{>ztUq*HHo_4Kw17AXQ^{#d;s)2;a zGN?9Sf_p_BEBJhs=42yZY-(w>t*zWqX8Sysu4B1}d^_{o8+V$YINkAWw^|yFZ=2mK z;*hSZH!*f7K6zMU1ilKJi?3vOFX@dG{!F(on`|}EiIi#N1Gp)MpEwuxCQh6O_=gn_>zRVS;AruXVCs^>EQv? zV6Hf9rt~#dcqCA>5l5DHz)tWnSZ3aN#FxfjakRnjN0U+C3f%xHM-dI+(H{z(Z?h55 z`-5@7z-r5C@N)R_KfhG*Cb=IUn@cRGC_Tao${C$vZYiHcg$^Ux#AELW3O#E)COYx6 z6O!WbA9P+L+ZGsKTzoRlT$>zi_j|tw(&nQVPAVihKLsEeB4(4`Y4Sk($yRe(SZjS#dQl?si zLGivAoB2&Iy4U>CHz|UOpTfDZ2dk}`PIsAes+$CQ$((&@FIDi{{Ev+Okb;m7{$Wip z57Y&43Gh=wZ|u0&k-maR{lXsn&<&?1&6U1X#UJhWAj8ClU5%!X+48Fo=}GgO( z(d>V{o7{=74u#$<-s(rG&b<6~M?tk1y%mF1Y{$PB;=x7pa{{#+SMdy%eK!@xop*iV z9xMB0p^AI65}Uzw)~CioubOLXQe|p>@^T#GUV3;|z|(``w-cyv=C@w>Z1^n_V+(t< zS5O&7W0ykhOXkau1LgE7dtA30CAK}g{zn!os(*;``PKs+>4z4LlHL;B_|PbIB9q=6 zF{#wjqNXdH=_Si@5Bfw7xxkkmlF^gKus}M38Z1SDbgU3|4qfqT!PszksKX(vVY>r} zjeJK1nY`K35KKqOsL41?M}0LsJVFMEP@eD?EA!^0nv6v{`lY5HY9;~R8vo@)hGkd? zWpX;qa<3~LCBVtV2s%litBfB-(&=v5D9StJOK7IizXu(!=DPwn`DPp6>_Pj{4~-Q) zXbPQTq)~JdZ8qjd(MbBEWpflwrJBhoJRR^IGH49mFBu=aK#xTnLy`xdzkfIfqEO@v zY}Mc{cnm^e8(_Q`O;c6vuPU-F!7XIbic(JZR? z9O*q4eIGhrPIp-L$5UrPu@+5lwUi~$1UX%3c|3s1u&OL|Nwl*9y0=JgDf{pM#gwfm zlx6O;y2dCb(8A=xQ-v`V_Ss86`GDx=r1G?oE=*7xk|*G&FDEV;BeLj5deu^%g&1nC zBHLzrRD7dN4!muQ8cx4OPc6e~H%foCgpEYcg5MNN_iX%V0I@H8g&tGTRhFo6^aR&y zb1B1|7?)3=zHVMqv0A6#l@#c2ESW$bA!l12od=HpnWWNCR0yY#CBBZ zL;SS_6id!;4DW(H4-5gTkvAWV0|ra5fp(;-2@d_DrB4ACpU)4_Ws8zSgkG{aR8O?F z`bEe648~p4=xRFI5;mQFNmVH`RHOiGwA9T&9nDGuE@n`UtLQ#toiS$?&C+nwZkVi) zp#|JrK8p^}&{-;b=~9?&cC%_W9p%PLp8+nYQD>YvoA!0PiDVV{)owD)rk(Ak*y-)2 zo9(84&rPa1bcJRS)S+N4*Z}H`JLjM>H_vdG>x}2;&|co$v~fmT$+|r%QaJ}hGinNH zpuKbtWSzA)5MM|~1@O`t4%7GCj2aIhon{z6Eu;bVDpQ|VsV>9>@+!-po9YVb_+W0z z1-#+Ew!%FvoJ*ta1DNlqb;=j)$ z#95n$-*0eMhVvJz*#2wDZU1q`;q&Phy2o;FK7Od@HgKkjM1eElnkDKrYN0gNa&I9` z@xY3USWh1cf?~bJX9N9QK?hpSY@t~)de`Fp4viKB`Amzroo;cV_bu0UV_#5P;fQi3 zPNp+09ZKjks)&Pf(5Tu=Qvx*QDiRMCfNcP4PBNC06aHStDSPRwbgAXcUOGbNwyY4h zRFH;IEVG0ipkKOS&DS2KDK4rH=ir`=CWl($Pt%1$alt7SQB?kw9bf)c|9k%bN8N|~ zR|kxPzohdND}o{jI- zfn<5?ESLp*C>B}vs|A_Tkv4e&)A^RmK?3fR^DV2i!YE3Y8gJ@^ z8ou1lh6ta?apRoXO$gM`9maKWLN9Fm6>-8?h5vb+@$Y~ryeUWk2a(Q%EVRVFB#d_U zc(He0&xsTJj_(=MGd3!wZ&a^X%X@=`E3*HVu~IJ_6*|PP!CM262Q=%9|A-R;eE2~5 zUjl4;P`4frS8aL5twV&W_{(oANdqWg_@ONrMwR3m^m34k^m0%FhHX-kGq81&DalPi zNy>~nGlhhJl&$z}?=~gTK@JAIdLg9uR^z+qUloS*Bvjd9@qSrIrSWEzy#ogCRFZ)^ z+RB$fF9CnLsvk27j)84|;p`ok(vm zh7A>piN8UkW>-UH7n$r2ETC+Ap@ z1@bL9*}@u{IQ@!}qyqoTO7h+%3=L$1Tu=lagRmbk7RYsA=5>S$FrG9JbqnJlG7} zps$1Uo@SY75L%Vk)A9<1ZpE>kuzQGL6hb>%NfaxUWED1rij9!CN(*tR#o~I|j749I z3*@6xC3$cdQ(?g``j29TV3DdSF`fA3zwQ#sV|Dodf~n@yiRoH}=-xxb<7FyRr$pFP z_^$*VRYV`CBEg+hoypP=6^TXgX7<5gGgPE3Q$-^3@lY@w&TcSvoh!UVPg?Tl3K>-M zwd1^S3-TU#V62=cq(qcp<&L)!Y29foGssg8d2w8u{m{@hnPZHaFBGe0IG*p5EM@bB f>53N*3OMSS+QK{mcbPQYJ>>sSEUzpUrpf;=k4>Oa delta 12677 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 zstate) //Timer based transitions if ( //No future !aJson.getObjectItem(inputObj, "scmd2") && !aJson.getObjectItem(inputObj, "lcmd2") && - !aJson.getObjectItem(inputObj, "rpcmd2") + !aJson.getObjectItem(inputObj, "rpcmd2") && + !aJson.getObjectItem(inputObj, "dclick") ) res = changeState(IS_PRESSED, cause); @@ -829,7 +830,8 @@ if (cause != CHECK_INTERRUPT) switch (store->state) //Timer based transitions if ( //No future !aJson.getObjectItem(inputObj, "scmd2") && !aJson.getObjectItem(inputObj, "lcmd2") && - !aJson.getObjectItem(inputObj, "rpcmd2") + !aJson.getObjectItem(inputObj, "rpcmd2") && + !aJson.getObjectItem(inputObj, "dclick") ) res = changeState(IS_IDLE, cause); else res = changeState(IS_RELEASED2, cause); break; diff --git a/lighthub/main.cpp b/lighthub/main.cpp index 1744ec4..579e684 100644 --- a/lighthub/main.cpp +++ b/lighthub/main.cpp @@ -1622,7 +1622,7 @@ void TimerHandler(void) } -#if defined(__SAM3X8E__) +#if defined(__SAM3X8E__) && defined (TIMER_INT) int16_t attachTimer(double microseconds, timerCallback callback, const char* TimerName) { if (timerNumber!=-1) return timerNumber; @@ -1726,8 +1726,7 @@ void setup_main() { infoSerial<next; } + #if defined(__SAM3X8E__) && defined (TIMER_INT) // Interval in microsecs attachTimer(TIMER_CHECK_INPUT * 1000, TimerHandler, "ITimer"); #endif