diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index d33c599a..494456f2 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-12 16:33:01.294111694 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:33:02.242117899 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 19:02:33.614166242 +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-12 16:33:01.294111694 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:33:02.242117899 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 19:02:33.618166267 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -22,3 +22,167 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/landscape/n2t-out/popupLight.txt +--- HMI/n2t-out/popupLight.txt 2022-04-12 19:02:32.758160910 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-12 19:02:33.618166267 +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/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-12 19:02:33.618166267 +0000 +@@ -339,43 +339,25 @@ + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } +- 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") +- { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupLight +- } +- if(tId.txt=="popupShutter") +- { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupShutter +- } +- if(tId.txt=="popupNotify") ++ if(tId.txt=="cardMedia") + { +- page popupNotify ++ page cardMedia + } + if(tId.txt=="cardThermo") + { + page cardThermo + } +- if(tId.txt=="cardMedia") ++ if(tId.txt=="pageStartup") + { +- page cardMedia ++ page pageStartup ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid + } + if(tId.txt=="cardAlarm") + { +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-12 19:02:33.618166267 +0000 +@@ -366,43 +366,30 @@ + //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") ++ if(tId.txt=="popupLight") + { +- page screensaver ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight + } + 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 --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0d549ba5..4951caeb 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-12 16:33:01.294111694 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:33:01.762114752 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:02:33.138163241 +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-12 16:33:01.294111694 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:33:01.762114752 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:02:32.758160910 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:02:33.142163267 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -463,8 +463,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-12 16:33:01.294111694 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:33:01.762114752 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:02:33.138163241 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -483,9 +483,173 @@ 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-12 19:02:32.758160910 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:02:33.142163267 +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/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-12 19:02:33.138163241 +0000 +@@ -339,43 +339,25 @@ + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } +- 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") +- { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupLight +- } +- if(tId.txt=="popupShutter") +- { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupShutter +- } +- if(tId.txt=="popupNotify") ++ if(tId.txt=="cardMedia") + { +- page popupNotify ++ page cardMedia + } + if(tId.txt=="cardThermo") + { + page cardThermo + } +- if(tId.txt=="cardMedia") ++ if(tId.txt=="pageStartup") + { +- page cardMedia ++ page pageStartup ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid + } + if(tId.txt=="cardAlarm") + { +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-12 19:02:33.142163267 +0000 +@@ -366,43 +366,30 @@ + //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") ++ if(tId.txt=="popupLight") + { +- page screensaver ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight + } + 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-12 16:33:01.294111694 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:33:01.762114752 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-12 19:02:32.758160910 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:02:33.138163241 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7e2f0d6f..3ede9aed 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-12 16:33:01.782114883 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-12 16:33:01.294111694 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:33:01.762114752 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:33:01.294111694 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:33:01.762114752 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 19:02:33.222163771 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:02:33.138163241 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:02:32.758160910 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:02:33.142163267 +0000 +@@ -62,6 +62,16 @@ +@@ -117,6 +127,18 @@ +@@ -153,6 +175,15 @@ @@ -49,11 +49,175 @@ +@@ -967,6 +1146,33 @@ +@@ -1072,6 +1278,28 @@ +@@ -1642,6 +1870,128 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:33:01.294111694 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:33:01.762114752 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:02:33.138163241 +0000 ++diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ++--- HMI/n2t-out/popupLight.txt 2022-04-12 19:02:32.758160910 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:02:33.142163267 +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/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ++--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-12 19:02:33.138163241 +0000 ++@@ -339,43 +339,25 @@ ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight ++ } ++- 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") ++- { ++- pageIcons.tTmp1.txt=tTmp.txt ++- page popupLight ++- } ++- if(tId.txt=="popupShutter") ++- { ++- pageIcons.tTmp1.txt=tTmp.txt ++- page popupShutter ++- } ++- if(tId.txt=="popupNotify") +++ if(tId.txt=="cardMedia") ++ { ++- page popupNotify +++ page cardMedia ++ } ++ if(tId.txt=="cardThermo") ++ { ++ page cardThermo ++ } ++- if(tId.txt=="cardMedia") +++ if(tId.txt=="pageStartup") ++ { ++- page cardMedia +++ page pageStartup +++ } +++ if(tId.txt=="cardGrid") +++ { +++ page cardGrid ++ } ++ if(tId.txt=="cardAlarm") ++ { ++diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ++--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-12 19:02:33.142163267 +0000 ++@@ -366,43 +366,30 @@ ++ //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") +++ if(tId.txt=="popupLight") ++ { ++- page screensaver +++ pageIcons.tTmp1.txt=tTmp.txt +++ page popupLight ++ } ++ 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-12 16:33:01.294111694 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:33:01.762114752 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-12 19:02:32.758160910 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:02:33.138163241 +0000 +@@ -48,6 +48,26 @@ + Scope: local + Value: 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index bf6e85cd..058b96c8 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,22 +10,22 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -popupNotify - 17 Component(s) - 178 Line(s) of event code - 117 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 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 popupShutter 19 Component(s) - 178 Line(s) of event code - 101 Unique line(s) of event code + 191 Line(s) of event code + 107 Unique line(s) of event code +popupNotify + 17 Component(s) + 196 Line(s) of event code + 123 Unique line(s) of event code cardMedia 30 Component(s) 329 Line(s) of event code @@ -54,5 +54,5 @@ cardEntities Total 12 Page(s) 341 Component(s) - 3541 Line(s) of event code + 3590 Line(s) of event code 948 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index fcd230af..f4cc7319 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/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/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 7c91f2c7..51b50ebf 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -548,25 +548,43 @@ Timer tmSerial pageIcons.tTmp1.txt=tTmp.txt page popupLight } + 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=="popupLight") + { + 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=="cardThermo") { page cardThermo } - if(tId.txt=="pageStartup") + if(tId.txt=="cardMedia") { - page pageStartup - } - if(tId.txt=="cardGrid") - { - page cardGrid + page cardMedia } if(tId.txt=="cardAlarm") { diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index cfee5901..07ca9657 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -631,30 +631,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=="popupLight") + if(tId.txt=="pageStartup") { - pageIcons.tTmp1.txt=tTmp.txt - page popupLight + 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/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 7dd8d8c1..24a94b18 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/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") { diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index d744b49f..984ad5ee 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -339,25 +339,43 @@ Timer tmSerial pageIcons.tTmp1.txt=tTmp.txt page popupLight } + 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=="popupLight") + { + 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=="cardThermo") { page cardThermo } - if(tId.txt=="pageStartup") + if(tId.txt=="cardMedia") { - page pageStartup - } - if(tId.txt=="cardGrid") - { - page cardGrid + page cardMedia } if(tId.txt=="cardAlarm") { diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index f4cb4de8..0c55bb6a 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -366,30 +366,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=="popupLight") + if(tId.txt=="pageStartup") { - pageIcons.tTmp1.txt=tTmp.txt - page popupLight + 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") {