From f30cacf510f5276d365591a3d2afa4d46b242334 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Tue, 10 Jan 2023 22:38:21 +0000 Subject: [PATCH] add cardlchart (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 221 +++++++ HMI/US/portrait/diff-eu-version.txt | 219 +++++++ HMI/US/portrait/diff-filtered.txt | 223 ++++++- 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 | 872 +++++++++++++++++++++++++++ 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 | 80 +-- HMI/n2t-out-visual/pageStartup.txt | 4 + HMI/n2t-out-visual/pageTest.txt | 110 +++- HMI/n2t-out-visual/screensaver.txt | 4 + 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 | 732 ++++++++++++++++++++++ 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/pageTest.txt | 40 +- HMI/n2t-out/screensaver.txt | 4 + 28 files changed, 2533 insertions(+), 44 deletions(-) create mode 100644 HMI/n2t-out-visual/cardLChart.txt create mode 100644 HMI/n2t-out/cardLChart.txt diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 41502c67..41ab9e4d 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -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 +│ -cardLChart.txt +│ cardMedia.txt +│ cardPower.txt +│ cardQR.txt +│ cardThermo.txt +│ pageIcons.txt +│ pageStartup.txt +│ pageTest.txt │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/landscape/n2t-out/Program.s.txt │ @@ -10,10 +10,8 @@ @@ -13,6 +28,174 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ page pageStartup +│ --- HMI/n2t-out/cardAlarm.txt +├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt +│ @@ -864,18 +864,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/landscape/n2t-out/cardChart.txt +│ @@ -681,18 +681,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +│ --- HMI/n2t-out/cardEntities.txt +├── +++ HMI/US/landscape/n2t-out/cardEntities.txt +│ @@ -1931,18 +1931,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/landscape/n2t-out/cardGrid.txt +│ @@ -916,18 +916,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/landscape/n2t-out/cardMedia.txt +│ @@ -1200,18 +1200,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardPower.txt +├── +++ HMI/US/landscape/n2t-out/cardPower.txt +│ @@ -785,18 +785,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/landscape/n2t-out/cardQR.txt +│ @@ -715,18 +715,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +│ --- HMI/n2t-out/cardThermo.txt +├── +++ HMI/US/landscape/n2t-out/cardThermo.txt +│ @@ -1117,18 +1117,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ @@ -32,6 +215,25 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -360,18 +360,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -29,17 +29,14 @@ @@ -77,3 +279,22 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -797,18 +784,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0c48fba1..e0a3319c 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -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 +│ -cardLChart.txt +│ cardMedia.txt +│ cardPower.txt +│ cardQR.txt +│ cardThermo.txt +│ pageIcons.txt +│ pageStartup.txt +│ pageTest.txt │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt │ @@ -10,10 +10,10 @@ @@ -15,6 +30,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 +│ @@ -864,18 +864,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +│ --- HMI/n2t-out/cardChart.txt +├── +++ HMI/US/portrait/n2t-out/cardChart.txt +│ @@ -681,18 +681,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt │ @@ -61,14 +61,34 @@ @@ -1044,6 +1101,130 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 +│ @@ -1931,18 +2711,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/portrait/n2t-out/cardGrid.txt +│ @@ -916,18 +916,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardMedia.txt +├── +++ HMI/US/portrait/n2t-out/cardMedia.txt +│ @@ -1200,18 +1200,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardPower.txt +├── +++ HMI/US/portrait/n2t-out/cardPower.txt +│ @@ -785,18 +785,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") +│ --- HMI/n2t-out/cardQR.txt +├── +++ HMI/US/portrait/n2t-out/cardQR.txt +│ @@ -715,18 +715,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } +│ --- HMI/n2t-out/cardThermo.txt +├── +++ HMI/US/portrait/n2t-out/cardThermo.txt +│ @@ -1117,18 +1117,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -118,15 +118,15 @@ @@ -1080,6 +1261,25 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -360,18 +360,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -29,29 +29,20 @@ @@ -1137,3 +1337,22 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -797,18 +778,14 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ - if(tId.txt=="cardLChart") +│ - { +│ - page cardLChart +│ - } +│ } +│ // end of user code +│ udelete payloadLength-1 +│ bufferPos=0 +│ } +│ } +│ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 9ba65494..1edfed24 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,6 +1,63 @@ -+++ /dev/fd/62 2023-01-09 16:10:16.514100386 +0000 ++++ /dev/fd/62 2023-01-10 22:38:13.070258504 +0000 ++le list ++ +1,12 @@ ++.s.txt ++rm.txt ++rt.txt ++ities.txt ++d.txt ++art.txt ++ia.txt ++er.txt ++txt ++rmo.txt ++ns.txt ++rtup.txt ++t.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 +864,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++I/n2t-out/cardChart.txt +++ HMI/US/portrait/n2t-out/cardChart.txt ++18 +681,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt +4 +61,34 @@ @@ -51,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 @@ -463,8 +520,151 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } ++,18 +2711,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") ++I/n2t-out/cardGrid.txt +++ HMI/US/portrait/n2t-out/cardGrid.txt ++18 +916,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") ++I/n2t-out/cardMedia.txt +++ HMI/US/portrait/n2t-out/cardMedia.txt ++,18 +1200,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") ++I/n2t-out/cardPower.txt +++ HMI/US/portrait/n2t-out/cardPower.txt ++18 +785,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") ++I/n2t-out/cardQR.txt +++ HMI/US/portrait/n2t-out/cardQR.txt ++18 +715,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } ++I/n2t-out/cardThermo.txt +++ HMI/US/portrait/n2t-out/cardThermo.txt ++,18 +1117,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt ++18 +360,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +9 +29,20 @@ @@ -522,3 +722,22 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++18 +778,14 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ // end of user code ++ udelete payloadLength-1 ++ bufferPos=0 ++ } ++ } ++ } diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 6ee9c08e..e0a16bb9 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1453,6 +1453,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/cardChart.txt b/HMI/n2t-out-visual/cardChart.txt index 163b953f..2c067d70 100644 --- a/HMI/n2t-out-visual/cardChart.txt +++ b/HMI/n2t-out-visual/cardChart.txt @@ -847,6 +847,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 9319ec68..53134c11 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2890,6 +2890,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index a861aeaa..a59be816 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1368,6 +1368,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardLChart.txt b/HMI/n2t-out-visual/cardLChart.txt new file mode 100644 index 00000000..30ff9e02 --- /dev/null +++ b/HMI/n2t-out-visual/cardLChart.txt @@ -0,0 +1,872 @@ +Page cardLChart + 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 : 6371 + + Events + Preinitialize Event + dim=dimValueNormal + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + cardLChart.bco=defaultBcoColor + //vis x0,0 + //x0.bco=defaultBcoColor + //x0.borderc=defaultBcoColor + for(sys0=0;sys0<32;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==6371) + { + b[sys0].pic=1 + b[sys0].pic2=2 + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + +Variable (string) entn + Attributes + ID : 6 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) strCommand + Attributes + ID : 5 + Scope : local + Text : + Max. Text Size: 512 + +Variable (string) strTmp + Attributes + ID : 18 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tId + Attributes + ID : 14 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 15 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tSend + Attributes + ID : 9 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vNValues + Attributes + ID : 17 + Scope: local + Value: 0 + +Variable (int32) vaBottom + Attributes + ID : 22 + Scope: local + Value: 0 + +Variable (int32) vaColorD + Attributes + ID : 25 + Scope: local + Value: 0 + +Variable (int32) vaColorL + Attributes + ID : 24 + Scope: local + Value: 0 + +Variable (int32) vaLeft + Attributes + ID : 23 + Scope: local + Value: 0 + +Variable (int32) vaMaxX + Attributes + ID : 27 + Scope: local + Value: 2147483648 + +Variable (int32) vaMaxY + Attributes + ID : 26 + Scope: local + Value: 0 + +Variable (int32) vaMinX + Attributes + ID : 29 + Scope: local + Value: 2147483647 + +Variable (int32) vaMinY + Attributes + ID : 30 + Scope: local + Value: 2147483647 + +Variable (int32) vaValue + Attributes + ID : 21 + Scope: local + Value: 0 + +Variable (int32) vaXUnit + Attributes + ID : 20 + Scope: local + Value: 0 + +Variable (int32) vaYUnit + Attributes + ID : 28 + Scope: local + Value: 0 + +Text tHeading + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 66 + y coordinate : 26 + Width : 320 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Button bNext + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 391 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } + //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 + +Button bPrev + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //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 + +Hotspot m0 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 20 + y coordinate : 90 + Width : 410 + Height : 220 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + fill m0.x,m0.y,m0.w,m0.h,RED + +Hotspot mSwipeNext + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 440 + y coordinate : 5 + Width : 39 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipePrev + Attributes + ID : 12 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Hotspot mSwipeUp + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos>11 // red + vaColorD.val=sys0*8/10<<11 // store and shift + sys0=vaColorL.val>>5%64 // green + vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift + sys0=vaColorL.val%32 + vaColorD.val=sys0*8/10+vaColorD.val // store and add + // + // detect nValues and maxX/Y + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18 + strlen tTmp.txt,sya0 + while(sya0>0) + { + tHeading.txt="last value="+tTmp.txt + spstr tTmp.txt,strTmp.txt,":",0 + covx strTmp.txt,sya1,0,0 + if(sya1>vaMaxX.val) + { + vaMaxX.val=sya1 + } + if(sya1vaMaxY.val) + { + vaMaxY.val=sya1 + } + if(sya10) + { + covx strTmp.txt,sya1,0,0 + if(sya1>vaMinY.val) + { + sys0-- + if(sys0>=0) + { + // found a y-tick => take is at min... + spstr tTmp.txt,strTmp.txt,":",sys0 + covx strTmp.txt,vaMinY.val,0,0 + } + sya0=0 + }else + { + // next + sys0++ + spstr tTmp.txt,strTmp.txt,":",sys0 + strlen strTmp.txt,sya0 + } + } + sys1=sys0+1 // last label + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + while(sya0>0) + { + covx strTmp.txt,sya1,0,0 + if(sya1>=vaMaxY.val) + { + vaMaxY.val=sya1 + sya0=0 + }else + { + // next + sys1++ + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + } + } + // get first given x axis tick + spstr strCommand.txt,strTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt + covx strTmp.txt,vaMinX.val,0,0 + // covx vaMinX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt+":" + // covx vaMaxX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt + // calculate unit width + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + sya1=vaMaxX.val-vaMinX.val + vaXUnit.val=m0.w-25-40*100/sya1 + sya1=vaMaxY.val-vaMinY.val + vaYUnit.val=m0.h-24*100/sya1 + // draw labels + // labels still in tTmp.txt + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+5,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + if(sys0>0) + { + sys0-- + } + for(sya0=sys0;sya0<=sys1;sya0++) + { + spstr tTmp.txt,strTmp.txt,":",sya0 + covx strTmp.txt,sya1,0,0 + sys2=sya1%10 + sya1/=10 + if(sya1>0) + { + covx sya1,strTmp.txt,0,0 + }else + { + strTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + strTmp.txt=strTmp.txt+"."+tId.txt + } + sya1*=10+sys2 + sya1-=vaMinY.val + xstr m0.x+28,-1*vaYUnit.val*sya1/100+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,strTmp.txt + line m0.x+25+40-5,-1*vaYUnit.val*sya1/100+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sya1/100+vaBottom.val,14823 + } + // y achis label + spstr strCommand.txt,tTmp.txt,"~",15 + strlen tTmp.txt,sys1 + sya1=sys1*11+m0.h-48/2 + for(sys0=0;sys0 sya1 contains fist ticks value + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + // loop until current ticks label is smaller than the maximum value observed + while(sya0>0&&sya10) + { + // label found ~> draw + xstr -6*sya0+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + } + // next ~> sya1 contains next ticks label + sys1++ + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + } + // + // draw line segments... + sys1=-2147483648 + sys2=-2147483648 + for(sys0=0;sys00&&sys2>0) + { + // this is not the first point as the last one has been stored in (sys1,sys2) + // ~> connect with a line... + //line sys1,sys2,sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,vaColorD.val + line sys1,sys2,sya0,sya1,vaColorD.val + //line sys1-1,sys2-1,sya0-1,sya1-1,vaColorL.val + //line sys1+1,sys2+1,sya0+1,sya1+1,vaColorL.val + } + // store current point to (sys1,sys2) + //sys1=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40 + //sys2=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val + sys1=sya0 + sys2=sya1 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + sleepValue=0 + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + 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") + { + 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=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + if(tId.txt=="cardLChart") + { + page cardLChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + ID : 7 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0&&dimValue!=dim) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + dim=dimValue + tSend.txt="event,sleepReached,cardAlarm" + //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 + } + } + +TouchCap tc0 + Attributes + ID : 8 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index fda4a8ae..530d9c37 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -1692,6 +1692,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index a18be0d1..67f89e54 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -1297,6 +1297,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 33865c29..c7650e40 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -1020,6 +1020,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 5a9dabc9..69ccd272 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1845,6 +1845,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 4a4bbe71..cfef33d8 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -14,14 +14,14 @@ 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 cardChart 33 Component(s) - 425 Line(s) of event code - 290 Unique line(s) of event code -cardAlarm - 42 Component(s) - 415 Line(s) of event code - 253 Unique line(s) of event code + 429 Line(s) of event code + 292 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -38,49 +38,53 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 Unique line(s) of event code +cardPower + 45 Component(s) + 416 Line(s) of event code + 291 Unique line(s) of event code pageStartup 19 Component(s) - 181 Line(s) of event code - 129 Unique line(s) of event code -cardQR - 34 Component(s) - 398 Line(s) of event code - 232 Unique line(s) of event code -pageTest - 21 Component(s) - 66 Line(s) of event code - 64 Unique line(s) of event code -cardGrid - 44 Component(s) - 511 Line(s) of event code - 289 Unique line(s) of event code + 185 Line(s) of event code + 131 Unique line(s) of event code +cardLChart + 31 Component(s) + 424 Line(s) of event code + 274 Unique line(s) of event code cardMedia 59 Component(s) - 637 Line(s) of event code - 316 Unique line(s) of event code + 641 Line(s) of event code + 318 Unique line(s) of event code +cardAlarm + 42 Component(s) + 419 Line(s) of event code + 255 Unique line(s) of event code +pageTest + 24 Component(s) + 68 Line(s) of event code + 66 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code -cardPower - 45 Component(s) - 412 Line(s) of event code - 289 Unique line(s) of event code -cardEntities - 67 Component(s) - 1158 Line(s) of event code - 526 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) - 528 Line(s) of event code - 313 Unique line(s) of event code + 532 Line(s) of event code + 315 Unique line(s) of event code screensaver 47 Component(s) - 430 Line(s) of event code - 302 Unique line(s) of event code + 434 Line(s) of event code + 304 Unique line(s) of event code +cardEntities + 67 Component(s) + 1162 Line(s) of event code + 528 Unique line(s) of event code Total - 19 Page(s) - 694 Component(s) - 8236 Line(s) of event code - 2127 Unique line(s) of event code + 20 Page(s) + 728 Component(s) + 8702 Line(s) of event code + 2235 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 984698c2..11214d4b 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -659,6 +659,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index ff46f405..581ffe0e 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -280,8 +280,44 @@ Button b13 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 152 - y coordinate : 245 + x coordinate : 406 + y coordinate : 133 + Width : 43 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 0 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : showqq + Max. Text Size : 10 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + showqq + +Button b14 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 Width : 100 Height : 50 Effect : load @@ -304,9 +340,77 @@ Button b13 Horizontal Spacing : 0 Vertical Spacing : 0 +Button b15 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 236 + y coordinate : 263 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 0 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : cardLchart + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Events Touch Press Event - showqq + page cardLChart + +Button b16 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 135 + y coordinate : 263 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 0 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : chart + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + page cardChart Button b2 Attributes diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index e36c0472..8c3f7e20 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1394,6 +1394,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 8e63de4b..cc399492 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -868,6 +868,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardChart.txt b/HMI/n2t-out/cardChart.txt index b45f5530..7fd94478 100644 --- a/HMI/n2t-out/cardChart.txt +++ b/HMI/n2t-out/cardChart.txt @@ -685,6 +685,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 0784d32e..5b237ce0 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1935,6 +1935,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 1ad6c8f4..f9b70050 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -920,6 +920,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardLChart.txt b/HMI/n2t-out/cardLChart.txt new file mode 100644 index 00000000..86779021 --- /dev/null +++ b/HMI/n2t-out/cardLChart.txt @@ -0,0 +1,732 @@ +Page cardLChart + 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 + dim=dimValueNormal + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + cardLChart.bco=defaultBcoColor + //vis x0,0 + //x0.bco=defaultBcoColor + //x0.borderc=defaultBcoColor + for(sys0=0;sys0<32;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==6371) + { + b[sys0].pic=1 + b[sys0].pic2=2 + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + +Variable (string) entn + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 512 + +Variable (string) strTmp + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vNValues + Attributes + Scope: local + Value: 0 + +Variable (int32) vaBottom + Attributes + Scope: local + Value: 0 + +Variable (int32) vaColorD + Attributes + Scope: local + Value: 0 + +Variable (int32) vaColorL + Attributes + Scope: local + Value: 0 + +Variable (int32) vaLeft + Attributes + Scope: local + Value: 0 + +Variable (int32) vaMaxX + Attributes + Scope: local + Value: 2147483648 + +Variable (int32) vaMaxY + Attributes + Scope: local + Value: 0 + +Variable (int32) vaMinX + Attributes + Scope: local + Value: 2147483647 + +Variable (int32) vaMinY + Attributes + Scope: local + Value: 2147483647 + +Variable (int32) vaValue + Attributes + Scope: local + Value: 0 + +Variable (int32) vaXUnit + Attributes + Scope: local + Value: 0 + +Variable (int32) vaYUnit + Attributes + Scope: local + Value: 0 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Button bNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } + //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 + +Button bPrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //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 + +Hotspot m0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + fill m0.x,m0.y,m0.w,m0.h,RED + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bPrev,1 + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos>11 // red + vaColorD.val=sys0*8/10<<11 // store and shift + sys0=vaColorL.val>>5%64 // green + vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift + sys0=vaColorL.val%32 + vaColorD.val=sys0*8/10+vaColorD.val // store and add + // + // detect nValues and maxX/Y + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18 + strlen tTmp.txt,sya0 + while(sya0>0) + { + tHeading.txt="last value="+tTmp.txt + spstr tTmp.txt,strTmp.txt,":",0 + covx strTmp.txt,sya1,0,0 + if(sya1>vaMaxX.val) + { + vaMaxX.val=sya1 + } + if(sya1vaMaxY.val) + { + vaMaxY.val=sya1 + } + if(sya10) + { + covx strTmp.txt,sya1,0,0 + if(sya1>vaMinY.val) + { + sys0-- + if(sys0>=0) + { + // found a y-tick => take is at min... + spstr tTmp.txt,strTmp.txt,":",sys0 + covx strTmp.txt,vaMinY.val,0,0 + } + sya0=0 + }else + { + // next + sys0++ + spstr tTmp.txt,strTmp.txt,":",sys0 + strlen strTmp.txt,sya0 + } + } + sys1=sys0+1 // last label + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + while(sya0>0) + { + covx strTmp.txt,sya1,0,0 + if(sya1>=vaMaxY.val) + { + vaMaxY.val=sya1 + sya0=0 + }else + { + // next + sys1++ + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + } + } + // get first given x axis tick + spstr strCommand.txt,strTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt + covx strTmp.txt,vaMinX.val,0,0 + // covx vaMinX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt+":" + // covx vaMaxX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt + // calculate unit width + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + sya1=vaMaxX.val-vaMinX.val + vaXUnit.val=m0.w-25-40*100/sya1 + sya1=vaMaxY.val-vaMinY.val + vaYUnit.val=m0.h-24*100/sya1 + // draw labels + // labels still in tTmp.txt + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+5,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + if(sys0>0) + { + sys0-- + } + for(sya0=sys0;sya0<=sys1;sya0++) + { + spstr tTmp.txt,strTmp.txt,":",sya0 + covx strTmp.txt,sya1,0,0 + sys2=sya1%10 + sya1/=10 + if(sya1>0) + { + covx sya1,strTmp.txt,0,0 + }else + { + strTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + strTmp.txt=strTmp.txt+"."+tId.txt + } + sya1*=10+sys2 + sya1-=vaMinY.val + xstr m0.x+28,-1*vaYUnit.val*sya1/100+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,strTmp.txt + line m0.x+25+40-5,-1*vaYUnit.val*sya1/100+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sya1/100+vaBottom.val,14823 + } + // y achis label + spstr strCommand.txt,tTmp.txt,"~",15 + strlen tTmp.txt,sys1 + sya1=sys1*11+m0.h-48/2 + for(sys0=0;sys0 sya1 contains fist ticks value + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + // loop until current ticks label is smaller than the maximum value observed + while(sya0>0&&sya10) + { + // label found ~> draw + xstr -6*sya0+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + } + // next ~> sya1 contains next ticks label + sys1++ + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + } + // + // draw line segments... + sys1=-2147483648 + sys2=-2147483648 + for(sys0=0;sys00&&sys2>0) + { + // this is not the first point as the last one has been stored in (sys1,sys2) + // ~> connect with a line... + //line sys1,sys2,sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,vaColorD.val + line sys1,sys2,sya0,sya1,vaColorD.val + //line sys1-1,sys2-1,sya0-1,sya1-1,vaColorL.val + //line sys1+1,sys2+1,sya0+1,sya1+1,vaColorL.val + } + // store current point to (sys1,sys2) + //sys1=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40 + //sys2=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val + sys1=sya0 + sys2=sya1 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + sleepValue=0 + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + 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") + { + 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=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + if(tId.txt=="cardLChart") + { + page cardLChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0&&dimValue!=dim) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + dim=dimValue + tSend.txt="event,sleepReached,cardAlarm" + //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 + } + } + +TouchCap tc0 + Attributes + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index b7909860..6e9c51c4 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -1204,6 +1204,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index a29d2d83..2ab310a0 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -789,6 +789,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 1b44aa31..ebf2df3b 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -719,6 +719,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 55223073..82159dd1 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -1121,6 +1121,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index bef0916d..06997ba3 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -364,6 +364,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index 24c80390..90e2a92b 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -128,13 +128,51 @@ Button b13 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt + Text : showqq Max. Text Size : 10 Events Touch Press Event showqq +Button b14 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : newtxt + Max. Text Size : 10 + +Button b15 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : cardLchart + Max. Text Size : 10 + + Events + Touch Press Event + page cardLChart + +Button b16 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : chart + Max. Text Size : 10 + + Events + Touch Press Event + page cardChart + Button b2 Attributes Scope : local diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index a3650257..3c7780e1 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -801,6 +801,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1