diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index dbb9c29f..4d518059 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-04-13 20:13:59.313209160 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:14:00.109218807 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-13 20:17:06.882470529 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:17:07.698466051 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,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-04-13 20:13:59.313209160 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:14:00.109218807 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:17:07.698466051 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -23,8 +23,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/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:14:00.109218807 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-13 20:17:06.886470507 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:17:07.698466051 +0000 @@ -570,43 +570,25 @@ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 @@ -76,8 +76,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tId.txt=="cardAlarm") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:14:00.109218807 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:17:07.698466051 +0000 @@ -48,18 +48,6 @@ Scope: local Value: 0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 88a14a00..a09dc20f 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-04-13 20:13:59.313209160 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:13:59.697213814 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-13 20:17:06.882470529 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:17:07.278468356 +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-04-13 20:13:59.313209160 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:13:59.701213862 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:17:06.886470507 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:17:07.278468356 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -427,8 +427,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-04-13 20:13:59.313209160 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:13:59.697213814 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:17:07.278468356 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -447,62 +447,9 @@ 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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 20:13:59.697213814 +0000 -@@ -570,43 +570,25 @@ - //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... - udelete payloadLength-1 - bufferPos=0 -- if(tId.txt=="pageStartup") -- { -- page pageStartup -- } -- if(tId.txt=="screensaver") -- { -- page screensaver -- } - if(tId.txt=="cardEntities") - { - page cardEntities - } -- if(tId.txt=="cardGrid") -- { -- page cardGrid -- } -- if(tId.txt=="popupLight") -+ if(tId.txt=="cardMedia") - { -- pageIcons.tTmp1.txt=tTmp.txt -- page popupLight -+ page cardMedia - } -- if(tId.txt=="popupShutter") -+ if(tId.txt=="pageStartup") - { -- pageIcons.tTmp1.txt=tTmp.txt -- page popupShutter -+ page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } -- if(tId.txt=="cardThermo") -- { -- page cardThermo -- } -- if(tId.txt=="cardMedia") -+ if(tId.txt=="cardGrid") - { -- page cardMedia -+ page cardGrid - } - if(tId.txt=="cardAlarm") - { diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:13:59.697213814 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:17:07.278468356 +0000 @@ -450,77 +450,6 @@ //tMR spstr strCommand.txt,tMR.txt,"~",16 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 31c522f6..657ac0c7 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:13:59.713214007 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-13 20:13:59.313209160 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:13:59.697213814 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:13:59.313209160 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:13:59.701213862 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:17:07.294468268 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-13 20:17:06.882470529 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:17:07.278468356 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:17:06.886470507 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:17:07.278468356 +0000 +@@ -62,6 +62,16 @@ +@@ -117,6 +127,18 @@ +@@ -153,6 +175,15 @@ @@ -15,64 +15,11 @@ + } + if(tInstruction.txt=="pageType") + { -+--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:13:59.313209160 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:13:59.697213814 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 20:13:59.697213814 +0000 -+@@ -570,43 +570,25 @@ -+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... -+ udelete payloadLength-1 -+ bufferPos=0 -+- if(tId.txt=="pageStartup") -+- { -+- page pageStartup -+- } -+- if(tId.txt=="screensaver") -+- { -+- page screensaver -+- } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+- if(tId.txt=="cardGrid") -+- { -+- page cardGrid -+- } -+- if(tId.txt=="popupLight") -++ if(tId.txt=="cardMedia") -+ { -+- pageIcons.tTmp1.txt=tTmp.txt -+- page popupLight -++ page cardMedia -+ } -+- if(tId.txt=="popupShutter") -++ if(tId.txt=="pageStartup") -+ { -+- pageIcons.tTmp1.txt=tTmp.txt -+- page popupShutter -++ page pageStartup -+ } -+ if(tId.txt=="popupNotify") -+ { -+ page popupNotify -+ } -+- if(tId.txt=="cardThermo") -+- { -+- page cardThermo -+- } -+- if(tId.txt=="cardMedia") -++ if(tId.txt=="cardGrid") -+ { -+- page cardMedia -++ page cardGrid -+ } -+ if(tId.txt=="cardAlarm") -+ { ++--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:17:07.278468356 +0000 +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:13:59.697213814 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:17:07.278468356 +0000 +@@ -450,77 +450,6 @@ + //tMR + spstr strCommand.txt,tMR.txt,"~",16 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index bc762b00..0ea893cc 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -24,8 +24,8 @@ pageStartup 113 Unique line(s) of event code popupLight 27 Component(s) - 320 Line(s) of event code - 173 Unique line(s) of event code + 338 Line(s) of event code + 182 Unique line(s) of event code screensaver 33 Component(s) 195 Line(s) of event code @@ -54,5 +54,5 @@ cardEntities Total 12 Page(s) 353 Component(s) - 3764 Line(s) of event code + 3782 Line(s) of event code 1003 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 596b305c..ac49160f 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -916,25 +916,43 @@ Timer tmSerial //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } if(tId.txt=="cardEntities") { page cardEntities } - if(tId.txt=="cardMedia") + if(tId.txt=="cardGrid") { - page cardMedia + page cardGrid } - if(tId.txt=="pageStartup") + if(tId.txt=="popupLight") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } - if(tId.txt=="cardGrid") + if(tId.txt=="cardThermo") { - page cardGrid + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia } if(tId.txt=="cardAlarm") { diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 7dd8d8c1..24a94b18 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -570,25 +570,43 @@ Timer tmSerial //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } if(tId.txt=="cardEntities") { page cardEntities } - if(tId.txt=="cardMedia") + if(tId.txt=="cardGrid") { - page cardMedia + page cardGrid } - if(tId.txt=="pageStartup") + if(tId.txt=="popupLight") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } - if(tId.txt=="cardGrid") + if(tId.txt=="cardThermo") { - page cardGrid + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia } if(tId.txt=="cardAlarm") {