From aa83e955f0f5f15d01330fb159432818f4ef8f5d Mon Sep 17 00:00:00 2001 From: joBr99 Date: Wed, 30 Mar 2022 21:36:50 +0000 Subject: [PATCH] send screensaver on sleepReached (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 87 ++++++++++++++++++---------- HMI/US/portrait/diff-eu-version.txt | 87 ++++++++++++++++++---------- HMI/n2t-out-visual/cardAlarm.txt | 2 +- HMI/n2t-out-visual/cardEntities.txt | 2 +- HMI/n2t-out-visual/cardGrid.txt | 2 +- HMI/n2t-out-visual/cardMedia.txt | 2 +- HMI/n2t-out-visual/cardThermo.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 44 +++++++------- HMI/n2t-out-visual/screensaver.txt | 20 +++---- HMI/n2t-out/cardAlarm.txt | 2 +- HMI/n2t-out/cardEntities.txt | 2 +- HMI/n2t-out/cardGrid.txt | 2 +- HMI/n2t-out/cardMedia.txt | 2 +- HMI/n2t-out/cardThermo.txt | 2 +- HMI/n2t-out/screensaver.txt | 20 +++---- 15 files changed, 168 insertions(+), 110 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 275e0b94..d76a0c52 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-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 20:32:26.895241964 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 21:36:50.121435295 +0000 @@ -10,7 +10,6 @@ int sleepValue=0 // dim value @@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-30 21:36:50.121435295 +0000 @@ -583,12 +583,12 @@ if(tInstruction.txt=="time") { @@ -36,7 +36,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardAlarm,sleepReached" +- tSend.txt="event,sleepReached,cardAlarm" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -53,8 +53,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 21:36:50.121435295 +0000 @@ -1675,12 +1675,12 @@ if(tInstruction.txt=="time") { @@ -77,7 +77,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardEntities,sleepReached" +- tSend.txt="event,sleepReached,cardEntities" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -94,8 +94,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt } diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 21:36:50.121435295 +0000 @@ -765,12 +765,12 @@ if(tInstruction.txt=="time") { @@ -118,7 +118,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardGrid,sleepReached" +- tSend.txt="event,sleepReached,cardGrid" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -135,8 +135,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt } diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 21:36:50.121435295 +0000 @@ -551,12 +551,12 @@ if(tInstruction.txt=="time") { @@ -159,7 +159,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardMedia,sleepReached" +- tSend.txt="event,sleepReached,cardMedia" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -176,8 +176,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt } diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 21:36:50.121435295 +0000 @@ -835,12 +835,12 @@ if(tInstruction.txt=="time") { @@ -200,7 +200,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardThermo,sleepReached" +- tSend.txt="event,sleepReached,cardThermo" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -217,8 +217,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt } diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 20:32:26.895241964 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 21:36:50.121435295 +0000 @@ -10,18 +10,6 @@ Swide left page ID : disabled Swide right page ID : disabled @@ -248,8 +248,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 21:36:50.121435295 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -275,8 +275,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/popupLight.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 21:36:50.121435295 +0000 @@ -382,6 +382,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -301,8 +301,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 21:36:50.121435295 +0000 @@ -195,6 +195,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -327,8 +327,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 21:36:50.121435295 +0000 @@ -268,6 +268,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -353,8 +353,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 20:32:26.899241936 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 21:36:50.121435295 +0000 @@ -14,18 +14,19 @@ Preinitialize Event recmod=1 @@ -378,6 +378,35 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt dim=dimValue vis tSend,0 //page open event +@@ -38,18 +39,18 @@ + tForecast2.txt="" + tF2Icon.txt="" + tForecast2Val.txt="" +- //tSend.txt="event,screensaverOpen" ++ tSend.txt="event,screensaverOpen" + //send calc crc +- //btlen tSend.txt,sys0 +- //crcrest 1,0xffff // reset CRC +- //crcputh 55 bb +- //crcputs sys0,1 +- //crcputs tSend.txt,0 ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,1 ++ crcputs tSend.txt,0 + //send cmd +- //printh 55 bb +- //prints sys0,2 +- //prints tSend.txt,0 +- //prints crcval,2 ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 + + Variable (string) strCommand + Attributes @@ -57,6 +58,18 @@ Text : Max. Text Size: 200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 196364de..a087dfcc 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-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 21:36:49.609424728 +0000 @@ -10,7 +10,6 @@ int sleepValue=0 // dim value @@ -12,8 +12,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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-30 21:36:49.609424728 +0000 @@ -583,12 +583,12 @@ if(tInstruction.txt=="time") { @@ -36,7 +36,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardAlarm,sleepReached" +- tSend.txt="event,sleepReached,cardAlarm" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -53,8 +53,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 21:36:49.609424728 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -844,7 +844,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardEntities,sleepReached" +- tSend.txt="event,sleepReached,cardEntities" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -861,8 +861,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 21:36:49.609424728 +0000 @@ -765,12 +765,12 @@ if(tInstruction.txt=="time") { @@ -885,7 +885,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardGrid,sleepReached" +- tSend.txt="event,sleepReached,cardGrid" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -902,8 +902,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt } diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 21:36:49.609424728 +0000 @@ -551,12 +551,12 @@ if(tInstruction.txt=="time") { @@ -926,7 +926,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardMedia,sleepReached" +- tSend.txt="event,sleepReached,cardMedia" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -943,8 +943,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt } diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 21:36:49.609424728 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -991,7 +991,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt + screensaver.originPage.val=dp sleepValue=0 - dim=dimValue -- tSend.txt="event,buttonPress2,cardThermo,sleepReached" +- tSend.txt="event,sleepReached,cardThermo" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC @@ -1008,8 +1008,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt } diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 21:36:49.609424728 +0000 @@ -10,18 +10,6 @@ Swide left page ID : disabled Swide right page ID : disabled @@ -1039,8 +1039,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 21:36:49.609424728 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1075,8 +1075,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/popupLight.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 21:36:49.609424728 +0000 @@ -382,6 +382,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -1101,8 +1101,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 21:36:49.609424728 +0000 @@ -195,6 +195,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -1127,8 +1127,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 21:36:49.609424728 +0000 @@ -268,6 +268,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -1153,8 +1153,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-30 20:32:26.087247588 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 20:32:26.483244832 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-30 21:36:49.205416390 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 21:36:49.609424728 +0000 @@ -14,18 +14,19 @@ Preinitialize Event recmod=1 @@ -1178,6 +1178,35 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt dim=dimValue vis tSend,0 //page open event +@@ -38,18 +39,18 @@ + tForecast2.txt="" + tF2Icon.txt="" + tForecast2Val.txt="" +- //tSend.txt="event,screensaverOpen" ++ tSend.txt="event,screensaverOpen" + //send calc crc +- //btlen tSend.txt,sys0 +- //crcrest 1,0xffff // reset CRC +- //crcputh 55 bb +- //crcputs sys0,1 +- //crcputs tSend.txt,0 ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,1 ++ crcputs tSend.txt,0 + //send cmd +- //printh 55 bb +- //prints sys0,2 +- //prints tSend.txt,0 +- //prints crcval,2 ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 + + Variable (string) strCommand + Attributes @@ -57,6 +58,18 @@ Text : Max. Text Size: 200 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 58ea1f54..ceed12b2 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1203,7 +1203,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardAlarm,sleepReached" + tSend.txt="event,sleepReached,cardAlarm" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 52c6e655..e6c5bda4 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2667,7 +2667,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardEntities,sleepReached" + tSend.txt="event,sleepReached,cardEntities" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 70be2a52..32189a0c 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1249,7 +1249,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardGrid,sleepReached" + tSend.txt="event,sleepReached,cardGrid" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index e91ec581..85225124 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1072,7 +1072,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardMedia,sleepReached" + tSend.txt="event,sleepReached,cardMedia" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index f586a778..7444a5ed 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1477,7 +1477,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardThermo,sleepReached" + tSend.txt="event,sleepReached,cardThermo" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9b1d57ce..d5c12dd2 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,30 +22,26 @@ popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code -cardMedia - 30 Component(s) - 287 Line(s) of event code - 148 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -screensaver - 28 Component(s) - 182 Line(s) of event code - 132 Unique line(s) of event code -popupLight - 27 Component(s) - 322 Line(s) of event code - 173 Unique line(s) of event code cardAlarm 35 Component(s) 285 Line(s) of event code 181 Unique line(s) of event code -cardThermo - 41 Component(s) - 414 Line(s) of event code - 226 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) + 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 +screensaver + 28 Component(s) + 172 Line(s) of event code + 131 Unique line(s) of event code cardGrid 39 Component(s) 397 Line(s) of event code @@ -54,9 +50,13 @@ 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) - 3404 Line(s) of event code - 921 Unique line(s) of event code + 3394 Line(s) of event code + 920 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index aaca21c2..76957cf4 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -46,18 +46,18 @@ Page screensaver tForecast2.txt="" tF2Icon.txt="" tForecast2Val.txt="" - tSend.txt="event,screensaverOpen" + //tSend.txt="event,screensaverOpen" //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 + //btlen tSend.txt,sys0 + //crcrest 1,0xffff // reset CRC + //crcputh 55 bb + //crcputs sys0,1 + //crcputs tSend.txt,0 //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + //printh 55 bb + //prints sys0,2 + //prints tSend.txt,0 + //prints crcval,2 Variable (string) strCommand Attributes diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index a8d9caed..839bfcf7 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -672,7 +672,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardAlarm,sleepReached" + tSend.txt="event,sleepReached,cardAlarm" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 9f65cc9b..4b9f608d 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1721,7 +1721,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardEntities,sleepReached" + tSend.txt="event,sleepReached,cardEntities" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 3fe0b3e1..954f082a 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -811,7 +811,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardGrid,sleepReached" + tSend.txt="event,sleepReached,cardGrid" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index b1f4c75c..a5bb340e 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -649,7 +649,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardMedia,sleepReached" + tSend.txt="event,sleepReached,cardMedia" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index e0db4ced..3db4faf0 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -923,7 +923,7 @@ Timer tmSleep { sleepValue=0 dim=dimValue - tSend.txt="event,buttonPress2,cardThermo,sleepReached" + tSend.txt="event,sleepReached,cardThermo" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 9e565de7..622aced7 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -38,18 +38,18 @@ Page screensaver tForecast2.txt="" tF2Icon.txt="" tForecast2Val.txt="" - tSend.txt="event,screensaverOpen" + //tSend.txt="event,screensaverOpen" //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 + //btlen tSend.txt,sys0 + //crcrest 1,0xffff // reset CRC + //crcputh 55 bb + //crcputs sys0,1 + //crcputs tSend.txt,0 //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + //printh 55 bb + //prints sys0,2 + //prints tSend.txt,0 + //prints crcval,2 Variable (string) strCommand Attributes