From 7f14e9d205b8bf46a3cd34c90d76d9e52fba398a Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Thu, 2 Feb 2023 19:03:31 +0000 Subject: [PATCH] added alternative screensaver (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 239 +++- HMI/US/portrait/diff-eu-version.txt | 235 ++++ HMI/US/portrait/diff-filtered.txt | 239 +++- HMI/n2t-out-visual/cardAlarm.txt | 4 + HMI/n2t-out-visual/cardChart.txt | 4 + HMI/n2t-out-visual/cardEntities.txt | 4 + HMI/n2t-out-visual/cardGrid.txt | 4 + HMI/n2t-out-visual/cardLChart.txt | 4 + HMI/n2t-out-visual/cardMedia.txt | 4 + HMI/n2t-out-visual/cardPower.txt | 4 + HMI/n2t-out-visual/cardQR.txt | 4 + HMI/n2t-out-visual/cardThermo.txt | 4 + HMI/n2t-out-visual/nspanel_Stats.txt | 86 +- HMI/n2t-out-visual/pageStartup.txt | 4 + HMI/n2t-out-visual/screensaver.txt | 4 + HMI/n2t-out-visual/screensaver2.txt | 1838 ++++++++++++++++++++++++++ HMI/n2t-out/cardAlarm.txt | 4 + HMI/n2t-out/cardChart.txt | 4 + HMI/n2t-out/cardEntities.txt | 4 + HMI/n2t-out/cardGrid.txt | 4 + HMI/n2t-out/cardLChart.txt | 4 + HMI/n2t-out/cardMedia.txt | 4 + HMI/n2t-out/cardPower.txt | 4 + HMI/n2t-out/cardQR.txt | 4 + HMI/n2t-out/cardThermo.txt | 4 + HMI/n2t-out/pageStartup.txt | 4 + HMI/n2t-out/screensaver.txt | 4 + HMI/n2t-out/screensaver2.txt | 1003 ++++++++++++++ 28 files changed, 3684 insertions(+), 44 deletions(-) create mode 100644 HMI/n2t-out-visual/screensaver2.txt create mode 100644 HMI/n2t-out/screensaver2.txt diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3db893a0..af57314f 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,5 +1,143 @@ --- HMI/n2t-out +++ HMI/US/landscape/n2t-out +├── file list +│ @@ -14,9 +14,8 @@ +│ popupFan.txt +│ popupInSel.txt +│ popupLight.txt +│ popupNotify.txt +│ popupShutter.txt +│ popupThermo.txt +│ popupTimer.txt +│ -screensaver.txt +│ -screensaver2.txt +│ +screensaver.txt +│ --- HMI/n2t-out/cardAlarm.txt +├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt +│ @@ -902,18 +902,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/landscape/n2t-out/cardChart.txt +│ @@ -635,18 +635,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardEntities.txt +├── +++ HMI/US/landscape/n2t-out/cardEntities.txt +│ @@ -1885,18 +1885,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/landscape/n2t-out/cardGrid.txt +│ @@ -870,18 +870,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardLChart.txt +├── +++ HMI/US/landscape/n2t-out/cardLChart.txt +│ @@ -616,18 +616,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/landscape/n2t-out/cardMedia.txt +│ @@ -1154,18 +1154,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/landscape/n2t-out/cardPower.txt │ @@ -35,27 +35,27 @@ @@ -536,7 +674,26 @@ │ vis h5,1 │ }else │ { -│ @@ -965,14 +891,18 @@ +│ @@ -919,18 +845,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ @@ -969,14 +891,18 @@ │ { │ page cardPower │ } @@ -555,6 +712,48 @@ │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } │ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/landscape/n2t-out/cardQR.txt +│ @@ -669,18 +669,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardThermo.txt +├── +++ HMI/US/landscape/n2t-out/cardThermo.txt +│ @@ -1071,18 +1071,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -179,15 +179,15 @@ @@ -574,6 +773,25 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -320,18 +320,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -29,17 +29,14 @@ @@ -647,3 +865,22 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 +│ @@ -745,18 +721,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2212d4d7..81d8e5da 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,5 +1,17 @@ --- HMI/n2t-out +++ HMI/US/portrait/n2t-out +├── file list +│ @@ -14,9 +14,8 @@ +│ popupFan.txt +│ popupInSel.txt +│ popupLight.txt +│ popupNotify.txt +│ popupShutter.txt +│ popupThermo.txt +│ popupTimer.txt +│ -screensaver.txt +│ -screensaver2.txt +│ +screensaver.txt │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt │ @@ -10,10 +10,10 @@ @@ -15,6 +27,48 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup +│ --- HMI/n2t-out/cardAlarm.txt +├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt +│ @@ -902,18 +902,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/portrait/n2t-out/cardChart.txt +│ @@ -635,18 +635,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt │ @@ -61,16 +61,36 @@ @@ -1047,6 +1101,88 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 +│ @@ -1885,18 +2665,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/portrait/n2t-out/cardGrid.txt +│ @@ -870,18 +870,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardLChart.txt +├── +++ HMI/US/portrait/n2t-out/cardLChart.txt +│ @@ -616,18 +616,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/portrait/n2t-out/cardMedia.txt +│ @@ -1154,18 +1154,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardPower.txt │ @@ -35,27 +35,27 @@ @@ -1400,6 +1536,67 @@ │ Scope : local │ Period (ms): 50 │ Enabled : yes +│ @@ -919,18 +889,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/portrait/n2t-out/cardQR.txt +│ @@ -669,18 +669,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ --- HMI/n2t-out/cardThermo.txt +├── +++ HMI/US/portrait/n2t-out/cardThermo.txt +│ @@ -1071,18 +1071,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -35,20 +35,14 @@ @@ -1457,6 +1654,25 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -320,18 +314,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -29,17 +29,14 @@ @@ -1530,3 +1746,22 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 +│ @@ -745,18 +721,14 @@ +│ { +│ page pageStartup +│ } +│ if(tId.txt=="screensaver") +│ { +│ page screensaver +│ } +│ - if(tId.txt=="screensaver2") +│ - { +│ - page screensaver2 +│ - } +│ if(tId.txt=="cardEntities") +│ { +│ page cardEntities +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 870e2b56..2774c6fa 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,6 +1,60 @@ -+++ /dev/fd/62 2023-02-01 21:52:45.071014440 +0000 ++++ /dev/fd/62 2023-02-02 19:03:22.647127423 +0000 ++le list ++ +14,8 @@ ++n.txt ++Sel.txt ++ght.txt ++tify.txt ++utter.txt ++ermo.txt ++mer.txt ++aver.txt ++aver2.txt ++aver.txt +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt ++I/n2t-out/cardAlarm.txt +++ HMI/US/portrait/n2t-out/cardAlarm.txt ++18 +902,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++I/n2t-out/cardChart.txt +++ HMI/US/portrait/n2t-out/cardChart.txt ++18 +635,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt +6 +61,36 @@ @@ -54,13 +108,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 +186,26 @@ +e (string) type6 @@ -466,6 +520,88 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } ++,18 +2665,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++I/n2t-out/cardGrid.txt +++ HMI/US/portrait/n2t-out/cardGrid.txt ++18 +870,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++I/n2t-out/cardLChart.txt +++ HMI/US/portrait/n2t-out/cardLChart.txt ++18 +616,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++I/n2t-out/cardMedia.txt +++ HMI/US/portrait/n2t-out/cardMedia.txt ++,18 +1154,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid +I/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt +7 +35,27 @@ @@ -819,6 +955,67 @@ + Scope : local + Period (ms): 50 + Enabled : yes ++18 +889,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++I/n2t-out/cardQR.txt +++ HMI/US/portrait/n2t-out/cardQR.txt ++18 +669,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++I/n2t-out/cardThermo.txt +++ HMI/US/portrait/n2t-out/cardThermo.txt ++,18 +1071,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt +0 +35,14 @@ @@ -842,6 +1039,25 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++18 +314,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +7 +29,14 @@ @@ -915,3 +1131,22 @@ + if(tAMPM.txt=="") + { + vis tAMPM,0 ++18 +721,14 @@ ++ { ++ page pageStartup ++ } ++ if(tId.txt=="screensaver") ++ { ++ page screensaver ++ } ++ if(tId.txt=="screensaver2") ++ { ++ page screensaver2 ++ } ++ if(tId.txt=="cardEntities") ++ { ++ page cardEntities ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 5ec88385..3958dfb2 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1511,6 +1511,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardChart.txt b/HMI/n2t-out-visual/cardChart.txt index 2c067d70..e799bd75 100644 --- a/HMI/n2t-out-visual/cardChart.txt +++ b/HMI/n2t-out-visual/cardChart.txt @@ -801,6 +801,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 8f96c3e3..95e78c0a 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2844,6 +2844,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index a59be816..263c77bc 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1322,6 +1322,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardLChart.txt b/HMI/n2t-out-visual/cardLChart.txt index fb621733..5d24af05 100644 --- a/HMI/n2t-out-visual/cardLChart.txt +++ b/HMI/n2t-out-visual/cardLChart.txt @@ -760,6 +760,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 99b5dbf2..c84f1fbc 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1646,6 +1646,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index 21165a88..ef14a160 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -1611,6 +1611,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 5296287a..c50d2eb3 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -974,6 +974,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 69ccd272..e1304a35 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1799,6 +1799,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 7fbc3421..ef8a86ee 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,38 +14,42 @@ popupNotify 19 Component(s) 257 Line(s) of event code 166 Unique line(s) of event code -cardQR - 34 Component(s) - 402 Line(s) of event code - 234 Unique line(s) of event code -pageStartup - 20 Component(s) - 185 Line(s) of event code - 131 Unique line(s) of event code cardChart 33 Component(s) - 429 Line(s) of event code - 292 Unique line(s) of event code + 433 Line(s) of event code + 294 Unique line(s) of event code +cardLChart + 33 Component(s) + 398 Line(s) of event code + 264 Unique line(s) of event code +pageStartup + 20 Component(s) + 189 Line(s) of event code + 133 Unique line(s) of event code pageTest 26 Component(s) 68 Line(s) of event code 66 Unique line(s) of event code -screensaver - 47 Component(s) - 428 Line(s) of event code - 306 Unique line(s) of event code +cardMedia + 59 Component(s) + 645 Line(s) of event code + 320 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code +cardQR + 34 Component(s) + 406 Line(s) of event code + 236 Unique line(s) of event code +cardGrid + 44 Component(s) + 519 Line(s) of event code + 293 Unique line(s) of event code cardAlarm 43 Component(s) - 492 Line(s) of event code - 269 Unique line(s) of event code -cardLChart - 33 Component(s) - 394 Line(s) of event code - 262 Unique line(s) of event code + 496 Line(s) of event code + 271 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -58,33 +62,33 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 Unique line(s) of event code -cardMedia +cardThermo + 57 Component(s) + 536 Line(s) of event code + 317 Unique line(s) of event code +screensaver2 59 Component(s) - 641 Line(s) of event code - 318 Unique line(s) of event code -cardPower - 54 Component(s) - 495 Line(s) of event code - 336 Unique line(s) of event code + 354 Line(s) of event code + 251 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code -cardGrid - 44 Component(s) - 515 Line(s) of event code - 291 Unique line(s) of event code -cardThermo - 57 Component(s) - 532 Line(s) of event code - 315 Unique line(s) of event code +screensaver + 47 Component(s) + 432 Line(s) of event code + 308 Unique line(s) of event code +cardPower + 54 Component(s) + 499 Line(s) of event code + 338 Unique line(s) of event code cardEntities 67 Component(s) - 1162 Line(s) of event code - 528 Unique line(s) of event code + 1166 Line(s) of event code + 530 Unique line(s) of event code Total - 20 Page(s) - 743 Component(s) - 8818 Line(s) of event code - 2279 Unique line(s) of event code + 21 Page(s) + 802 Component(s) + 9216 Line(s) of event code + 2331 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index a0acb82d..89a8a96b 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -620,6 +620,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index b2f8bc62..9307e0b5 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1342,6 +1342,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt new file mode 100644 index 00000000..cc0b252e --- /dev/null +++ b/HMI/n2t-out-visual/screensaver2.txt @@ -0,0 +1,1838 @@ +Page screensaver2 + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 0 + + Events + Preinitialize Event + recmod=1 + baud=115200 + vis tInstruction,0 + vis tTmp,0 + vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 + } + tDate.txt=pageIcons.vaDate.txt + dim=dimValue + vis tSend,0 + //page open event + // clear weather elements, to keep example content in HMI + + Postinitialize Event + click m0,1 + +Variable (string) strCommand + Attributes + ID : 4 + Scope : local + Text : + Max. Text Size: 1979 + +Variable (string) strTmp + Attributes + ID : 31 + Scope : local + Text : + Max. Text Size: 2 + +Variable (string) tId + Attributes + ID : 12 + Scope : local + Text : + Max. Text Size: 25 + +Variable (string) tInstruction + Attributes + ID : 18 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + ID : 20 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tTmp + Attributes + ID : 19 + Scope : local + Text : + Max. Text Size: 50 + +Variable (int32) vaTap + Attributes + ID : 14 + Scope: local + Value: 0 + +Variable (int32) xc1 + Attributes + ID : 25 + Scope: local + Value: 0 + +Variable (int32) xc2 + Attributes + ID : 27 + Scope: local + Value: 0 + +Variable (int32) xcR + Attributes + ID : 30 + Scope: local + Value: 0 + +Variable (int32) yc1 + Attributes + ID : 26 + Scope: local + Value: 0 + +Variable (int32) yc2 + Attributes + ID : 28 + Scope: local + Value: 0 + +Variable (int32) ycR + Attributes + ID : 29 + Scope: local + Value: 0 + +Text d1Icon + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 15 + y coordinate : 85 + Width : 30 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text d1Val + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 50 + y coordinate : 85 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : XXXXXXX + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text d2Icon + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + y coordinate : 117 + Width : 30 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text d2Val + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 50 + y coordinate : 118 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : XXXXXXX + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text d3Icon + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + y coordinate : 150 + Width : 30 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text d3Val + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 50 + y coordinate : 151 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : XXXXXXX + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e1Icon + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 20 + y coordinate : 221 + Width : 40 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e1Name + Attributes + ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 5 + y coordinate : 198 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e1Val + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 5 + y coordinate : 254 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e2Icon + Attributes + ID : 38 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 94 + y coordinate : 221 + Width : 40 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e2Name + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 78 + y coordinate : 198 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e2Val + Attributes + ID : 39 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 79 + y coordinate : 254 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e3Icon + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 168 + y coordinate : 221 + Width : 40 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e3Name + Attributes + ID : 40 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 153 + y coordinate : 198 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e3Val + Attributes + ID : 42 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 153 + y coordinate : 254 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e4Icon + Attributes + ID : 44 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 245 + y coordinate : 221 + Width : 40 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e4Name + Attributes + ID : 43 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 230 + y coordinate : 198 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e4Val + Attributes + ID : 45 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 230 + y coordinate : 254 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e5Icon + Attributes + ID : 47 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 319 + y coordinate : 221 + Width : 40 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e5Name + Attributes + ID : 46 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 304 + y coordinate : 198 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e5Val + Attributes + ID : 48 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 304 + y coordinate : 254 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e6Icon + Attributes + ID : 50 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 392 + y coordinate : 221 + Width : 40 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e6Name + Attributes + ID : 49 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 377 + y coordinate : 198 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text e6Val + Attributes + ID : 51 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 377 + y coordinate : 254 + Width : 70 + Height : 20 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text f1Icon + Attributes + ID : 56 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 168 + y coordinate : 125 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text f2Icon + Attributes + ID : 54 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 224 + y coordinate : 125 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text f3Icon + Attributes + ID : 55 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 280 + y coordinate : 125 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text f4Icon + Attributes + ID : 53 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 336 + y coordinate : 125 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text f5Icon + Attributes + ID : 52 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 392 + y coordinate : 125 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : X + Max. Text Size : 4 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text m0 + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 463 + y coordinate : 0 + Width : 17 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 63488 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tTmp.txt="change model conf to us-l/p " + strlen tTmp.txt,sys1 + sya1=sys1*11+m0.h-48/2 + for(sys0=0;sys01) + { + bufferPos=0 + while(bufferPos-125&&xcR.val<125) + { + //tStatusNew.txt="x low, -> y" + // check if below minimum value (change is negative) + if(ycR.val<-80) + { + //tDirNew.txt="down" + tSend.txt="event,buttonPress2,screensaver,swipeDown" + }else if(ycR.val>80) + { + //tDirNew.txt="up" + tSend.txt="event,buttonPress2,screensaver,swipeUp" + }else + { + //tDirNew.txt="invalid" + } + // y difference between -125 and 125 (swipe on x-axis) + }else if(ycR.val>-125&&ycR.val<125) + { + //tStatusNew.txt="y low, -> x" + if(xcR.val<-80) + { + //tDirNew.txt="right" + tSend.txt="event,buttonPress2,screensaver,swipeRight" + }else if(xcR.val>80) + { + //tDirNew.txt="left" + tSend.txt="event,buttonPress2,screensaver,swipeLeft" + }else + { + //tDirNew.txt="invalid" + } + //diagonal swipe invalid + }else + { + //tStatusNew.txt="invalid" + //tDirNew.txt="diagonal" + } + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index ad6e33cb..35afa004 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -906,6 +906,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardChart.txt b/HMI/n2t-out/cardChart.txt index 7fd94478..79eafcbd 100644 --- a/HMI/n2t-out/cardChart.txt +++ b/HMI/n2t-out/cardChart.txt @@ -639,6 +639,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 05517a76..fb0ae315 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1889,6 +1889,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index f9b70050..115291d7 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -874,6 +874,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardLChart.txt b/HMI/n2t-out/cardLChart.txt index a445407e..e3684ba7 100644 --- a/HMI/n2t-out/cardLChart.txt +++ b/HMI/n2t-out/cardLChart.txt @@ -620,6 +620,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 6db7cb92..1bdbba61 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -1158,6 +1158,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index d07b2e3a..c74cb351 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -923,6 +923,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 7855710f..e7e72c41 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -673,6 +673,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 82159dd1..4d66237a 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -1075,6 +1075,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index de3f239f..63b02ddd 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -324,6 +324,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 3755953e..2d60daca 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -749,6 +749,10 @@ Timer tmSerial { page screensaver } + if(tId.txt=="screensaver2") + { + page screensaver2 + } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/screensaver2.txt b/HMI/n2t-out/screensaver2.txt new file mode 100644 index 00000000..ead2fa44 --- /dev/null +++ b/HMI/n2t-out/screensaver2.txt @@ -0,0 +1,1003 @@ +Page screensaver2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + + Events + Preinitialize Event + recmod=1 + baud=115200 + vis tInstruction,0 + vis tTmp,0 + vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 + } + tDate.txt=pageIcons.vaDate.txt + dim=dimValue + vis tSend,0 + //page open event + // clear weather elements, to keep example content in HMI + + Postinitialize Event + click m0,1 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 1979 + +Variable (string) strTmp + Attributes + Scope : local + Text : + Max. Text Size: 2 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 25 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (int32) vaTap + Attributes + Scope: local + Value: 0 + +Variable (int32) xc1 + Attributes + Scope: local + Value: 0 + +Variable (int32) xc2 + Attributes + Scope: local + Value: 0 + +Variable (int32) xcR + Attributes + Scope: local + Value: 0 + +Variable (int32) yc1 + Attributes + Scope: local + Value: 0 + +Variable (int32) yc2 + Attributes + Scope: local + Value: 0 + +Variable (int32) ycR + Attributes + Scope: local + Value: 0 + +Text d1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text d1Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : XXXXXXX + Max. Text Size : 10 + +Text d2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text d2Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : XXXXXXX + Max. Text Size : 10 + +Text d3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text d3Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : XXXXXXX + Max. Text Size : 10 + +Text e1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e1Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e1Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e2Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e2Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e3Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e3Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e4Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e4Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e4Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e5Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e5Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e5Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e6Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e6Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e6Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text f1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text f2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text f3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text f4Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text f5Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X + Max. Text Size : 4 + +Text m0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tTmp.txt="change model conf to us-l/p " + strlen tTmp.txt,sys1 + sya1=sys1*11+m0.h-48/2 + for(sys0=0;sys01) + { + bufferPos=0 + while(bufferPos-125&&xcR.val<125) + { + //tStatusNew.txt="x low, -> y" + // check if below minimum value (change is negative) + if(ycR.val<-80) + { + //tDirNew.txt="down" + tSend.txt="event,buttonPress2,screensaver,swipeDown" + }else if(ycR.val>80) + { + //tDirNew.txt="up" + tSend.txt="event,buttonPress2,screensaver,swipeUp" + }else + { + //tDirNew.txt="invalid" + } + // y difference between -125 and 125 (swipe on x-axis) + }else if(ycR.val>-125&&ycR.val<125) + { + //tStatusNew.txt="y low, -> x" + if(xcR.val<-80) + { + //tDirNew.txt="right" + tSend.txt="event,buttonPress2,screensaver,swipeRight" + }else if(xcR.val>80) + { + //tDirNew.txt="left" + tSend.txt="event,buttonPress2,screensaver,swipeLeft" + }else + { + //tDirNew.txt="invalid" + } + //diagonal swipe invalid + }else + { + //tStatusNew.txt="invalid" + //tDirNew.txt="diagonal" + } + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 +