diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 971d089f..91de5328 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-29 16:07:17.201614908 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-29 18:53:58.331528997 +0000 @@ -14,6 +14,3 @@ //color vars int defaultFontColor=65535 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 - page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-29 16:07:17.201614908 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-29 18:53:58.331528997 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-29 16:07:17.201614908 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-29 18:53:58.331528997 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -143,3 +143,35 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt - } - } - +diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-08-29 18:53:58.335529009 +0000 +@@ -510,6 +510,9 @@ + 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 +@@ -606,18 +609,6 @@ + covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tTimeAdd.pco,0,0 +- if(tMRIcon.txt!=""&&p0.w!=320) +- { +- tF4Icon.pco=tF3Icon.pco +- tF3Icon.pco=tF2Icon.pco +- tF2Icon.pco=tF1Icon.pco +- tForecast4Val.pco=tForecast3Val.pco +- tForecast3Val.pco=tForecast2Val.pco +- tForecast2Val.pco=tForecast1Val.pco +- tForecast4.pco=tForecast3.pco +- tForecast3.pco=tForecast2.pco +- tForecast2.pco=tForecast1.pco +- } + } + if(tInstruction.txt=="notify") + { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index fb67e680..aa2b407d 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.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-08-29 16:07:16.137625205 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +0000 +--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 18:53:57.743527237 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -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-08-29 16:07:16.141624865 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 18:53:57.743527237 +0000 @@ -65,6 +65,16 @@ vis nNum4,0 vis bPrev,0 @@ -458,8 +458,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 18:53:57.743527237 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -479,8 +479,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000 +--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 18:53:57.743527237 +0000 @@ -13,36 +13,6 @@ Events Preinitialize Event @@ -601,3 +601,35 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt - } - } - +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-08-29 18:53:57.743527237 +0000 +@@ -510,6 +510,9 @@ + 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 +@@ -606,18 +609,6 @@ + covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tTimeAdd.pco,0,0 +- if(tMRIcon.txt!=""&&p0.w!=320) +- { +- tF4Icon.pco=tF3Icon.pco +- tF3Icon.pco=tF2Icon.pco +- tF2Icon.pco=tF1Icon.pco +- tForecast4Val.pco=tForecast3Val.pco +- tForecast3Val.pco=tForecast2Val.pco +- tForecast2Val.pco=tForecast1Val.pco +- tForecast4.pco=tForecast3.pco +- tForecast3.pco=tForecast2.pco +- tForecast2.pco=tForecast1.pco +- } + } + if(tInstruction.txt=="notify") + { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7378e27a..264667dc 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 16:07:16.689613925 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 18:53:57.783527357 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 18:53:57.743527237 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- HMI/n2t-out/cardEntities.txt 2022-08-29 16:07:16.141624865 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-08-29 18:53:57.199525609 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 18:53:57.743527237 +0000 +@@ -65,6 +65,16 @@ + vis bPrev,0 + vis bNext,0 @@ -33,11 +33,11 @@ ++ spstr strCommand.txt,tTmp.txt,"~",32 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff5.val=sys0 -+--- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 18:53:57.743527237 +0000 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000 ++--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000 +++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 18:53:57.743527237 +0000 +@@ -13,36 +13,6 @@ + Events + Preinitialize Event @@ -158,3 +158,31 @@ +- } +- } +- ++--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-08-29 18:53:57.743527237 +0000 ++@@ -510,6 +510,9 @@ ++ tF4Icon.txt=tF3Icon.txt ++ tF3Icon.txt=tF2Icon.txt ++ tF2Icon.txt=tF1Icon.txt +++ tF4Icon.pco=tF3Icon.pco +++ tF3Icon.pco=tF2Icon.pco +++ tF2Icon.pco=tF1Icon.pco ++@@ -606,18 +609,6 @@ ++ covx tTmp.txt,tMR.pco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",22 ++ covx tTmp.txt,tTimeAdd.pco,0,0 ++- if(tMRIcon.txt!=""&&p0.w!=320) ++- { ++- tF4Icon.pco=tF3Icon.pco ++- tF3Icon.pco=tF2Icon.pco ++- tF2Icon.pco=tF1Icon.pco ++- tForecast4Val.pco=tForecast3Val.pco ++- tForecast3Val.pco=tForecast2Val.pco ++- tForecast2Val.pco=tForecast1Val.pco ++- tForecast4.pco=tForecast3.pco ++- tForecast3.pco=tForecast2.pco ++- tForecast2.pco=tForecast1.pco ++- } ++ } ++ if(tInstruction.txt=="notify") ++ { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9a257ba0..f2a27454 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -20,8 +20,8 @@ popupShutter 211 Unique line(s) of event code screensaver 38 Component(s) - 332 Line(s) of event code - 257 Unique line(s) of event code + 341 Line(s) of event code + 263 Unique line(s) of event code popupNotify 17 Component(s) 226 Line(s) of event code @@ -62,5 +62,5 @@ cardEntities Total 14 Page(s) 437 Component(s) - 5193 Line(s) of event code - 1366 Unique line(s) of event code + 5202 Line(s) of event code + 1372 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index ed4d2c59..f240d3b6 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1075,9 +1075,6 @@ Timer tmSerial 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 @@ -1174,6 +1171,18 @@ Timer tmSerial covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tTimeAdd.pco,0,0 + if(tMRIcon.txt!=""&&p0.w!=320) + { + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + tForecast4Val.pco=tForecast3Val.pco + tForecast3Val.pco=tForecast2Val.pco + tForecast2Val.pco=tForecast1Val.pco + tForecast4.pco=tForecast3.pco + tForecast3.pco=tForecast2.pco + tForecast2.pco=tForecast1.pco + } } if(tInstruction.txt=="notify") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 80547cae..b20191a5 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -510,9 +510,6 @@ Timer tmSerial 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 @@ -609,6 +606,18 @@ Timer tmSerial covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tTimeAdd.pco,0,0 + if(tMRIcon.txt!=""&&p0.w!=320) + { + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + tForecast4Val.pco=tForecast3Val.pco + tForecast3Val.pco=tForecast2Val.pco + tForecast2Val.pco=tForecast1Val.pco + tForecast4.pco=tForecast3.pco + tForecast3.pco=tForecast2.pco + tForecast2.pco=tForecast1.pco + } } if(tInstruction.txt=="notify") {