From 2968776a22ab3de583723d8234052d01d73e44d7 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 8 Oct 2022 21:40:27 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 215 +++++++++++++++++++++++++-- HMI/US/portrait/diff-eu-version.txt | 213 ++++++++++++++++++++++++-- HMI/US/portrait/diff-filtered.txt | 194 +++++++++++++++++++++++- HMI/n2t-out-visual/cardAlarm.txt | 1 + HMI/n2t-out-visual/cardEntities.txt | 1 + HMI/n2t-out-visual/cardGrid.txt | 1 + HMI/n2t-out-visual/cardMedia.txt | 1 + HMI/n2t-out-visual/cardThermo.txt | 1 + HMI/n2t-out-visual/nspanel_Stats.txt | 86 +++++------ HMI/n2t-out-visual/pageStartup.txt | 5 + HMI/n2t-out-visual/popupFan.txt | 1 + HMI/n2t-out-visual/popupLight.txt | 1 + HMI/n2t-out-visual/popupNotify.txt | 1 + HMI/n2t-out-visual/popupShutter.txt | 1 + HMI/n2t-out-visual/screensaver.txt | 1 + HMI/n2t-out/cardAlarm.txt | 1 + HMI/n2t-out/cardEntities.txt | 1 + HMI/n2t-out/cardGrid.txt | 1 + HMI/n2t-out/cardMedia.txt | 1 + HMI/n2t-out/cardThermo.txt | 1 + HMI/n2t-out/pageStartup.txt | 5 + HMI/n2t-out/popupFan.txt | 1 + HMI/n2t-out/popupLight.txt | 1 + HMI/n2t-out/popupNotify.txt | 1 + HMI/n2t-out/popupShutter.txt | 1 + HMI/n2t-out/screensaver.txt | 1 + 26 files changed, 673 insertions(+), 65 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 67b1d800..0f58fdcb 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -13,7 +13,23 @@ │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup ├── cardAlarm.txt -│ @@ -833,18 +833,14 @@ +│ @@ -784,15 +784,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -834,18 +833,14 @@ │ { │ page cardAlarm │ } @@ -101,7 +117,23 @@ │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC -│ @@ -1886,18 +1886,14 @@ +│ @@ -1837,15 +1837,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -1887,18 +1886,14 @@ │ { │ page cardAlarm │ } @@ -121,7 +153,23 @@ │ } │ if(tInstruction.txt=="date") ├── cardGrid.txt -│ @@ -838,18 +838,14 @@ +│ @@ -789,15 +789,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -839,18 +838,14 @@ │ { │ page cardAlarm │ } @@ -141,7 +189,23 @@ │ } │ if(tInstruction.txt=="date") ├── cardMedia.txt -│ @@ -751,18 +751,14 @@ +│ @@ -702,15 +702,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -752,18 +751,14 @@ │ { │ page cardAlarm │ } @@ -197,7 +261,23 @@ │ } │ } ├── cardThermo.txt -│ @@ -1138,18 +1138,14 @@ +│ @@ -1089,15 +1089,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -1139,18 +1138,14 @@ │ { │ page cardAlarm │ } @@ -234,8 +314,59 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -302,15 +302,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="cardThermo") +│ { +│ page cardThermo +│ } +│ @@ -347,18 +346,14 @@ +│ { +│ page cardAlarm +│ } +│ if(tId.txt=="cardQR") +│ { +│ page cardQR +│ } +│ - if(tId.txt=="cardPower") +│ - { +│ - page cardPower +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } ├── popupFan.txt -│ @@ -623,18 +623,14 @@ +│ @@ -574,15 +574,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -624,18 +623,14 @@ │ { │ page cardAlarm │ } @@ -255,7 +386,23 @@ │ } │ } ├── popupLight.txt -│ @@ -659,18 +659,14 @@ +│ @@ -610,15 +610,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -660,18 +659,14 @@ │ { │ page cardAlarm │ } @@ -275,7 +422,23 @@ │ } │ } ├── popupNotify.txt -│ @@ -406,18 +406,14 @@ +│ @@ -352,15 +352,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ @@ -407,18 +406,14 @@ │ { │ page cardAlarm │ } @@ -295,7 +458,23 @@ │ } │ } ├── popupShutter.txt -│ @@ -685,18 +685,14 @@ +│ @@ -636,15 +636,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -686,18 +685,14 @@ │ { │ page cardAlarm │ } @@ -315,7 +494,23 @@ │ } │ } ├── screensaver.txt -│ @@ -675,18 +675,14 @@ +│ @@ -631,15 +631,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete u[2]+3 +│ bufferPos=0 +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ @@ -676,18 +675,14 @@ │ { │ page cardAlarm │ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1b7d8512..217b95c3 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -15,7 +15,23 @@ │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup ├── cardAlarm.txt -│ @@ -833,18 +833,14 @@ +│ @@ -784,15 +784,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -834,18 +833,14 @@ │ { │ page cardAlarm │ } @@ -388,7 +404,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1826,14 +2059,163 @@ +│ @@ -1826,26 +2059,174 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 │ //third value is max value @@ -552,7 +568,19 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -│ @@ -1886,18 +2268,14 @@ +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -1887,18 +2268,14 @@ │ { │ page cardAlarm │ } @@ -572,7 +600,23 @@ │ } │ if(tInstruction.txt=="date") ├── cardGrid.txt -│ @@ -838,18 +838,14 @@ +│ @@ -789,15 +789,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -839,18 +838,14 @@ │ { │ page cardAlarm │ } @@ -592,7 +636,23 @@ │ } │ if(tInstruction.txt=="date") ├── cardMedia.txt -│ @@ -751,18 +751,14 @@ +│ @@ -702,15 +702,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -752,18 +751,14 @@ │ { │ page cardAlarm │ } @@ -648,7 +708,23 @@ │ } │ } ├── cardThermo.txt -│ @@ -1138,18 +1138,14 @@ +│ @@ -1089,15 +1089,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -1139,18 +1138,14 @@ │ { │ page cardAlarm │ } @@ -720,6 +796,41 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -302,15 +302,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="cardThermo") +│ { +│ page cardThermo +│ } +│ @@ -347,18 +346,14 @@ +│ { +│ page cardAlarm +│ } +│ if(tId.txt=="cardQR") +│ { +│ page cardQR +│ } +│ - if(tId.txt=="cardPower") +│ - { +│ - page cardPower +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } ├── popupFan.txt │ @@ -78,31 +78,31 @@ │ Value: 1 @@ -825,7 +936,23 @@ │ crcrest 1,0xffff // reset CRC │ crcputh 55 bb │ crcputs sys0,2 -│ @@ -623,18 +623,14 @@ +│ @@ -574,15 +574,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -624,18 +623,14 @@ │ { │ page cardAlarm │ } @@ -845,7 +972,23 @@ │ } │ } ├── popupLight.txt -│ @@ -659,18 +659,14 @@ +│ @@ -610,15 +610,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -660,18 +659,14 @@ │ { │ page cardAlarm │ } @@ -865,7 +1008,23 @@ │ } │ } ├── popupNotify.txt -│ @@ -406,18 +406,14 @@ +│ @@ -352,15 +352,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ @@ -407,18 +406,14 @@ │ { │ page cardAlarm │ } @@ -885,7 +1044,23 @@ │ } │ } ├── popupShutter.txt -│ @@ -685,18 +685,14 @@ +│ @@ -636,15 +636,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete payloadLength-1 +│ bufferPos=0 +│ if(tId.txt=="pageStartup") +│ { +│ page pageStartup +│ } +│ @@ -686,18 +685,14 @@ │ { │ page cardAlarm │ } @@ -922,7 +1097,23 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -675,18 +675,14 @@ +│ @@ -631,15 +631,14 @@ +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one +│ spstr strCommand.txt,tTmp.txt,"~",2 +│ //save third arg if there's one +│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 +│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 +│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... +│ udelete u[2]+3 +│ bufferPos=0 +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ @@ -676,18 +675,14 @@ │ { │ page cardAlarm │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 27f8f582..3147121b 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,5 +1,21 @@ -+++ /dev/fd/62 2022-10-08 21:22:56.668959488 +0000 ++++ /dev/fd/62 2022-10-08 21:40:20.817238068 +0000 +rdAlarm.txt ++15 +784,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +18 +833,14 @@ + { + page cardAlarm @@ -19,6 +35,19 @@ + } + } + } ++,26 +2059,174 @@ ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +,18 +2268,14 @@ + { + page cardAlarm @@ -39,6 +68,22 @@ + } + if(tInstruction.txt=="date") +rdGrid.txt ++15 +789,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +18 +838,14 @@ + { + page cardAlarm @@ -59,6 +104,22 @@ + } + if(tInstruction.txt=="date") +rdMedia.txt ++15 +702,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +18 +751,14 @@ + { + page cardAlarm @@ -115,6 +176,22 @@ + } + } +rdThermo.txt ++,15 +1089,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +,18 +1138,14 @@ + { + page cardAlarm @@ -152,6 +229,57 @@ + Scope : global + Dragging : 0 + Disable release event after dragging: 0 ++15 +302,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="cardThermo") ++ { ++ page cardThermo ++ } ++18 +346,14 @@ ++ { ++ page cardAlarm ++ } ++ if(tId.txt=="cardQR") ++ { ++ page cardQR ++ } ++ if(tId.txt=="cardPower") ++ { ++ page cardPower ++ } ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++15 +574,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +18 +623,14 @@ + { + page cardAlarm @@ -172,6 +300,22 @@ + } + } +pupLight.txt ++15 +610,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +18 +659,14 @@ + { + page cardAlarm @@ -192,6 +336,22 @@ + } + } +pupNotify.txt ++15 +352,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="popupLight") ++ { ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight +18 +406,14 @@ + { + page cardAlarm @@ -212,6 +372,22 @@ + } + } +pupShutter.txt ++15 +636,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete payloadLength-1 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } +18 +685,14 @@ + { + page cardAlarm @@ -249,6 +425,22 @@ + Scope : local + Dragging : 0 + Disable release event after dragging: 0 ++15 +631,14 @@ ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ //save third arg if there's one ++ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 ++ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 ++ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... ++ udelete u[2]+3 ++ bufferPos=0 ++ if(tId.txt=="popupLight") ++ { ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight +18 +675,14 @@ + { + page cardAlarm diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 7e27beda..bed25699 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1370,6 +1370,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 5a43d372..f702ace1 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2794,6 +2794,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 4e63048d..4df5d25a 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1238,6 +1238,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index ff5aff8b..57c9fbac 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1137,6 +1137,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index b04a7bb4..8ea8472c 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1791,6 +1791,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index ec0c67d7..7ff9dd65 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -6,65 +6,65 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -popupNotify - 17 Component(s) - 230 Line(s) of event code - 145 Unique line(s) of event code pageTest 20 Component(s) 65 Line(s) of event code 62 Unique line(s) of event code -pageStartup - 19 Component(s) - 167 Line(s) of event code - 122 Unique line(s) of event code -popupLight - 27 Component(s) - 390 Line(s) of event code - 213 Unique line(s) of event code -screensaver - 38 Component(s) - 337 Line(s) of event code - 261 Unique line(s) of event code -popupFan - 27 Component(s) - 346 Line(s) of event code - 201 Unique line(s) of event code -cardGrid - 42 Component(s) - 473 Line(s) of event code - 280 Unique line(s) of event code -cardMedia - 34 Component(s) - 393 Line(s) of event code - 212 Unique line(s) of event code popupShutter 25 Component(s) - 393 Line(s) of event code - 215 Unique line(s) of event code + 394 Line(s) of event code + 216 Unique line(s) of event code +popupNotify + 17 Component(s) + 231 Line(s) of event code + 146 Unique line(s) of event code +popupLight + 27 Component(s) + 391 Line(s) of event code + 214 Unique line(s) of event code +pageStartup + 19 Component(s) + 172 Line(s) of event code + 125 Unique line(s) of event code +popupFan + 27 Component(s) + 347 Line(s) of event code + 202 Unique line(s) of event code cardQR 32 Component(s) 409 Line(s) of event code 238 Unique line(s) of event code -cardAlarm - 40 Component(s) - 426 Line(s) of event code - 257 Unique line(s) of event code -cardThermo - 52 Component(s) - 584 Line(s) of event code - 305 Unique line(s) of event code -cardEntities - 65 Component(s) - 1136 Line(s) of event code - 521 Unique line(s) of event code +cardGrid + 42 Component(s) + 474 Line(s) of event code + 281 Unique line(s) of event code +cardMedia + 34 Component(s) + 394 Line(s) of event code + 213 Unique line(s) of event code cardPower 43 Component(s) 420 Line(s) of event code 292 Unique line(s) of event code +screensaver + 38 Component(s) + 338 Line(s) of event code + 262 Unique line(s) of event code +cardThermo + 52 Component(s) + 585 Line(s) of event code + 306 Unique line(s) of event code +cardAlarm + 40 Component(s) + 427 Line(s) of event code + 258 Unique line(s) of event code +cardEntities + 65 Component(s) + 1137 Line(s) of event code + 522 Unique line(s) of event code Total 15 Page(s) 488 Component(s) - 5782 Line(s) of event code + 5797 Line(s) of event code 1561 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 209f1253..e2006fb4 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -601,6 +601,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -645,6 +646,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index c08afb8e..8d515c00 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -869,6 +869,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 7a393f9b..dd4f89f4 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -941,6 +941,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index a9feaa8b..b5cef585 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -546,6 +546,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 43f572bb..6ee0b4d6 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -950,6 +950,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index f07d0f7f..113b8afd 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1200,6 +1200,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete u[2]+3 bufferPos=0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 4ca36dd8..afd86599 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -788,6 +788,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 9b663c22..b5bf9ad0 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1841,6 +1841,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index fcaee586..a88bb892 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -793,6 +793,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 375f3a81..a4e667ae 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -706,6 +706,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 3e82e628..46c1e60d 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -1093,6 +1093,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 75a9f5f2..30484653 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -306,6 +306,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -350,6 +351,10 @@ Timer tmSerial { page cardQR } + if(tId.txt=="cardPower") + { + page cardPower + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index ba237149..3512f075 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -578,6 +578,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 5599dd1a..838b13e3 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -614,6 +614,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index a0df5fbd..673dd9bb 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -356,6 +356,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 0733f598..b13af280 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -640,6 +640,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index bc110c0a..01a8cc52 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -635,6 +635,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete u[2]+3 bufferPos=0