From 3de63910dbbae11024f9d9a6030da6e17e685adf Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Thu, 31 Mar 2022 10:46:03 +0000 Subject: [PATCH] fixed screensaver pagetype (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 277 ++++++++++++++++++ HMI/US/portrait/diff-eu-version.txt | 49 +++- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 33 ++- .../portrait/n2t-out-visual/cardEntities.txt | 2 +- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 2 +- HMI/US/portrait/n2t-out-visual/cardMedia.txt | 33 ++- HMI/US/portrait/n2t-out-visual/cardThermo.txt | 33 ++- .../n2t-out-visual/nspanel_US_P_Stats.txt | 32 +- .../portrait/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out/cardAlarm.txt | 33 ++- HMI/US/portrait/n2t-out/cardEntities.txt | 2 +- HMI/US/portrait/n2t-out/cardGrid.txt | 2 +- HMI/US/portrait/n2t-out/cardMedia.txt | 33 ++- HMI/US/portrait/n2t-out/cardThermo.txt | 33 ++- HMI/US/portrait/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out-visual/Program.s.txt | 2 +- HMI/n2t-out-visual/cardAlarm.txt | 33 ++- HMI/n2t-out-visual/cardEntities.txt | 2 +- HMI/n2t-out-visual/cardGrid.txt | 2 +- HMI/n2t-out-visual/cardMedia.txt | 33 ++- HMI/n2t-out-visual/cardThermo.txt | 33 ++- HMI/n2t-out-visual/nspanel_Stats.txt | 32 +- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out-visual/screensaver.txt | 20 ++ HMI/n2t-out/Program.s.txt | 2 +- HMI/n2t-out/cardAlarm.txt | 33 ++- HMI/n2t-out/cardEntities.txt | 2 +- HMI/n2t-out/cardGrid.txt | 2 +- HMI/n2t-out/cardMedia.txt | 33 ++- HMI/n2t-out/cardThermo.txt | 33 ++- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/screensaver.txt | 19 ++ 32 files changed, 680 insertions(+), 173 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e69de29b..8fc9b937 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -0,0 +1,277 @@ +diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt +--- HMI/n2t-out/Program.s.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -6,7 +6,7 @@ + int payloadLength=0 + int par0=0,par1=0 + // sleep timeout in s +- int sleepTimeout=2 ++ int sleepTimeout=20 + int sleepValue=0 + // dim value + int dimValue=40 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -615,48 +615,35 @@ + //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=="cardThermo") + { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupLight ++ page cardThermo + } +- 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") ++ if(tId.txt=="cardGrid") + { +- page cardThermo ++ page cardGrid + } + if(tId.txt=="cardMedia") + { + page cardMedia + } +- if(tId.txt=="cardAlarm") +- { +- page cardAlarm +- } + } + // end of user code + udelete payloadLength-1 +@@ -678,7 +665,7 @@ + + Events + Timer Event +- if(sleepTimeout!=0&&dimValue!=dim) ++ if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) +diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt +--- HMI/n2t-out/cardEntities.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -1714,7 +1714,7 @@ + + Events + Timer Event +- if(sleepTimeout!=0&&dimValue!=dim) ++ if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -804,7 +804,7 @@ + + Events + Timer Event +- if(sleepTimeout!=0&&dimValue!=dim) ++ if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -583,43 +583,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=="cardThermo") + { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupLight ++ page cardThermo + } +- 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") + { +@@ -655,7 +642,7 @@ + + Events + Timer Event +- if(sleepTimeout!=0&&dimValue!=dim) ++ if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -866,43 +866,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") + { +@@ -929,7 +916,7 @@ + + Events + Timer Event +- if(sleepTimeout!=0&&dimValue!=dim) ++ if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) +diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt +--- HMI/n2t-out/pageStartup.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -152,7 +152,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : 25 ++ Text : 24 + Max. Text Size : 10 + + Picture p0 +diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 10:46:02.736071584 +0000 +@@ -475,25 +475,6 @@ + } + } + +-Timer tmSleep +- Attributes +- Scope : local +- Period (ms): 1000 +- Enabled : yes +- +- Events +- Timer Event +- if(sleepTimeout!=0&&dimValue!=dim) +- { +- sleepValue+=1 +- if(sleepTimeout<=sleepValue) +- { +- sleepValue=0 +- dim=dimValue +- vaTap.val=0 +- } +- } +- + TouchCap tc0 + Attributes + Scope: local diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1540ffb3..2230115e 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,7 +1,13 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-03-31 07:32:23.198849247 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 07:32:23.602851692 +0000 -@@ -11,6 +11,6 @@ +--- HMI/n2t-out/Program.s.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 10:46:02.260024923 +0000 +@@ -6,11 +6,11 @@ + int payloadLength=0 + int par0=0,par1=0 + // sleep timeout in s +- int sleepTimeout=2 ++ int sleepTimeout=20 + int sleepValue=0 // dim value int dimValue=40 int dimValueNormal=100 @@ -11,8 +17,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-03-31 07:32:23.198849247 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 07:32:23.602851692 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 10:46:02.264025315 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -781,8 +787,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-03-31 07:32:23.198849247 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 07:32:23.602851692 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 10:46:01.799979830 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 10:46:02.260024923 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -801,3 +807,32 @@ 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-03-31 10:46:01.799979830 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 10:46:02.264025315 +0000 +@@ -475,25 +475,6 @@ + } + } + +-Timer tmSleep +- Attributes +- Scope : local +- Period (ms): 1000 +- Enabled : yes +- +- Events +- Timer Event +- if(sleepTimeout!=0&&dimValue!=dim) +- { +- sleepValue+=1 +- if(sleepTimeout<=sleepValue) +- { +- sleepValue=0 +- dim=dimValue +- vaTap.val=0 +- } +- } +- + TouchCap tc0 + Attributes + Scope: local diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 981a1532..cdaba003 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1145,35 +1145,48 @@ 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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") + { + page cardAlarm + } } // end of user code udelete payloadLength-1 @@ -1196,7 +1209,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 497450d7..bfb45bec 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -3750,7 +3750,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 922b4ad2..e6ac464c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1242,7 +1242,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index af6932c5..a13fec9a 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1005,30 +1005,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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") { @@ -1065,7 +1078,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 2ed4b04d..f3d07b1e 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1419,30 +1419,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") { @@ -1470,7 +1483,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) 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 b1b06e58..d74a73bd 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 @@ -14,26 +14,26 @@ 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 -cardMedia - 30 Component(s) - 287 Line(s) of event code - 148 Unique line(s) of event code +cardAlarm + 35 Component(s) + 298 Line(s) of event code + 187 Unique line(s) of event code pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code -cardAlarm - 35 Component(s) - 285 Line(s) of event code - 181 Unique line(s) of event code +cardMedia + 30 Component(s) + 300 Line(s) of event code + 154 Unique line(s) of event code cardGrid 39 Component(s) 397 Line(s) of event code @@ -48,8 +48,8 @@ screensaver 131 Unique line(s) of event code cardThermo 41 Component(s) - 414 Line(s) of event code - 226 Unique line(s) of event code + 427 Line(s) of event code + 232 Unique line(s) of event code cardEntities 86 Component(s) 1329 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 374 Component(s) - 3783 Line(s) of event code - 1032 Unique line(s) of event code + 3822 Line(s) of event code + 1033 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index d00f717e..eb3e57de 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 24 + Text : 25 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 839bfcf7..8d9e263f 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -615,35 +615,48 @@ 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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") + { + page cardAlarm + } } // end of user code udelete payloadLength-1 @@ -665,7 +678,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 620d62a6..8cbfcedd 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -2418,7 +2418,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 954f082a..736e5972 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -804,7 +804,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index a5bb340e..ba1ea1b7 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -583,30 +583,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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") { @@ -642,7 +655,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 3db4faf0..1a64d489 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -866,30 +866,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") { @@ -916,7 +929,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index c09c1cc7..7e4a8616 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 24 + Text : 25 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out-visual/Program.s.txt b/HMI/n2t-out-visual/Program.s.txt index d9463ac7..3af16fab 100644 --- a/HMI/n2t-out-visual/Program.s.txt +++ b/HMI/n2t-out-visual/Program.s.txt @@ -6,7 +6,7 @@ Program.s int payloadLength=0 int par0=0,par1=0 // sleep timeout in s - int sleepTimeout=20 + int sleepTimeout=2 int sleepValue=0 // dim value int dimValue=40 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index ceed12b2..282e6049 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1145,35 +1145,48 @@ 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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") + { + page cardAlarm + } } // end of user code udelete payloadLength-1 @@ -1196,7 +1209,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index e6c5bda4..d948524f 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2660,7 +2660,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 32189a0c..357da48f 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1242,7 +1242,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 85225124..3144d87a 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1005,30 +1005,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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") { @@ -1065,7 +1078,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 7444a5ed..8a809be0 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1419,30 +1419,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") { @@ -1470,7 +1483,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9a072f2d..adc76a11 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,26 +22,30 @@ popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code +cardThermo + 41 Component(s) + 427 Line(s) of event code + 232 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -cardAlarm - 35 Component(s) - 285 Line(s) of event code - 181 Unique line(s) of event code popupLight 27 Component(s) 322 Line(s) of event code 173 Unique line(s) of event code cardMedia 30 Component(s) - 287 Line(s) of event code - 148 Unique line(s) of event code + 300 Line(s) of event code + 154 Unique line(s) of event code +cardAlarm + 35 Component(s) + 298 Line(s) of event code + 187 Unique line(s) of event code screensaver - 28 Component(s) - 172 Line(s) of event code - 131 Unique line(s) of event code + 29 Component(s) + 182 Line(s) of event code + 137 Unique line(s) of event code cardGrid 39 Component(s) 397 Line(s) of event code @@ -50,13 +54,9 @@ cardEntities 62 Component(s) 939 Line(s) of event code 397 Unique line(s) of event code -cardThermo - 41 Component(s) - 414 Line(s) of event code - 226 Unique line(s) of event code Total 13 Page(s) - 350 Component(s) - 3394 Line(s) of event code - 920 Unique line(s) of event code + 351 Component(s) + 3443 Line(s) of event code + 922 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 680a4b0f..fa264955 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 24 + Text : 25 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 76957cf4..e732c10c 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -917,6 +917,26 @@ Timer tmSerial } } +Timer tmSleep + Attributes + ID : 28 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0&&dimValue!=dim) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + dim=dimValue + vaTap.val=0 + } + } + TouchCap tc0 Attributes ID : 2 diff --git a/HMI/n2t-out/Program.s.txt b/HMI/n2t-out/Program.s.txt index d9463ac7..3af16fab 100644 --- a/HMI/n2t-out/Program.s.txt +++ b/HMI/n2t-out/Program.s.txt @@ -6,7 +6,7 @@ Program.s int payloadLength=0 int par0=0,par1=0 // sleep timeout in s - int sleepTimeout=20 + int sleepTimeout=2 int sleepValue=0 // dim value int dimValue=40 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 839bfcf7..8d9e263f 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -615,35 +615,48 @@ 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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") + { + page cardAlarm + } } // end of user code udelete payloadLength-1 @@ -665,7 +678,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 4b9f608d..5c442b47 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1714,7 +1714,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 954f082a..736e5972 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -804,7 +804,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index a5bb340e..ba1ea1b7 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -583,30 +583,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=="cardThermo") + if(tId.txt=="cardGrid") { - page cardThermo + 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") { @@ -642,7 +655,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 3db4faf0..1a64d489 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -866,30 +866,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") { @@ -916,7 +929,7 @@ Timer tmSleep Events Timer Event - if(sleepTimeout!=0) + if(sleepTimeout!=0&&dimValue!=dim) { sleepValue+=1 if(sleepTimeout<=sleepValue) diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 9970772b..8f057a6c 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 24 + Text : 25 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 622aced7..e255db2c 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -475,6 +475,25 @@ Timer tmSerial } } +Timer tmSleep + Attributes + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0&&dimValue!=dim) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + dim=dimValue + vaTap.val=0 + } + } + TouchCap tc0 Attributes Scope: local