From 75fb6f8e5d04d2e52e222b24ea139bf263ed9084 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Mon, 13 Feb 2023 22:27:18 +0100 Subject: [PATCH] untested fix for #768 --- HMI/US/landscape/nspanel_US_L.HMI | Bin 9475267 -> 9475267 bytes HMI/US/portrait/nspanel_US_P.HMI | Bin 11491767 -> 11491767 bytes HMI/code_gen/pages/cardPower.py | 4 ++++ HMI/code_gen/pages/shared.py | 6 ------ HMI/nspanel.HMI | Bin 9475267 -> 9475267 bytes 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index b349e41f83707e464b9111f43ec6080efd8d6f66..ba8bcb30e4b18b337e3753c53b58215379722e09 100644 GIT binary patch delta 9367 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 aA{9s_@+V{|QiUu-mLn^;ibJm@Ui>Fz>F?kG delta 5232 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 PH9!fl7Rq|v2aEp+bB*hI diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index d5ef001ce5840fc7fd73c15b581242e74505e57b..b908dadb16b9b15679afd935c5854def43b48b45 100644 GIT binary patch delta 2135 zcmdthYfw~W7zglY&$_DttLw_e1;O3UdP#9zF4mSoNf)*7ilT-HE0+XC*Vxdq+=`=+ zqF@wnEO`L~7D6tOoezy|Q&db&M10_brnBXj>`OG$lwGFjzwMECWhVOGnfcB6?|Yu- z+4r2YEB9a0$e{A{sbT~>IZF0gSFKr1%F$xhQ@)x=HFS&0CR`Kd1+UTN8LIyELSdLa z$!2vrZnxrmEyqM7g9w*&T54RW{wL#O;M`*|)9`Fe_RUb$4@Y>7G@-ezT_o?PDCj?> zTdJOt`+N34rC(p=*Q-DPHB12wXl1{Cs_Do7$6ZKzX{Kb5W=WA!loTz+NV6rQ6f4C^ zbEJ4FL7MxX=~|A~)ge@j46?3vvDiJj91j)8AM1#ws)AYAfX6NbvoDM2W-yX>6Oo|Q zbZ#axD>aw55Y1Kc58L>9_;$Pkr9L7TLvH6CM0W+Vo1*fFPT*$}I9hfRom8@|nCA~m zc+M>2`HGY1v{HY-#n&|l`FhJCqGL);qMK+~6a20}r9cf90!L#tZ(dNtn+IxncGUCy zR|8SCGW4j2=jms7ZfNE?p_S)0FV9wY7g3n-C^_%Se{3iILieZKf!Isc+j zCoo-2Y&5gY>F8koXv1Q;_BYX2&b~IrBvxIunBi^^!2vQL+~)HfDCv99)-u?aaakfU^P4ePeLZFfwiy> z*24za2wAWRHbXXSfvvC&o`M|M4!N)c@*p1^uoDWP5Q?A}o`zje0;RAU_COizg?-?J z{qPKwgA1O83OE1<;W>C74#5lXA{+)cyaX@9D^Lj%9D$=y1=a8>9E0Of11I1l)IuGc zg4duPUWYfJ0T{dqjo^VMcneO$88{2)pcz`=JiHC9&<5?`g%0S1cc2R{K(~C=((_H~ E-+Q@uG;#=wx&Jv9{1k-4?5dp_jTT%*ZJ&o z?r}nwBOO>RpIDYDL?9AT&Y*8d!XN*`BO9NIF(XZ^8D$Lo z9CGu4RXUF;V>5UEm~|oz;Z8tKZV-uf7dkeIG`l%xlWx?zSvM-$Dl*jV6j!pRn@g%h zJZ@fDt^HrOYp&iYa>PB{-Q6NdR^Z-C%ETIxDEHwMX7_X29?e;MHP6_mc}}h7JR{WuBE>&>%8Ww=ApgX30~9r_%Ah|zo9v+PxF;;G|%go5z^#-kNyFXCj07F zT{-r5f47gaeP4GCcj{97i80o6$ND{PShSN`KdH}aFYJyRX$QU?7Zq8Nk(!xqA1jHE zwR`gY(a!h3bY)vkf1dx(D|La~L`*~yCLtMqJdPAh#uIoFshEN^q$2~FcnVXIg{LtM z(~*s5FatT5iCoOWY|O!2Jd5Y>JYGN^@=<_7%)@-Vhy_@PMJU2zEWuK|gk@Nc6?hrN zC_yP!Vii_n4c4Lz>+lNJV*@tgRct~zUc+X*jtXqSR#c)2)!2qNupMvWE$qNfyp3Jh zjdxIk0QO)n_MsLA`*8quIEZ>2!eKPv2#%r=O*n>k5yX3VAI-4w0a|bzAL0Z~q7|p` f5l*8GXV8ugoW(hG;yk+0jSJ|($4(&kVs`w$;r`23 diff --git a/HMI/code_gen/pages/cardPower.py b/HMI/code_gen/pages/cardPower.py index 63542414..08691691 100644 --- a/HMI/code_gen/pages/cardPower.py +++ b/HMI/code_gen/pages/cardPower.py @@ -33,6 +33,10 @@ for i in range(0,6): // speed spstr strCommand.txt,tTmp.txt,"~",{idxstart+7} covx tTmp.txt,t{i}Speed.val,0,0 + if(p0.h==320) + {{ + t{i}Speed.val=t{i}Speed.val*-1 + }} if(t{i}Speed.val>120) {{ t{i}Speed.val=120 diff --git a/HMI/code_gen/pages/shared.py b/HMI/code_gen/pages/shared.py index 7e4c6243..aed17533 100644 --- a/HMI/code_gen/pages/shared.py +++ b/HMI/code_gen/pages/shared.py @@ -155,12 +155,6 @@ sharedfoot = """ //set timeout to global var spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 - //temporary disable sleep timer - spstr strCommand.txt,tTmp.txt,"~",2 - if(tTmp.txt=="disable") - { - tmSleep.en=0 - } } // end of user code udelete payloadLength-1 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index ec8716b46b2db56355c71ce21720a2ac5283d217..376a887bc3f9dcbea01ba508d18499b16908899b 100644 GIT binary patch delta 2825 zcmds%e@xV69LGNg91vWo2plBbL1vlh1%g5R($G*0@DzU_of-xN1a>6~C3PV0J4nD- zH}~C`wPn_@8DJ_$F*CunrE9~@mDT!XEwAPul&ryO)$`@P?D?z>+UUQY?X!FB`9AN@ zJYYxu-az_2J??J3=AeJqt!?y;=P&n0dAayF70{fTrJd#T1u>fS7_X=~ozLKLs9xx9_Ytnts=<$S13yl2{a!w%78igyy- z=3@s%>>}zAABZ}R?It>`aYDJ|4=N?+)kyxrPV}m_zOGiz>+9wGu>(Yhv^7f|M5aLB zf30__Ys7>)ZnVnqzIGW7>y+Hy5Y)_v(x=8P_>~#+LEAzt_ zhJ{p?FSaLGDl#*Zl%{c0q>?!i9j;{5ISsehCKTGs%1SN!ORASFQ*?u_a9zA|p*uRl zW4LMZ&JEa=yGsm;W)cEpg;)>nj4DlEo&aY?MLdLk-BWao*{msr950LhU znogc3?fKI+WBf>}S)^A?lRjcMhnzK-zv)t9+FQarF@L${m|Cjpn?*sCQOvn zFL|o!52Y!AZzNrSO_RlSO%_2`DT_OpEG{!yoME!)XR`Q=$>KLA3nP<76q7|1mqk32 zMGuoj29w1lCW|5_iyxURnwc!-Fnv$j_^l%iJ+6iwY)-F(!)! zCX0Yea@Xxl7U4`5NB@f~8hab5UoGPDwz<6RE^mj+d$`~G^6<&O0nZ-ACjbBd delta 1166 zcmdUu$xo9(7>8%tueHWTl)V&0P^*G06%+&%3!=1&sNlk;7H9>OMHED>l){e|7hGrz z7dh!g6GIG|FCoF8T=drH!5FvT8jTCYgFz2E_4{BF{{ts^GS559o0-WwW7qEsV+`7S zi{`4L>aDd6iTMR)BDcvqp`=5}0zY1>Domivh8(JDB{h1-HDQztO=(gTdXm^=o!;c{ zr(B&R%}xou`^{T5=e7Qy>1zRJNu`ZVk33d+9olqZ{AT+D?-gyhP&80;^{?~=3X^{6 z@@YLjEoCSeN`}BtG1Q_@J1hD7e|&Vz!+ZoH2*C(JD8dj99U`DdB%-hY(O8HW#9|Q^ zV+jmcie*@iIK*QG5|D@_B*Tc6NI@!AVKvf_jy1?YCbF;=>yVB0Fd+xI*nm82#3tm! z3=1}63kt9mh1iDe*nuJxV<&cDH};?er6@x=DzF#(upd@bq6*cp!Hxr{K`rWV5Qk8Y z1~j4xhtZ59IEogu;uzX+94BxR4xBC#c^W+9PVy{d zCLk|DxxZrNJiTE&ockLc_jeK8KjDCH-l=RBC zxtz*9Hl6!mCikptN@C=fs4!6yExRL^j}PQg@>Y=YyDZ#oh1|`iVjd)v@Y^JnayOQ7 zPbsJ5y_{5M^?N@p>dp`?aqb)KqVHkkbM_Gj-DUNjy0$I`7~Kpv!^7xdoEGca&Sdm^ ch7E3U*x;$OdDJcE7`=@1j0>W=<>E;6A2d=UqyPW_