From 70538f9de267cb1b155fd13a607ef38a76b9cc08 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Wed, 30 Mar 2022 20:32:27 +0000 Subject: [PATCH] moved time and date to pageicons (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 285 ++++++++++++++++++++++++--- HMI/US/portrait/diff-eu-version.txt | 285 ++++++++++++++++++++++++--- HMI/n2t-out-visual/Program.s.txt | 1 + HMI/n2t-out-visual/cardAlarm.txt | 4 +- HMI/n2t-out-visual/cardEntities.txt | 4 +- HMI/n2t-out-visual/cardGrid.txt | 4 +- HMI/n2t-out-visual/cardMedia.txt | 4 +- HMI/n2t-out-visual/cardThermo.txt | 4 +- HMI/n2t-out-visual/nspanel_Stats.txt | 48 ++--- HMI/n2t-out-visual/pageIcons.txt | 14 ++ HMI/n2t-out-visual/pageStartup.txt | 4 +- HMI/n2t-out-visual/popupLight.txt | 4 +- HMI/n2t-out-visual/popupNotify.txt | 4 +- HMI/n2t-out-visual/popupShutter.txt | 4 +- HMI/n2t-out-visual/screensaver.txt | 72 +++---- HMI/n2t-out/Program.s.txt | 1 + HMI/n2t-out/cardAlarm.txt | 4 +- HMI/n2t-out/cardEntities.txt | 4 +- HMI/n2t-out/cardGrid.txt | 4 +- HMI/n2t-out/cardMedia.txt | 4 +- HMI/n2t-out/cardThermo.txt | 4 +- HMI/n2t-out/pageIcons.txt | 12 ++ HMI/n2t-out/pageStartup.txt | 4 +- HMI/n2t-out/popupLight.txt | 4 +- HMI/n2t-out/popupNotify.txt | 4 +- HMI/n2t-out/popupShutter.txt | 4 +- HMI/n2t-out/screensaver.txt | 32 +-- 27 files changed, 639 insertions(+), 183 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 2827dac7..275e0b94 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,18 +1,34 @@ 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:07:58.195056766 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 20:07:59.147136815 +0000 -@@ -10,6 +10,6 @@ +--- 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 +@@ -10,7 +10,6 @@ int sleepValue=0 // dim value int dimValue=40 +- int dimValueNormal=100 - // fix touch offset - lcd_dev fffb 0002 0000 0020 + // 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 +--- 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 +@@ -583,12 +583,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -670,20 +670,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -37,8 +53,23 @@ 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 +@@ -1675,12 +1675,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -1719,20 +1719,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -63,8 +94,23 @@ 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 +@@ -765,12 +765,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -809,20 +809,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -89,8 +135,23 @@ 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 +@@ -551,12 +551,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -647,20 +647,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -115,8 +176,23 @@ 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 +@@ -835,12 +835,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -921,20 +921,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -141,9 +217,28 @@ 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:07:58.195056766 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 20:07:59.147136815 +0000 -@@ -17,7 +17,7 @@ +--- 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 +@@ -10,18 +10,6 @@ + Swide left page ID : disabled + Swide right page ID : disabled + +-Variable (string) vaTime +- Attributes +- Scope : global +- Text : +- Max. Text Size: 15 +- +-Variable (string) vaDate +- Attributes +- Scope : global +- Text : +- Max. Text Size: 30 +- + Text tIcons + Attributes + Scope : global +@@ -29,7 +17,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none @@ -153,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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -164,9 +259,24 @@ 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 +@@ -261,12 +261,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 @@ -382,6 +382,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -175,9 +285,24 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt sleepValue=0 click b0,1 click b0,0 +@@ -541,12 +542,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 @@ -195,6 +195,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -186,9 +311,24 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt sleepValue=0 click b0,1 click b0,0 +@@ -298,12 +299,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 20:07:59.147136815 +0000 +--- 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 @@ -268,6 +268,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -197,10 +337,25 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt sleepValue=0 click b0,1 click b0,0 +@@ -341,12 +342,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 20:07:59.147136815 +0000 -@@ -14,6 +14,7 @@ +--- 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 +@@ -14,18 +14,19 @@ Preinitialize Event recmod=1 bauds=115200 @@ -208,7 +363,41 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt vis tInstruction,0 vis tTmp,0 vis p0,0 -@@ -80,6 +81,15 @@ + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt +- spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +- spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 ++ spstr vaTime.txt,tTime.txt,"?",0 ++ spstr vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 + } +- tDate.txt=pageIcons.vaDate.txt ++ tDate.txt=vaDate.txt + dim=dimValue + vis tSend,0 + //page open event +@@ -57,6 +58,18 @@ + Text : + Max. Text Size: 200 + ++Variable (string) vaTime ++ Attributes ++ Scope : global ++ Text : ++ Max. Text Size: 15 ++ ++Variable (string) vaDate ++ Attributes ++ Scope : global ++ Text : ++ Max. Text Size: 30 ++ + Variable (string) tId + Attributes + Scope : local +@@ -68,6 +81,15 @@ Scope: local Value: 0 @@ -224,3 +413,43 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt Text tInstruction Attributes Scope : local +@@ -351,9 +373,9 @@ + if(tInstruction.txt=="time") + { + //get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 +- spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +- spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 ++ spstr strCommand.txt,vaTime.txt,",",1 ++ spstr vaTime.txt,tTime.txt,"?",0 ++ spstr vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 +@@ -362,8 +384,8 @@ + if(tInstruction.txt=="date") + { + //get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 +- tDate.txt=pageIcons.vaDate.txt ++ spstr strCommand.txt,vaDate.txt,"?",1 ++ tDate.txt=vaDate.txt + } + if(tInstruction.txt=="timeout") + { +@@ -482,7 +504,7 @@ + + Events + Touch Press Event +- dim=dimValueNormal ++ dim=100 + vaTap.val+=1 + covx vaTap.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt +@@ -497,4 +519,6 @@ + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 ++ //dim=100 ++ //page originPage.val + diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index a06cd626..196364de 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,18 +1,34 @@ 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:07:58.195056766 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 20:07:58.635093763 +0000 -@@ -10,6 +10,6 @@ +--- 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 +@@ -10,7 +10,6 @@ int sleepValue=0 // dim value int dimValue=40 +- int dimValueNormal=100 - // fix touch offset - lcd_dev fffb 0002 0000 0020 + // 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 +--- 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 +@@ -583,12 +583,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -670,20 +670,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -37,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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 20:07:58.639094100 +0000 +--- 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 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -806,6 +822,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +@@ -1675,12 +2379,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -1719,20 +2423,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -830,8 +861,23 @@ 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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 20:07:58.639094100 +0000 +--- 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 +@@ -765,12 +765,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -809,20 +809,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -856,8 +902,23 @@ 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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 20:07:58.639094100 +0000 +--- 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 +@@ -551,12 +551,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -647,20 +647,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -882,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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 20:07:58.639094100 +0000 +--- 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 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -908,6 +969,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt XFloat xTempCurr Attributes Scope : local +@@ -835,12 +845,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + if(tInstruction.txt=="dimmode") + { @@ -921,20 +931,9 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -932,9 +1008,28 @@ 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:07:58.195056766 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 20:07:58.635093763 +0000 -@@ -17,7 +17,7 @@ +--- 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 +@@ -10,18 +10,6 @@ + Swide left page ID : disabled + Swide right page ID : disabled + +-Variable (string) vaTime +- Attributes +- Scope : global +- Text : +- Max. Text Size: 15 +- +-Variable (string) vaDate +- Attributes +- Scope : global +- Text : +- Max. Text Size: 30 +- + Text tIcons + Attributes + Scope : global +@@ -29,7 +17,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none @@ -944,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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 20:07:58.639094100 +0000 +--- 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 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -964,9 +1059,24 @@ 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 +@@ -261,12 +261,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 20:07:58.639094100 +0000 +--- 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 @@ -382,6 +382,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -975,9 +1085,24 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt sleepValue=0 click b0,1 click b0,0 +@@ -541,12 +542,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 20:07:58.635093763 +0000 +--- 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 @@ -195,6 +195,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -986,9 +1111,24 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt sleepValue=0 click b0,1 click b0,0 +@@ -298,12 +299,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 20:07:58.635093763 +0000 +--- 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 @@ -268,6 +268,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -997,10 +1137,25 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt sleepValue=0 click b0,1 click b0,0 +@@ -341,12 +342,12 @@ + if(tInstruction.txt=="time") + { + // get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 ++ spstr strCommand.txt,screensaver.vaTime.txt,",",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 ++ spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + } + 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:07:58.199057102 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 20:07:58.639094100 +0000 -@@ -14,6 +14,7 @@ +--- 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 +@@ -14,18 +14,19 @@ Preinitialize Event recmod=1 bauds=115200 @@ -1008,7 +1163,41 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt vis tInstruction,0 vis tTmp,0 vis p0,0 -@@ -80,6 +81,15 @@ + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt +- spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +- spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 ++ spstr vaTime.txt,tTime.txt,"?",0 ++ spstr vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 + } +- tDate.txt=pageIcons.vaDate.txt ++ tDate.txt=vaDate.txt + dim=dimValue + vis tSend,0 + //page open event +@@ -57,6 +58,18 @@ + Text : + Max. Text Size: 200 + ++Variable (string) vaTime ++ Attributes ++ Scope : global ++ Text : ++ Max. Text Size: 15 ++ ++Variable (string) vaDate ++ Attributes ++ Scope : global ++ Text : ++ Max. Text Size: 30 ++ + Variable (string) tId + Attributes + Scope : local +@@ -68,6 +81,15 @@ Scope: local Value: 0 @@ -1024,3 +1213,43 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt Text tInstruction Attributes Scope : local +@@ -351,9 +373,9 @@ + if(tInstruction.txt=="time") + { + //get set time to global variable +- spstr strCommand.txt,pageIcons.vaTime.txt,",",1 +- spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +- spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 ++ spstr strCommand.txt,vaTime.txt,",",1 ++ spstr vaTime.txt,tTime.txt,"?",0 ++ spstr vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 +@@ -362,8 +384,8 @@ + if(tInstruction.txt=="date") + { + //get set date to global variable +- spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 +- tDate.txt=pageIcons.vaDate.txt ++ spstr strCommand.txt,vaDate.txt,"?",1 ++ tDate.txt=vaDate.txt + } + if(tInstruction.txt=="timeout") + { +@@ -482,7 +504,7 @@ + + Events + Touch Press Event +- dim=dimValueNormal ++ dim=100 + vaTap.val+=1 + covx vaTap.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt +@@ -497,4 +519,6 @@ + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 ++ //dim=100 ++ //page originPage.val + diff --git a/HMI/n2t-out-visual/Program.s.txt b/HMI/n2t-out-visual/Program.s.txt index 0ea4a9f5..d9463ac7 100644 --- a/HMI/n2t-out-visual/Program.s.txt +++ b/HMI/n2t-out-visual/Program.s.txt @@ -10,6 +10,7 @@ Program.s int sleepValue=0 // dim value int dimValue=40 + int dimValueNormal=100 // fix touch offset lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index beda29dd..58ea1f54 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1113,12 +1113,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index a23c7cba..52c6e655 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2620,12 +2620,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index f14dac8a..70be2a52 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1202,12 +1202,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 95557816..e91ec581 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -973,12 +973,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 53130fe2..f586a778 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1388,12 +1388,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 6bf12e28..9b1d57ce 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -1,9 +1,9 @@ Program.s 0 Component(s) - 10 Line(s) of event code - 10 Unique line(s) of event code + 11 Line(s) of event code + 11 Unique line(s) of event code pageIcons - 5 Component(s) + 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code pageTest @@ -22,34 +22,34 @@ 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 -cardAlarm - 35 Component(s) - 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 - 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 +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 +cardGrid + 39 Component(s) + 397 Line(s) of event code + 233 Unique line(s) of event code cardEntities 62 Component(s) 939 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 350 Component(s) - 3403 Line(s) of event code + 3404 Line(s) of event code 921 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index 4c8efa15..a1864cf3 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/n2t-out-visual/pageIcons.txt @@ -18,6 +18,20 @@ Page pageIcons Fill : solid color Back. Color : 65535 +Variable (string) vaTime + Attributes + ID : 5 + Scope : global + Text : + Max. Text Size: 15 + +Variable (string) vaDate + Attributes + ID : 6 + Scope : global + Text : + Max. Text Size: 30 + Text tIcons Attributes ID : 2 diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 19e8f994..73c571ac 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -556,12 +556,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index d3e7f634..6c8b8a0d 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -887,12 +887,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index 1248c06b..b64b201b 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -507,12 +507,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 2d8af3be..cf0b1610 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -606,12 +606,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 082a6b57..aaca21c2 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -27,13 +27,13 @@ Page screensaver vis p0,0 //load gloabl time string from pageIcons //tTime.txt=vaTime.txt - spstr vaTime.txt,tTime.txt,"?",0 - spstr vaTime.txt,tAMPM.txt,"?",1 + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") { vis tAMPM,0 } - tDate.txt=vaDate.txt + tDate.txt=pageIcons.vaDate.txt dim=dimValue vis tSend,0 //page open event @@ -66,30 +66,16 @@ Variable (string) strCommand Text : Max. Text Size: 200 -Variable (string) vaTime - Attributes - ID : 9 - Scope : global - Text : - Max. Text Size: 15 - -Variable (string) vaDate - Attributes - ID : 10 - Scope : global - Text : - Max. Text Size: 30 - Variable (string) tId Attributes - ID : 21 + ID : 19 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 29 + ID : 27 Scope: local Value: 0 @@ -215,7 +201,7 @@ Text tDate Text tSend Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -245,7 +231,7 @@ Text tSend Text tMainIcon Attributes - ID : 12 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -275,7 +261,7 @@ Text tMainIcon Text tMainText Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -305,7 +291,7 @@ Text tMainText Text tForecast1 Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -335,7 +321,7 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -365,7 +351,7 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 16 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -395,7 +381,7 @@ Text tF1Icon Text tForecast2 Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -425,7 +411,7 @@ Text tForecast2 Text tF2Icon Attributes - ID : 18 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -455,7 +441,7 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 19 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -485,7 +471,7 @@ Text tForecast2Val Text t10 Attributes - ID : 20 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -515,7 +501,7 @@ Text t10 Text tAMPM Attributes - ID : 22 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -545,7 +531,7 @@ Text tAMPM Text tForecast3Val Attributes - ID : 23 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -575,7 +561,7 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 24 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -605,7 +591,7 @@ Text tF3Icon Text tForecast3 Attributes - ID : 25 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -635,7 +621,7 @@ Text tForecast3 Text tForecast4 Attributes - ID : 26 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -665,7 +651,7 @@ Text tForecast4 Text tF4Icon Attributes - ID : 27 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -695,7 +681,7 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 28 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -807,9 +793,9 @@ Timer tmSerial if(tInstruction.txt=="time") { //get set time to global variable - spstr strCommand.txt,vaTime.txt,",",1 - spstr vaTime.txt,tTime.txt,"?",0 - spstr vaTime.txt,tAMPM.txt,"?",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") { vis tAMPM,0 @@ -818,8 +804,8 @@ Timer tmSerial if(tInstruction.txt=="date") { //get set date to global variable - spstr strCommand.txt,vaDate.txt,"?",1 - tDate.txt=vaDate.txt + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + tDate.txt=pageIcons.vaDate.txt } if(tInstruction.txt=="timeout") { @@ -939,7 +925,7 @@ TouchCap tc0 Events Touch Press Event - dim=100 + dim=dimValueNormal vaTap.val+=1 covx vaTap.val,tTmp.txt,0,0 tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt @@ -954,6 +940,4 @@ TouchCap tc0 prints sys0,2 prints tSend.txt,0 prints crcval,2 - //dim=100 - //page originPage.val diff --git a/HMI/n2t-out/Program.s.txt b/HMI/n2t-out/Program.s.txt index 0ea4a9f5..d9463ac7 100644 --- a/HMI/n2t-out/Program.s.txt +++ b/HMI/n2t-out/Program.s.txt @@ -10,6 +10,7 @@ Program.s int sleepValue=0 // dim value int dimValue=40 + int dimValueNormal=100 // fix touch offset lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index b40f1dc9..a8d9caed 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -583,12 +583,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 2fb585dc..9f65cc9b 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1675,12 +1675,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index c7465580..3fe0b3e1 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -765,12 +765,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index cba5822c..b1f4c75c 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -551,12 +551,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 01621d30..e0db4ced 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -835,12 +835,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 1d8e11e3..140ee77c 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -10,6 +10,18 @@ Page pageIcons Swide left page ID : disabled Swide right page ID : disabled +Variable (string) vaTime + Attributes + Scope : global + Text : + Max. Text Size: 15 + +Variable (string) vaDate + Attributes + Scope : global + Text : + Max. Text Size: 30 + Text tIcons Attributes Scope : global diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index fd57aa9f..cc95f35a 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -261,12 +261,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 3fc3f865..8eeb9fee 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -541,12 +541,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 67648fcb..7510b64a 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -298,12 +298,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="dimmode") { diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 1c618931..ae194231 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -341,12 +341,12 @@ Timer tmSerial if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,screensaver.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,screensaver.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index b2c0b397..9e565de7 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -19,13 +19,13 @@ Page screensaver vis p0,0 //load gloabl time string from pageIcons //tTime.txt=vaTime.txt - spstr vaTime.txt,tTime.txt,"?",0 - spstr vaTime.txt,tAMPM.txt,"?",1 + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") { vis tAMPM,0 } - tDate.txt=vaDate.txt + tDate.txt=pageIcons.vaDate.txt dim=dimValue vis tSend,0 //page open event @@ -57,18 +57,6 @@ Variable (string) strCommand Text : Max. Text Size: 200 -Variable (string) vaTime - Attributes - Scope : global - Text : - Max. Text Size: 15 - -Variable (string) vaDate - Attributes - Scope : global - Text : - Max. Text Size: 30 - Variable (string) tId Attributes Scope : local @@ -363,9 +351,9 @@ Timer tmSerial if(tInstruction.txt=="time") { //get set time to global variable - spstr strCommand.txt,vaTime.txt,",",1 - spstr vaTime.txt,tTime.txt,"?",0 - spstr vaTime.txt,tAMPM.txt,"?",1 + spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") { vis tAMPM,0 @@ -374,8 +362,8 @@ Timer tmSerial if(tInstruction.txt=="date") { //get set date to global variable - spstr strCommand.txt,vaDate.txt,"?",1 - tDate.txt=vaDate.txt + spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + tDate.txt=pageIcons.vaDate.txt } if(tInstruction.txt=="timeout") { @@ -494,7 +482,7 @@ TouchCap tc0 Events Touch Press Event - dim=100 + dim=dimValueNormal vaTap.val+=1 covx vaTap.val,tTmp.txt,0,0 tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt @@ -509,6 +497,4 @@ TouchCap tc0 prints sys0,2 prints tSend.txt,0 prints crcval,2 - //dim=100 - //page originPage.val