From 9eb5f55d270700bed4c40cbbf4394fa737df19c3 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 27 May 2022 16:24:50 +0200 Subject: [PATCH] sync --- HMI/US/landscape/nspanel_US_L.HMI | Bin 11393176 -> 11393176 bytes HMI/US/landscape/nspanel_US_L.tft | Bin 10246616 -> 10246596 bytes .../portrait/diff-eu-version-known-good.txt | 87 +++++++++++++++--- 3 files changed, 72 insertions(+), 15 deletions(-) diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 66af8c32770c298bb59bf16059daee29fe2b50b1..e54eaea489c2ca5e8557e1d8baafeb809a204dea 100644 GIT binary patch delta 1280 zcmd6l?Nd}`7{>2qcVWqV9E_jTRRxz5b# z=ri3NT5UdugeQC5jyRFsVZYZU8u|h+x>6*grc9oBR(C3y-6`VuzRvYWTu%0X?7PmW zWNTY)cpY*hA^x9V3Y^1dJ(}1R72gWIs=fBMgceux?dXI?pQp*^acIS9Ikj9`Zmsxk zpC{qr|FD;-d;R%B~|9u`Toc5g>?XNw2hMcS-P(6Bk)*f*4)Wd<&(!!MYFE;Y(y4t}RLjWw?SsM5yP zln4E_tFqRV2dgtQ8}}afBzvD3XfyLU(@5`Eo-whtd6r}J{ic$Q{`!<;v$S75b{lyW z*OH9%n`-p<;b37|W%bA<;h)ufajHL>mOBGk_uO063G-dufpq9FgpAvhMjLQRR zoH6T`T5c3Q>QTc-v-OtxtJ3s!BrR~7!7A0@FhkROs&bqBLs6|BtzNBbrhn+$lKW2p D8FFP& delta 782 zcmd7M$4^vI7{=jyXYR;EF;s=YHYh5BB03_YQUnWwfTCDHKn8mO1q)V`@yhH8xv17ap7O!NuK0<-@EwUjvis@kXr0&d23{t zMKLLg(wZEmsV@W6o_v4JmKax2DtCXMt20E2>6GJ>YVCu`sr(ZUm<^@7R#8+*=?hRR zdIQw{zMmHV7Y=hhN;K1mA(rXPAdZ>DGmF_cm_q_{ zNyN!K=Cgn#l1U+zg`|AtE^hxl6Pd8_K~gb0Ty`(()Pqsl-{&+QG?^jFV=oWl3U``RSphcb#y dBG1p`bm&znuINU2Q|gi)NM5O1_IQ{Y@e8c@7_k5V diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index a6da9efe7d929e90e4719ac7f5a5aa4eff7bae59..7f1bba4f3acbde880e37006e2596bee4e3e96574 100644 GIT binary patch delta 11001 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 E3tLrEL;wH) delta 11612 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 diff --git a/HMI/US/portrait/diff-eu-version-known-good.txt b/HMI/US/portrait/diff-eu-version-known-good.txt index 3e84edcd..af11a2ff 100644 --- a/HMI/US/portrait/diff-eu-version-known-good.txt +++ b/HMI/US/portrait/diff-eu-version-known-good.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-06 19:28:27.798491086 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 19:28:28.182497193 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-06 19:28:27.798491086 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 19:28:28.186497256 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-24 14:34:13.723678266 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -294,10 +294,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + page popupLight + } + - Timer tmSerial + Hotspot mSwipeNext Attributes - Scope : local -@@ -1644,6 +1872,128 @@ + Scope : local +@@ -1892,6 +2120,169 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -340,24 +340,43 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",32 -+ spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="0") ++ // up button ++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") + { + bUp5.pco=27501 ++ spstr tId.txt,bUp5.txt,"|",0 + tsw bUp5,0 -+ }else ++ }else if(tTmp.txt=="enable") + { + bUp5.pco=65535 ++ spstr tId.txt,bUp5.txt,"|",0 + tsw bUp5,1 + } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") ++ // stop button ++ spstr tId.txt,tTmp.txt,"|",4 ++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ spstr tId.txt,bStop5.txt,"|",1 ++ tsw bStop5,0 ++ }else if(tTmp.txt=="enable") ++ { ++ bStop5.pco=65535 ++ spstr tId.txt,bStop5.txt,"|",1 ++ tsw bStop5,1 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",5 ++ if(tTmp.txt=="disable") + { + bDown5.pco=27501 ++ spstr tId.txt,bDown5.txt,"|",2 + tsw bDown5,0 -+ }else ++ }else if(tTmp.txt=="enable") + { + bDown5.pco=65535 ++ spstr tId.txt,bDown5.txt,"|",2 + tsw bDown5,1 + } + } @@ -448,9 +467,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt +--- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000 +@@ -34,7 +34,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 275 ++ Max. Text Size: 270 + + Variable (string) entn + Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 19:28:27.798491086 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 19:28:28.182497193 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -469,3 +500,29 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000 +@@ -455,22 +455,6 @@ + vis tMainIconAlt,1 + vis tMRIcon,1 + vis tMR,1 +- vis tForecast1,0 +- vis tF1Icon,0 +- vis tForecast1Val,0 +- //move forecast values to the right +- tForecast4.txt=tForecast3.txt +- tForecast3.txt=tForecast2.txt +- tForecast2.txt=tForecast1.txt +- tForecast4Val.txt=tForecast3Val.txt +- tForecast3Val.txt=tForecast2Val.txt +- tForecast2Val.txt=tForecast1Val.txt +- tF4Icon.txt=tF3Icon.txt +- tF3Icon.txt=tF2Icon.txt +- tF2Icon.txt=tF1Icon.txt +- tF4Icon.pco=tF3Icon.pco +- tF3Icon.pco=tF2Icon.pco +- tF2Icon.pco=tF1Icon.pco + } + //tMR + spstr strCommand.txt,tMR.txt,"~",16