implemented cardGrid with 8 icons #898 (add nextion2text)

This commit is contained in:
joBr99
2023-05-20 12:10:25 +00:00
committed by github-actions[bot]
parent 3d9861b2a5
commit 064ed0c50e
44 changed files with 13699 additions and 9852 deletions

View File

@@ -1,5 +1,20 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
├── file list
│ @@ -1,13 +1,12 @@
│ Program.s.txt
│ cardAlarm.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ -cardGrid2.txt
│ cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ cardQR.txt
│ cardThermo.txt
│ pageIcons.txt
│ pageStartup.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -11,10 +11,10 @@
@@ -14,8 +29,214 @@
│ + //lcd_dev fffb 0002 0000 0020
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
│ @@ -885,18 +885,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/landscape/n2t-out/cardChart.txt
│ @@ -637,18 +637,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -1845,18 +1845,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -858,18 +858,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardLChart.txt
├── +++ HMI/US/landscape/n2t-out/cardLChart.txt
│ @@ -619,18 +619,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/landscape/n2t-out/cardMedia.txt
│ @@ -1141,18 +1141,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -918,18 +918,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -663,18 +663,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/landscape/n2t-out/cardThermo.txt
│ @@ -1047,18 +1047,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -141,15 +141,15 @@
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ - Text : 51
│ + Text : 50
│ Max. Text Size : 10
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -164,15 +164,15 @@
│ Max. Text Size : 10
@@ -33,6 +254,172 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -316,18 +316,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/landscape/n2t-out/popupFan.txt
│ @@ -570,18 +570,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/landscape/n2t-out/popupInSel.txt
│ @@ -925,18 +925,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/landscape/n2t-out/popupLight.txt
│ @@ -600,18 +600,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -397,18 +397,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupShutter.txt
├── +++ HMI/US/landscape/n2t-out/popupShutter.txt
│ @@ -621,18 +621,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/landscape/n2t-out/popupThermo.txt
│ @@ -888,18 +888,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupTimer.txt
├── +++ HMI/US/landscape/n2t-out/popupTimer.txt
│ @@ -857,18 +857,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@
@@ -88,6 +475,25 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : |
│ @@ -736,18 +713,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@
@@ -159,3 +565,22 @@
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ @@ -782,18 +758,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {

View File

@@ -1,5 +1,20 @@
--- HMI/n2t-out
+++ HMI/US/portrait/n2t-out
├── file list
│ @@ -1,13 +1,12 @@
│ Program.s.txt
│ cardAlarm.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ -cardGrid2.txt
│ cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ cardQR.txt
│ cardThermo.txt
│ pageIcons.txt
│ pageStartup.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -10,11 +10,11 @@
@@ -16,6 +31,48 @@
│ + //lcd_dev fffb 0002 0000 0020
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt
│ @@ -885,18 +885,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/portrait/n2t-out/cardChart.txt
│ @@ -637,18 +637,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -60,16 +60,36 @@
@@ -1028,6 +1085,88 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -1845,18 +2605,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -858,18 +858,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardLChart.txt
├── +++ HMI/US/portrait/n2t-out/cardLChart.txt
│ @@ -619,18 +619,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
│ @@ -1141,18 +1141,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -45,16 +45,16 @@
@@ -1355,6 +1494,67 @@
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ @@ -918,18 +894,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -663,18 +663,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/portrait/n2t-out/cardThermo.txt
│ @@ -1047,18 +1047,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -34,20 +34,14 @@
@@ -1395,23 +1595,6 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ @@ -141,15 +135,15 @@
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ - Text : 50
│ + Text : 51
│ Max. Text Size : 10
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -164,15 +158,15 @@
│ Max. Text Size : 10
@@ -1429,6 +1612,172 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -316,18 +310,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/portrait/n2t-out/popupFan.txt
│ @@ -570,18 +570,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/portrait/n2t-out/popupInSel.txt
│ @@ -925,18 +925,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -600,18 +600,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -397,18 +397,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupShutter.txt
├── +++ HMI/US/portrait/n2t-out/popupShutter.txt
│ @@ -621,18 +621,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/portrait/n2t-out/popupThermo.txt
│ @@ -888,18 +888,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/popupTimer.txt
├── +++ HMI/US/portrait/n2t-out/popupTimer.txt
│ @@ -857,18 +857,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@
@@ -1505,6 +1854,25 @@
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ @@ -736,18 +707,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@
@@ -1576,3 +1944,22 @@
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ @@ -782,18 +758,14 @@
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ - if(tId.txt=="cardGrid2")
│ - {
│ - page cardGrid2
│ - }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ {

View File

@@ -1,8 +1,65 @@
+++ /dev/fd/62 2023-05-13 11:02:12.827868620 +0000
+++ /dev/fd/62 2023-05-20 12:10:14.509403406 +0000
+le list
+ +1,12 @@
+.s.txt
+rm.txt
+rt.txt
+ities.txt
+d.txt
+d2.txt
+art.txt
+ia.txt
+er.txt
+txt
+rmo.txt
+ns.txt
+rtup.txt
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@
+nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
+I/n2t-out/cardAlarm.txt
++ HMI/US/portrait/n2t-out/cardAlarm.txt
+18 +885,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardChart.txt
++ HMI/US/portrait/n2t-out/cardChart.txt
+18 +637,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt
+6 +60,36 @@
@@ -57,13 +114,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+14 +185,26 @@
+e (string) type6
@@ -586,6 +643,88 @@
+ covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0
+ }
+,18 +2605,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt
+18 +858,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardLChart.txt
++ HMI/US/portrait/n2t-out/cardLChart.txt
+18 +619,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardMedia.txt
++ HMI/US/portrait/n2t-out/cardMedia.txt
+,18 +1141,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt
+6 +45,16 @@
@@ -913,6 +1052,67 @@
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+18 +894,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+18 +663,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/cardThermo.txt
++ HMI/US/portrait/n2t-out/cardThermo.txt
+,18 +1047,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +34,14 @@
@@ -948,25 +1148,174 @@
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+15 +135,15 @@
+
+ersion
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : 50
+ Text : 51
+ Max. Text Size : 10
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+15 +158,15 @@
+ Max. Text Size : 10
+18 +310,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/popupFan.txt
++ HMI/US/portrait/n2t-out/popupFan.txt
+18 +570,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/popupInSel.txt
++ HMI/US/portrait/n2t-out/popupInSel.txt
+18 +925,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt
+18 +600,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt
+18 +397,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/popupShutter.txt
++ HMI/US/portrait/n2t-out/popupShutter.txt
+18 +621,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/popupThermo.txt
++ HMI/US/portrait/n2t-out/popupThermo.txt
+18 +888,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/popupTimer.txt
++ HMI/US/portrait/n2t-out/popupTimer.txt
+18 +857,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +28,14 @@
@@ -1043,6 +1392,25 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco)
+18 +707,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {
+I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt
+7 +28,14 @@
@@ -1114,3 +1482,22 @@
+ if(tAMPM.txt=="")
+ {
+ vis tAMPM,0
+18 +758,14 @@
+ {
+ page cardEntities
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+ {