diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index c43c9aef..a6663f4a 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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 15:25:02.174410141 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -135,8 +135,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 15:25:02.178410192 +0000 @@ -211,7 +211,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -557,8 +557,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt } // end of user code diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 15:25:02.178410192 +0000 @@ -12,28 +12,307 @@ Events @@ -1131,8 +1131,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt } // end of user code diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-01 15:25:02.174410141 +0000 @@ -503,13 +503,13 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1190,8 +1190,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-01 15:25:02.174410141 +0000 @@ -640,13 +640,13 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1474,8 +1474,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt } // end of user code diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 15:25:02.174410141 +0000 @@ -20,7 +20,7 @@ Attributes Scope : global @@ -1486,8 +1486,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt Text tIcons Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 15:25:02.174410141 +0000 @@ -257,11 +257,11 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1534,8 +1534,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-01 15:25:02.174410141 +0000 @@ -438,24 +438,24 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1624,8 +1624,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-01 15:25:02.174410141 +0000 @@ -251,7 +251,7 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1676,8 +1676,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-01 15:25:02.174410141 +0000 @@ -324,24 +324,24 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1731,8 +1731,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 14:58:12.364010551 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 15:25:02.174410141 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event @@ -1918,7 +1918,7 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt spstr pageIcons.vaTime.txt,tTime.txt,"?",0 spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 if(tAMPM.txt=="") -@@ -388,25 +368,17 @@ +@@ -388,98 +368,60 @@ if(tInstruction.txt=="timeout") { //set timeout to global var @@ -1935,23 +1935,61 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt - vis tMRIcon,0 - vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.txt,"?",1 +- spstr strCommand.txt,tTmp.txt,"~",1 ++ spstr strCommand.txt,tTmp.txt,"?",1 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 - tMainIconAlt.txt=tMainIcon.txt //tMainText - spstr strCommand.txt,tMainText.txt,"?",2 +- spstr strCommand.txt,tMainText.txt,"~",2 - tMainTextAlt.txt=tMainText.txt ++ spstr strCommand.txt,tMainText.txt,"?",2 //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 +- spstr strCommand.txt,tForecast1.txt,"~",3 ++ spstr strCommand.txt,tForecast1.txt,"?",3 //tF1Icon -@@ -439,47 +411,17 @@ +- spstr strCommand.txt,tTmp.txt,"~",4 ++ spstr strCommand.txt,tTmp.txt,"?",4 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 + //tForecast1Val +- spstr strCommand.txt,tForecast1Val.txt,"~",5 ++ spstr strCommand.txt,tForecast1Val.txt,"?",5 + //tForecast2 +- spstr strCommand.txt,tForecast2.txt,"~",6 ++ spstr strCommand.txt,tForecast2.txt,"?",6 + //tF2Icon +- spstr strCommand.txt,tTmp.txt,"~",7 ++ spstr strCommand.txt,tTmp.txt,"?",7 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 + //tForecast2Val +- spstr strCommand.txt,tForecast2Val.txt,"~",8 ++ spstr strCommand.txt,tForecast2Val.txt,"?",8 + //tForecast3 +- spstr strCommand.txt,tForecast3.txt,"~",9 ++ spstr strCommand.txt,tForecast3.txt,"?",9 + //tF3Icon +- spstr strCommand.txt,tTmp.txt,"~",10 ++ spstr strCommand.txt,tTmp.txt,"?",10 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 + //tForecast3Val +- spstr strCommand.txt,tForecast3Val.txt,"~",11 ++ spstr strCommand.txt,tForecast3Val.txt,"?",11 + //tForecast4 +- spstr strCommand.txt,tForecast4.txt,"~",12 ++ spstr strCommand.txt,tForecast4.txt,"?",12 + //tF4Icon +- spstr strCommand.txt,tTmp.txt,"~",13 ++ spstr strCommand.txt,tTmp.txt,"?",13 + covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"?",14 +- spstr strCommand.txt,tForecast4Val.txt,"~",14 - //alternative layout - //tMRIcon -- spstr strCommand.txt,tTmp.txt,"?",15 +- spstr strCommand.txt,tTmp.txt,"~",15 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 - if(tTmp.txt!="") @@ -1978,7 +2016,8 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt - tF2Icon.txt=tF1Icon.txt - } - //tMR -- spstr strCommand.txt,tMR.txt,"?",16 +- spstr strCommand.txt,tMR.txt,"~",16 ++ spstr strCommand.txt,tForecast4Val.txt,"?",14 } if(tInstruction.txt=="pageType") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b2a05bb4..fd5a1061 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 15:25:01.750404700 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 15:25:01.750404700 +0000 @@ -512,13 +512,13 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -139,8 +139,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 15:25:01.750404700 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -1272,8 +1272,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } // end of user code diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 15:25:01.750404700 +0000 @@ -568,13 +568,13 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1504,8 +1504,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt } // end of user code diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 15:25:01.750404700 +0000 @@ -503,13 +503,13 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1563,8 +1563,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 15:25:01.750404700 +0000 @@ -640,13 +640,13 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -1847,8 +1847,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt } // end of user code diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 15:25:01.750404700 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1913,8 +1913,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 15:25:01.750404700 +0000 @@ -438,24 +438,24 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -2003,8 +2003,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 15:25:01.750404700 +0000 @@ -251,7 +251,7 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -2055,8 +2055,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-01 15:25:01.338399413 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 15:25:01.750404700 +0000 @@ -324,24 +324,24 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -2110,8 +2110,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-01 14:58:11.568015122 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 14:58:11.972012802 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-01 15:25:01.342399464 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 15:25:01.750404700 +0000 @@ -355,7 +355,7 @@ // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 @@ -2147,7 +2147,79 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt covx tTmp.txt,sleepTimeout,0,0 } if(tInstruction.txt=="weatherUpdate") -@@ -475,11 +475,11 @@ +@@ -400,48 +400,48 @@ + vis tMRIcon,0 + vis tMR,0 + //tMainIcon +- spstr strCommand.txt,tTmp.txt,"~",1 ++ spstr strCommand.txt,tTmp.txt,"?",1 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 + tMainIconAlt.txt=tMainIcon.txt + //tMainText +- spstr strCommand.txt,tMainText.txt,"~",2 ++ spstr strCommand.txt,tMainText.txt,"?",2 + tMainTextAlt.txt=tMainText.txt + //tForecast1 +- spstr strCommand.txt,tForecast1.txt,"~",3 ++ spstr strCommand.txt,tForecast1.txt,"?",3 + //tF1Icon +- spstr strCommand.txt,tTmp.txt,"~",4 ++ spstr strCommand.txt,tTmp.txt,"?",4 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 + //tForecast1Val +- spstr strCommand.txt,tForecast1Val.txt,"~",5 ++ spstr strCommand.txt,tForecast1Val.txt,"?",5 + //tForecast2 +- spstr strCommand.txt,tForecast2.txt,"~",6 ++ spstr strCommand.txt,tForecast2.txt,"?",6 + //tF2Icon +- spstr strCommand.txt,tTmp.txt,"~",7 ++ spstr strCommand.txt,tTmp.txt,"?",7 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 + //tForecast2Val +- spstr strCommand.txt,tForecast2Val.txt,"~",8 ++ spstr strCommand.txt,tForecast2Val.txt,"?",8 + //tForecast3 +- spstr strCommand.txt,tForecast3.txt,"~",9 ++ spstr strCommand.txt,tForecast3.txt,"?",9 + //tF3Icon +- spstr strCommand.txt,tTmp.txt,"~",10 ++ spstr strCommand.txt,tTmp.txt,"?",10 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 + //tForecast3Val +- spstr strCommand.txt,tForecast3Val.txt,"~",11 ++ spstr strCommand.txt,tForecast3Val.txt,"?",11 + //tForecast4 +- spstr strCommand.txt,tForecast4.txt,"~",12 ++ spstr strCommand.txt,tForecast4.txt,"?",12 + //tF4Icon +- spstr strCommand.txt,tTmp.txt,"~",13 ++ spstr strCommand.txt,tTmp.txt,"?",13 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 + //tForecast4Val +- spstr strCommand.txt,tForecast4Val.txt,"~",14 ++ spstr strCommand.txt,tForecast4Val.txt,"?",14 + //alternative layout + //tMRIcon +- spstr strCommand.txt,tTmp.txt,"~",15 ++ spstr strCommand.txt,tTmp.txt,"?",15 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 + if(tTmp.txt!="") +@@ -468,18 +468,18 @@ + tF2Icon.txt=tF1Icon.txt + } + //tMR +- spstr strCommand.txt,tMR.txt,"~",16 ++ spstr strCommand.txt,tMR.txt,"?",16 + } + if(tInstruction.txt=="pageType") + { dim=100 //command format pageType,specialPageName //write name of speical page to tId diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index e6d6a121..72ee9a91 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -45,7 +45,7 @@ cardThermo screensaver 33 Component(s) 207 Line(s) of event code - 159 Unique line(s) of event code + 158 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code @@ -59,4 +59,4 @@ Total 13 Page(s) 355 Component(s) 3637 Line(s) of event code - 1064 Unique line(s) of event code + 1059 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 3baf3f89..868ad552 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -922,48 +922,48 @@ Timer tmSerial vis tMRIcon,0 vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.txt,"?",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 tMainIconAlt.txt=tMainIcon.txt //tMainText - spstr strCommand.txt,tMainText.txt,"?",2 + spstr strCommand.txt,tMainText.txt,"~",2 tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 + spstr strCommand.txt,tForecast1.txt,"~",3 //tF1Icon - spstr strCommand.txt,tTmp.txt,"?",4 + spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 //tForecast1Val - spstr strCommand.txt,tForecast1Val.txt,"?",5 + spstr strCommand.txt,tForecast1Val.txt,"~",5 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"?",6 + spstr strCommand.txt,tForecast2.txt,"~",6 //tF2Icon - spstr strCommand.txt,tTmp.txt,"?",7 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 //tForecast2Val - spstr strCommand.txt,tForecast2Val.txt,"?",8 + spstr strCommand.txt,tForecast2Val.txt,"~",8 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"?",9 + spstr strCommand.txt,tForecast3.txt,"~",9 //tF3Icon - spstr strCommand.txt,tTmp.txt,"?",10 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 //tForecast3Val - spstr strCommand.txt,tForecast3Val.txt,"?",11 + spstr strCommand.txt,tForecast3Val.txt,"~",11 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"?",12 + spstr strCommand.txt,tForecast4.txt,"~",12 //tF4Icon - spstr strCommand.txt,tTmp.txt,"?",13 + spstr strCommand.txt,tTmp.txt,"~",13 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"?",14 + spstr strCommand.txt,tForecast4Val.txt,"~",14 //alternative layout //tMRIcon - spstr strCommand.txt,tTmp.txt,"?",15 + spstr strCommand.txt,tTmp.txt,"~",15 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 if(tTmp.txt!="") @@ -990,7 +990,7 @@ Timer tmSerial tF2Icon.txt=tF1Icon.txt } //tMR - spstr strCommand.txt,tMR.txt,"?",16 + spstr strCommand.txt,tMR.txt,"~",16 } if(tInstruction.txt=="pageType") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index d9233059..1ada6523 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -400,48 +400,48 @@ Timer tmSerial vis tMRIcon,0 vis tMR,0 //tMainIcon - spstr strCommand.txt,tTmp.txt,"?",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 tMainIconAlt.txt=tMainIcon.txt //tMainText - spstr strCommand.txt,tMainText.txt,"?",2 + spstr strCommand.txt,tMainText.txt,"~",2 tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 + spstr strCommand.txt,tForecast1.txt,"~",3 //tF1Icon - spstr strCommand.txt,tTmp.txt,"?",4 + spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 //tForecast1Val - spstr strCommand.txt,tForecast1Val.txt,"?",5 + spstr strCommand.txt,tForecast1Val.txt,"~",5 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"?",6 + spstr strCommand.txt,tForecast2.txt,"~",6 //tF2Icon - spstr strCommand.txt,tTmp.txt,"?",7 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 //tForecast2Val - spstr strCommand.txt,tForecast2Val.txt,"?",8 + spstr strCommand.txt,tForecast2Val.txt,"~",8 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"?",9 + spstr strCommand.txt,tForecast3.txt,"~",9 //tF3Icon - spstr strCommand.txt,tTmp.txt,"?",10 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 //tForecast3Val - spstr strCommand.txt,tForecast3Val.txt,"?",11 + spstr strCommand.txt,tForecast3Val.txt,"~",11 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"?",12 + spstr strCommand.txt,tForecast4.txt,"~",12 //tF4Icon - spstr strCommand.txt,tTmp.txt,"?",13 + spstr strCommand.txt,tTmp.txt,"~",13 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"?",14 + spstr strCommand.txt,tForecast4Val.txt,"~",14 //alternative layout //tMRIcon - spstr strCommand.txt,tTmp.txt,"?",15 + spstr strCommand.txt,tTmp.txt,"~",15 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 if(tTmp.txt!="") @@ -468,7 +468,7 @@ Timer tmSerial tF2Icon.txt=tF1Icon.txt } //tMR - spstr strCommand.txt,tMR.txt,"?",16 + spstr strCommand.txt,tMR.txt,"~",16 } if(tInstruction.txt=="pageType") {