diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 66af8c32..e54eaea4 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index a6da9efe..7f1bba4f 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ 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