diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 9def01c9..1102c0a7 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -30,6 +30,71 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -306,52 +306,47 @@ +│ 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") +│ + if(tId.txt=="cardThermo") +│ { +│ - page pageStartup +│ + page cardThermo +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="cardEntities") +│ - { +│ - page cardEntities +│ - } +│ - if(tId.txt=="cardGrid") +│ - { +│ - page cardGrid +│ - } +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ } +│ - if(tId.txt=="popupShutter") +│ + if(tId.txt=="cardEntities") +│ { +│ - pageIcons.tTmp1.txt=tTmp.txt +│ - page popupShutter +│ + page cardEntities +│ } +│ - if(tId.txt=="popupNotify") +│ + if(tId.txt=="pageStartup") +│ { +│ - page popupNotify +│ + page pageStartup +│ } +│ - if(tId.txt=="cardThermo") +│ + if(tId.txt=="popupNotify") +│ { +│ - page cardThermo +│ + page popupNotify +│ } +│ if(tId.txt=="cardMedia") +│ { +│ page cardMedia +│ } +│ + if(tId.txt=="cardGrid") +│ + { +│ + page cardGrid +│ + } +│ if(tId.txt=="cardAlarm") +│ { +│ page cardAlarm +│ } +│ if(tId.txt=="cardQR") +│ { +│ page cardQR ├── screensaver.txt │ @@ -252,25 +252,25 @@ │ Attributes @@ -93,3 +158,73 @@ │ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 │ tDate.txt=pageIcons.vaDate.txt │ } +│ @@ -691,53 +689,48 @@ +│ 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 +│ + udelete u[2]+3 +│ bufferPos=0 +│ - if(tId.txt=="pageStartup") +│ - { +│ - page pageStartup +│ - } +│ - if(tId.txt=="screensaver") +│ + if(tId.txt=="popupLight") +│ { +│ - page screensaver +│ + pageIcons.tTmp1.txt=tTmp.txt +│ + page popupLight +│ } +│ - if(tId.txt=="cardEntities") +│ + if(tId.txt=="pageStartup") +│ { +│ - page cardEntities +│ + page pageStartup +│ } +│ - if(tId.txt=="cardGrid") +│ + if(tId.txt=="cardThermo") +│ { +│ - page cardGrid +│ + page cardThermo +│ } +│ - if(tId.txt=="popupLight") +│ + if(tId.txt=="cardMedia") +│ { +│ - pageIcons.tTmp1.txt=tTmp.txt +│ - page popupLight +│ + page cardMedia +│ } +│ - if(tId.txt=="popupShutter") +│ + if(tId.txt=="pageStartup") +│ { +│ - pageIcons.tTmp1.txt=tTmp.txt +│ - page popupShutter +│ + page pageStartup +│ } +│ if(tId.txt=="popupNotify") +│ { +│ page popupNotify +│ } +│ - if(tId.txt=="cardThermo") +│ + if(tId.txt=="cardGrid") +│ { +│ - page cardThermo +│ + page cardGrid +│ } +│ - if(tId.txt=="cardMedia") +│ + if(tId.txt=="cardEntities") +│ { +│ - page cardMedia +│ + page cardEntities +│ } +│ if(tId.txt=="cardAlarm") +│ { +│ page cardAlarm +│ } +│ if(tId.txt=="cardQR") +│ { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index ae4da3c6..5603cdce 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -646,6 +646,71 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -306,52 +306,47 @@ +│ 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") +│ + if(tId.txt=="cardThermo") +│ { +│ - page pageStartup +│ + page cardThermo +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="cardEntities") +│ - { +│ - page cardEntities +│ - } +│ - if(tId.txt=="cardGrid") +│ - { +│ - page cardGrid +│ - } +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ } +│ - if(tId.txt=="popupShutter") +│ + if(tId.txt=="cardEntities") +│ { +│ - pageIcons.tTmp1.txt=tTmp.txt +│ - page popupShutter +│ + page cardEntities +│ } +│ - if(tId.txt=="popupNotify") +│ + if(tId.txt=="pageStartup") +│ { +│ - page popupNotify +│ + page pageStartup +│ } +│ - if(tId.txt=="cardThermo") +│ + if(tId.txt=="popupNotify") +│ { +│ - page cardThermo +│ + page popupNotify +│ } +│ if(tId.txt=="cardMedia") +│ { +│ page cardMedia +│ } +│ + if(tId.txt=="cardGrid") +│ + { +│ + page cardGrid +│ + } +│ if(tId.txt=="cardAlarm") +│ { +│ page cardAlarm +│ } +│ if(tId.txt=="cardQR") +│ { +│ page cardQR ├── screensaver.txt │ @@ -252,25 +252,25 @@ │ Attributes @@ -692,3 +757,73 @@ │ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 │ tDate.txt=pageIcons.vaDate.txt │ } +│ @@ -691,53 +689,48 @@ +│ 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 +│ + udelete u[2]+3 +│ bufferPos=0 +│ - if(tId.txt=="pageStartup") +│ - { +│ - page pageStartup +│ - } +│ - if(tId.txt=="screensaver") +│ + if(tId.txt=="popupLight") +│ { +│ - page screensaver +│ + pageIcons.tTmp1.txt=tTmp.txt +│ + page popupLight +│ } +│ - if(tId.txt=="cardEntities") +│ + if(tId.txt=="pageStartup") +│ { +│ - page cardEntities +│ + page pageStartup +│ } +│ - if(tId.txt=="cardGrid") +│ + if(tId.txt=="cardThermo") +│ { +│ - page cardGrid +│ + page cardThermo +│ } +│ - if(tId.txt=="popupLight") +│ + if(tId.txt=="cardMedia") +│ { +│ - pageIcons.tTmp1.txt=tTmp.txt +│ - page popupLight +│ + page cardMedia +│ } +│ - if(tId.txt=="popupShutter") +│ + if(tId.txt=="pageStartup") +│ { +│ - pageIcons.tTmp1.txt=tTmp.txt +│ - page popupShutter +│ + page pageStartup +│ } +│ if(tId.txt=="popupNotify") +│ { +│ page popupNotify +│ } +│ - if(tId.txt=="cardThermo") +│ + if(tId.txt=="cardGrid") +│ { +│ - page cardThermo +│ + page cardGrid +│ } +│ - if(tId.txt=="cardMedia") +│ + if(tId.txt=="cardEntities") +│ { +│ - page cardMedia +│ + page cardEntities +│ } +│ if(tId.txt=="cardAlarm") +│ { +│ page cardAlarm +│ } +│ if(tId.txt=="cardQR") +│ { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 1f745887..efa5d6a3 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,69 @@ -+++ /dev/fd/62 2022-11-16 18:40:01.549752158 +0000 ++++ /dev/fd/62 2022-11-16 20:36:36.855049949 +0000 ++52 +306,47 @@ ++ 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") ++ if(tId.txt=="cardThermo") ++ { ++ page pageStartup ++ page cardThermo ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++ } ++ if(tId.txt=="popupLight") ++ { ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight ++ } ++ if(tId.txt=="popupShutter") ++ if(tId.txt=="cardEntities") ++ { ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupShutter ++ page cardEntities ++ } ++ if(tId.txt=="popupNotify") ++ if(tId.txt=="pageStartup") ++ { ++ page popupNotify ++ page pageStartup ++ } ++ if(tId.txt=="cardThermo") ++ if(tId.txt=="popupNotify") ++ { ++ page cardThermo ++ page popupNotify ++ } ++ if(tId.txt=="cardMedia") ++ { ++ page cardMedia ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++ } ++ if(tId.txt=="cardAlarm") ++ { ++ page cardAlarm ++ } ++ if(tId.txt=="cardQR") ++ { ++ page cardQR +reensaver.txt +25 +252,25 @@ +ributes @@ -45,3 +110,73 @@ + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + tDate.txt=pageIcons.vaDate.txt + } ++53 +689,48 @@ ++ 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 ++ udelete u[2]+3 ++ bufferPos=0 ++ if(tId.txt=="pageStartup") ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ if(tId.txt=="popupLight") ++ { ++ page screensaver ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight ++ } ++ if(tId.txt=="cardEntities") ++ if(tId.txt=="pageStartup") ++ { ++ page cardEntities ++ page pageStartup ++ } ++ if(tId.txt=="cardGrid") ++ if(tId.txt=="cardThermo") ++ { ++ page cardGrid ++ page cardThermo ++ } ++ if(tId.txt=="popupLight") ++ if(tId.txt=="cardMedia") ++ { ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight ++ page cardMedia ++ } ++ if(tId.txt=="popupShutter") ++ if(tId.txt=="pageStartup") ++ { ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupShutter ++ page pageStartup ++ } ++ if(tId.txt=="popupNotify") ++ { ++ page popupNotify ++ } ++ if(tId.txt=="cardThermo") ++ if(tId.txt=="cardGrid") ++ { ++ page cardThermo ++ page cardGrid ++ } ++ if(tId.txt=="cardMedia") ++ if(tId.txt=="cardEntities") ++ { ++ page cardMedia ++ page cardEntities ++ } ++ if(tId.txt=="cardAlarm") ++ { ++ page cardAlarm ++ } ++ if(tId.txt=="cardQR") ++ { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 377812d0..6837b9ad 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,10 +14,6 @@ popupLight 28 Component(s) 404 Line(s) of event code 223 Unique line(s) of event code -pageStartup - 19 Component(s) - 172 Line(s) of event code - 125 Unique line(s) of event code popupNotify 19 Component(s) 253 Line(s) of event code @@ -26,6 +22,10 @@ pageTest 21 Component(s) 66 Line(s) of event code 63 Unique line(s) of event code +pageStartup + 19 Component(s) + 177 Line(s) of event code + 127 Unique line(s) of event code cardQR 32 Component(s) 421 Line(s) of event code @@ -36,8 +36,8 @@ cardGrid 286 Unique line(s) of event code screensaver 45 Component(s) - 391 Line(s) of event code - 290 Unique line(s) of event code + 396 Line(s) of event code + 294 Unique line(s) of event code cardMedia 34 Component(s) 406 Line(s) of event code @@ -74,5 +74,5 @@ cardEntities Total 17 Page(s) 578 Component(s) - 7048 Line(s) of event code - 1818 Unique line(s) of event code + 7058 Line(s) of event code + 1817 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 81623aa9..18a2dff0 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -605,39 +605,44 @@ Timer tmSerial //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") + if(tId.txt=="pageStartup") { - page cardThermo + page pageStartup } if(tId.txt=="screensaver") { page screensaver } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="cardEntities") + if(tId.txt=="popupShutter") { - page cardEntities - } - if(tId.txt=="pageStartup") - { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } + if(tId.txt=="cardThermo") + { + page cardThermo + } if(tId.txt=="cardMedia") { page cardMedia } - if(tId.txt=="cardGrid") - { - page cardGrid - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 5e706d87..f5e88712 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1267,16 +1267,37 @@ Timer tmSerial 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 + udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="pageStartup") + if(tId.txt=="popupShutter") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify } if(tId.txt=="cardThermo") { @@ -1286,22 +1307,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="cardEntities") - { - page cardEntities - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index fa96fe1b..906b9c7a 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -310,39 +310,44 @@ Timer tmSerial //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") + if(tId.txt=="pageStartup") { - page cardThermo + page pageStartup } if(tId.txt=="screensaver") { page screensaver } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="cardEntities") + if(tId.txt=="popupShutter") { - page cardEntities - } - if(tId.txt=="pageStartup") - { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter } if(tId.txt=="popupNotify") { page popupNotify } + if(tId.txt=="cardThermo") + { + page cardThermo + } if(tId.txt=="cardMedia") { page cardMedia } - if(tId.txt=="cardGrid") - { - page cardGrid - } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 879b7135..7a1cc9f8 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -695,16 +695,37 @@ Timer tmSerial 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 + udelete payloadLength-1 bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt page popupLight } - if(tId.txt=="pageStartup") + if(tId.txt=="popupShutter") { - page pageStartup + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify } if(tId.txt=="cardThermo") { @@ -714,22 +735,6 @@ Timer tmSerial { page cardMedia } - if(tId.txt=="pageStartup") - { - page pageStartup - } - if(tId.txt=="popupNotify") - { - page popupNotify - } - if(tId.txt=="cardGrid") - { - page cardGrid - } - if(tId.txt=="cardEntities") - { - page cardEntities - } if(tId.txt=="cardAlarm") { page cardAlarm