diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 281a14b8..2827dac7 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 16:55:42.160038424 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 16:55:43.136039156 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 20:07:58.195056766 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 20:07:59.147136815 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -10,9 +10,139 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //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:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -670,20 +670,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardAlarm,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + +diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt +--- HMI/n2t-out/cardEntities.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -1719,20 +1719,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardEntities,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -809,20 +809,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardGrid,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -647,20 +647,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardMedia,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -921,20 +921,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardThermo,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-30 16:55:42.160038424 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 16:55:43.136039156 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-30 20:07:58.195056766 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 20:07:59.147136815 +0000 @@ -17,7 +17,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -23,8 +153,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 16:55:42.160038424 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 16:55:43.136039156 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 20:07:59.147136815 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -34,3 +164,63 @@ 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-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -382,6 +382,7 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 + click b0,1 + click b0,0 +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -195,6 +195,7 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 + click b0,1 + click b0,0 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -268,6 +268,7 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 + click b0,1 + click b0,0 +diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 20:07:59.147136815 +0000 +@@ -14,6 +14,7 @@ + Preinitialize Event + recmod=1 + bauds=115200 ++ vis originPage,0 + vis tInstruction,0 + vis tTmp,0 + vis p0,0 +@@ -80,6 +81,15 @@ + Scope: local + Value: 0 + ++Number originPage ++ Attributes ++ Scope : global ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Value : 0 ++ + Text tInstruction + Attributes + Scope : local diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 02323ba3..a06cd626 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 16:55:42.160038424 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 16:55:42.648038790 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-30 20:07:58.195056766 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 20:07:58.635093763 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -10,9 +10,35 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //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:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-30 20:07:58.635093763 +0000 +@@ -670,20 +670,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardAlarm,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-30 16:55:42.160038424 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 16:55:42.652038793 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 20:07:58.639094100 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -780,9 +806,84 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +@@ -1719,20 +2423,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardEntities,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 20:07:58.639094100 +0000 +@@ -809,20 +809,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardGrid,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 20:07:58.639094100 +0000 +@@ -647,20 +647,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardMedia,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-30 16:55:42.160038424 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 16:55:42.652038793 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 20:07:58.639094100 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -807,9 +908,32 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt XFloat xTempCurr Attributes Scope : local +@@ -921,20 +931,9 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 +- dim=dimValue +- tSend.txt="event,buttonPress2,cardThermo,sleepReached" +- //send calc crc +- 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 ++ page screensaver + } + } + diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-30 16:55:42.160038424 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 16:55:42.648038790 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-30 20:07:58.195056766 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 20:07:58.635093763 +0000 @@ -17,7 +17,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -820,8 +944,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 16:55:42.160038424 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 16:55:42.652038793 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 20:07:58.639094100 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -840,3 +964,63 @@ 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-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 20:07:58.639094100 +0000 +@@ -382,6 +382,7 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 + click b0,1 + click b0,0 +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 20:07:58.635093763 +0000 +@@ -195,6 +195,7 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 + click b0,1 + click b0,0 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 20:07:58.635093763 +0000 +@@ -268,6 +268,7 @@ + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { ++ screensaver.originPage.val=dp + sleepValue=0 + click b0,1 + click b0,0 +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-03-30 20:07:58.199057102 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 20:07:58.639094100 +0000 +@@ -14,6 +14,7 @@ + Preinitialize Event + recmod=1 + bauds=115200 ++ vis originPage,0 + vis tInstruction,0 + vis tTmp,0 + vis p0,0 +@@ -80,6 +81,15 @@ + Scope: local + Value: 0 + ++Number originPage ++ Attributes ++ Scope : global ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Value : 0 ++ + Text tInstruction + Attributes + Scope : local diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 1ca17cfd..beda29dd 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1201,9 +1201,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardAlarm,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 8e09376c..a23c7cba 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2665,9 +2665,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardEntities,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 830a466a..f14dac8a 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1247,9 +1247,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardGrid,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 08bc58e8..95557816 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1070,9 +1070,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardMedia,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 70b507fb..53130fe2 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1475,9 +1475,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardThermo,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index d2d83837..6bf12e28 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,49 +14,49 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code -popupShutter - 19 Component(s) - 179 Line(s) of event code - 102 Unique line(s) of event code popupNotify 17 Component(s) - 179 Line(s) of event code - 118 Unique line(s) of event code -cardGrid - 39 Component(s) - 388 Line(s) of event code - 224 Unique line(s) of event code + 178 Line(s) of event code + 117 Unique line(s) of event code +popupShutter + 19 Component(s) + 178 Line(s) of event code + 101 Unique line(s) of event code +popupLight + 27 Component(s) + 322 Line(s) of event code + 173 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) - 278 Line(s) of event code - 139 Unique line(s) of event code cardAlarm 35 Component(s) - 276 Line(s) of event code - 172 Unique line(s) of event code -popupLight - 27 Component(s) - 323 Line(s) of event code - 174 Unique line(s) of event code + 285 Line(s) of event code + 181 Unique line(s) of event code +cardGrid + 39 Component(s) + 397 Line(s) of event code + 233 Unique line(s) of event code screensaver - 31 Component(s) - 183 Line(s) of event code - 133 Unique line(s) of event code + 30 Component(s) + 182 Line(s) of event code + 132 Unique line(s) of event code +cardMedia + 30 Component(s) + 287 Line(s) of event code + 148 Unique line(s) of event code cardThermo 41 Component(s) - 405 Line(s) of event code - 217 Unique line(s) of event code + 414 Line(s) of event code + 226 Unique line(s) of event code cardEntities 62 Component(s) - 930 Line(s) of event code - 388 Unique line(s) of event code + 939 Line(s) of event code + 397 Unique line(s) of event code Total 13 Page(s) - 351 Component(s) - 3362 Line(s) of event code - 909 Unique line(s) of event code + 350 Component(s) + 3403 Line(s) of event code + 921 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 6c5d50f6..d3e7f634 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -727,7 +727,6 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 click b0,1 click b0,0 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 462cb337..1248c06b 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -403,7 +403,6 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 click b0,1 click b0,0 diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index e832b2ee..2d8af3be 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -532,7 +532,6 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 click b0,1 click b0,0 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index bd02e6a1..082a6b57 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -22,7 +22,6 @@ Page screensaver Preinitialize Event recmod=1 bauds=115200 - vis originPage,0 vis tInstruction,0 vis tTmp,0 vis p0,0 @@ -62,71 +61,41 @@ Page screensaver Variable (string) strCommand Attributes - ID : 5 + ID : 4 Scope : local Text : Max. Text Size: 200 Variable (string) vaTime Attributes - ID : 10 + ID : 9 Scope : global Text : Max. Text Size: 15 Variable (string) vaDate Attributes - ID : 11 + ID : 10 Scope : global Text : Max. Text Size: 30 Variable (string) tId Attributes - ID : 22 + ID : 21 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 30 + ID : 29 Scope: local Value: 0 -Number originPage - Attributes - ID : 3 - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 452 - y coordinate : 267 - Width : 24 - Height : 49 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits shown : all - Format : decimal - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tInstruction Attributes - ID : 6 + ID : 5 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -156,7 +125,7 @@ Text tInstruction Text tTmp Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -186,7 +155,7 @@ Text tTmp Text tTime Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -216,7 +185,7 @@ Text tTime Text tDate Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -246,7 +215,7 @@ Text tDate Text tSend Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -276,7 +245,7 @@ Text tSend Text tMainIcon Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -306,7 +275,7 @@ Text tMainIcon Text tMainText Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -336,7 +305,7 @@ Text tMainText Text tForecast1 Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -366,7 +335,7 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -396,7 +365,7 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -426,7 +395,7 @@ Text tF1Icon Text tForecast2 Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -456,7 +425,7 @@ Text tForecast2 Text tF2Icon Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -486,7 +455,7 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -516,7 +485,7 @@ Text tForecast2Val Text t10 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -546,7 +515,7 @@ Text t10 Text tAMPM Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -576,7 +545,7 @@ Text tAMPM Text tForecast3Val Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -606,7 +575,7 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -636,7 +605,7 @@ Text tF3Icon Text tForecast3 Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -666,7 +635,7 @@ Text tForecast3 Text tForecast4 Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -696,7 +665,7 @@ Text tForecast4 Text tF4Icon Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -726,7 +695,7 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -773,7 +742,7 @@ Picture p0 Timer tmSerial Attributes - ID : 4 + ID : 3 Scope : local Period (ms): 50 Enabled : yes diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 098d5c6e..b40f1dc9 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -670,9 +670,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardAlarm,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index a11ee16a..2fb585dc 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1719,9 +1719,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardEntities,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index a83c7a57..c7465580 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -809,9 +809,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardGrid,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 61f40677..cba5822c 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -647,9 +647,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardMedia,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 5a6b45bf..01621d30 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -921,9 +921,20 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 - page screensaver + dim=dimValue + tSend.txt="event,buttonPress2,cardThermo,sleepReached" + //send calc crc + 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 } } diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 8d320b4c..3fc3f865 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -382,7 +382,6 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 click b0,1 click b0,0 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 3dce4218..67648fcb 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -195,7 +195,6 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 click b0,1 click b0,0 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 54f2a60d..1c618931 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -268,7 +268,6 @@ Timer tmSleep sleepValue+=1 if(sleepTimeout<=sleepValue) { - screensaver.originPage.val=dp sleepValue=0 click b0,1 click b0,0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index c5da1789..b2c0b397 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -14,7 +14,6 @@ Page screensaver Preinitialize Event recmod=1 bauds=115200 - vis originPage,0 vis tInstruction,0 vis tTmp,0 vis p0,0 @@ -81,15 +80,6 @@ Variable (int32) vaTap Scope: local Value: 0 -Number originPage - Attributes - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - Text tInstruction Attributes Scope : local