From f8c8c803eb68d3627db93665f8b86276871c2dff Mon Sep 17 00:00:00 2001 From: joBr99 Date: Wed, 23 Nov 2022 21:49:07 +0000 Subject: [PATCH] Initial import of cardChart (#592) (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 636 ++++++++++++ HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 4 + HMI/US/landscape/n2t-out-visual/cardChart.txt | 909 +++++++++++++++++ .../landscape/n2t-out-visual/cardEntities.txt | 4 + HMI/US/landscape/n2t-out-visual/cardGrid.txt | 4 + HMI/US/landscape/n2t-out-visual/cardMedia.txt | 4 + HMI/US/landscape/n2t-out-visual/cardPower.txt | 4 + HMI/US/landscape/n2t-out-visual/cardQR.txt | 4 + .../landscape/n2t-out-visual/cardThermo.txt | 4 + .../n2t-out-visual/nspanel_US_L_Stats.txt | 122 +-- .../landscape/n2t-out-visual/pageStartup.txt | 4 + HMI/US/landscape/n2t-out-visual/pageTest.txt | 36 + HMI/US/landscape/n2t-out-visual/popupFan.txt | 4 + .../landscape/n2t-out-visual/popupInSel.txt | 4 + .../landscape/n2t-out-visual/popupLight.txt | 4 + .../landscape/n2t-out-visual/popupNotify.txt | 4 + .../landscape/n2t-out-visual/popupShutter.txt | 4 + .../landscape/n2t-out-visual/popupThermo.txt | 4 + .../landscape/n2t-out-visual/screensaver.txt | 4 + HMI/US/landscape/n2t-out/cardAlarm.txt | 4 + HMI/US/landscape/n2t-out/cardChart.txt | 747 ++++++++++++++ HMI/US/landscape/n2t-out/cardEntities.txt | 4 + HMI/US/landscape/n2t-out/cardGrid.txt | 4 + HMI/US/landscape/n2t-out/cardMedia.txt | 4 + HMI/US/landscape/n2t-out/cardPower.txt | 4 + HMI/US/landscape/n2t-out/cardQR.txt | 4 + HMI/US/landscape/n2t-out/cardThermo.txt | 4 + HMI/US/landscape/n2t-out/pageStartup.txt | 4 + HMI/US/landscape/n2t-out/pageTest.txt | 14 + HMI/US/landscape/n2t-out/popupFan.txt | 4 + HMI/US/landscape/n2t-out/popupInSel.txt | 4 + HMI/US/landscape/n2t-out/popupLight.txt | 4 + HMI/US/landscape/n2t-out/popupNotify.txt | 4 + HMI/US/landscape/n2t-out/popupShutter.txt | 4 + HMI/US/landscape/n2t-out/popupThermo.txt | 4 + HMI/US/landscape/n2t-out/screensaver.txt | 4 + HMI/US/portrait/diff-eu-version.txt | 661 ++++++++++++- HMI/US/portrait/diff-filtered.txt | 661 +++++++++++++ HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 4 + HMI/US/portrait/n2t-out-visual/cardChart.txt | 929 ++++++++++++++++++ .../portrait/n2t-out-visual/cardEntities.txt | 4 + HMI/US/portrait/n2t-out-visual/cardGrid.txt | 4 + HMI/US/portrait/n2t-out-visual/cardMedia.txt | 4 + HMI/US/portrait/n2t-out-visual/cardPower.txt | 4 + HMI/US/portrait/n2t-out-visual/cardQR.txt | 4 + HMI/US/portrait/n2t-out-visual/cardThermo.txt | 4 + .../n2t-out-visual/nspanel_US_P_Stats.txt | 106 +- .../portrait/n2t-out-visual/pageStartup.txt | 4 + HMI/US/portrait/n2t-out-visual/popupFan.txt | 4 + HMI/US/portrait/n2t-out-visual/popupInSel.txt | 4 + HMI/US/portrait/n2t-out-visual/popupLight.txt | 4 + .../portrait/n2t-out-visual/popupNotify.txt | 4 + .../portrait/n2t-out-visual/popupShutter.txt | 4 + .../portrait/n2t-out-visual/popupThermo.txt | 4 + .../portrait/n2t-out-visual/screensaver.txt | 4 + HMI/US/portrait/n2t-out/cardAlarm.txt | 4 + HMI/US/portrait/n2t-out/cardChart.txt | 758 ++++++++++++++ HMI/US/portrait/n2t-out/cardEntities.txt | 4 + HMI/US/portrait/n2t-out/cardGrid.txt | 4 + HMI/US/portrait/n2t-out/cardMedia.txt | 4 + HMI/US/portrait/n2t-out/cardPower.txt | 4 + HMI/US/portrait/n2t-out/cardQR.txt | 4 + HMI/US/portrait/n2t-out/cardThermo.txt | 4 + HMI/US/portrait/n2t-out/pageStartup.txt | 4 + HMI/US/portrait/n2t-out/popupFan.txt | 4 + HMI/US/portrait/n2t-out/popupInSel.txt | 4 + HMI/US/portrait/n2t-out/popupLight.txt | 4 + HMI/US/portrait/n2t-out/popupNotify.txt | 4 + HMI/US/portrait/n2t-out/popupShutter.txt | 4 + HMI/US/portrait/n2t-out/popupThermo.txt | 4 + HMI/US/portrait/n2t-out/screensaver.txt | 4 + HMI/n2t-out-visual/cardAlarm.txt | 16 +- HMI/n2t-out-visual/cardChart.txt | 909 +++++++++++++++++ HMI/n2t-out-visual/cardEntities.txt | 16 +- HMI/n2t-out-visual/cardGrid.txt | 16 +- HMI/n2t-out-visual/cardMedia.txt | 16 +- HMI/n2t-out-visual/cardPower.txt | 16 +- HMI/n2t-out-visual/cardQR.txt | 16 +- HMI/n2t-out-visual/cardThermo.txt | 16 +- HMI/n2t-out-visual/nspanel_Stats.txt | 110 ++- HMI/n2t-out-visual/pageStartup.txt | 4 + HMI/n2t-out-visual/pageTest.txt | 40 +- HMI/n2t-out-visual/popupFan.txt | 4 + HMI/n2t-out-visual/popupInSel.txt | 4 + HMI/n2t-out-visual/popupLight.txt | 4 + HMI/n2t-out-visual/popupNotify.txt | 4 + HMI/n2t-out-visual/popupShutter.txt | 4 + HMI/n2t-out-visual/popupThermo.txt | 4 + HMI/n2t-out-visual/screensaver.txt | 4 + HMI/n2t-out/cardAlarm.txt | 16 +- HMI/n2t-out/cardChart.txt | 747 ++++++++++++++ HMI/n2t-out/cardEntities.txt | 16 +- HMI/n2t-out/cardGrid.txt | 16 +- HMI/n2t-out/cardMedia.txt | 16 +- HMI/n2t-out/cardPower.txt | 16 +- HMI/n2t-out/cardQR.txt | 16 +- HMI/n2t-out/cardThermo.txt | 16 +- HMI/n2t-out/pageStartup.txt | 4 + HMI/n2t-out/pageTest.txt | 14 + HMI/n2t-out/popupFan.txt | 4 + HMI/n2t-out/popupInSel.txt | 4 + HMI/n2t-out/popupLight.txt | 4 + HMI/n2t-out/popupNotify.txt | 4 + HMI/n2t-out/popupShutter.txt | 4 + HMI/n2t-out/popupThermo.txt | 4 + HMI/n2t-out/screensaver.txt | 4 + 106 files changed, 7677 insertions(+), 250 deletions(-) create mode 100644 HMI/US/landscape/n2t-out-visual/cardChart.txt create mode 100644 HMI/US/landscape/n2t-out/cardChart.txt create mode 100644 HMI/US/portrait/n2t-out-visual/cardChart.txt create mode 100644 HMI/US/portrait/n2t-out/cardChart.txt create mode 100644 HMI/n2t-out-visual/cardChart.txt create mode 100644 HMI/n2t-out/cardChart.txt diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 90ff7d20..2a66e46f 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -12,6 +12,642 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup +├── cardAlarm.txt +│ @@ -479,15 +479,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -511,15 +511,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -650,39 +650,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //text arm1 +│ spstr strCommand.txt,arm1.txt,"~",3 +│ if(arm1.txt!="") +│ { +│ vis arm1,1 +│ } +├── cardChart.txt +│ @@ -175,16 +175,16 @@ +│ 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="event,buttonPress2,cardPower," +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -207,16 +207,16 @@ +│ 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="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -409,39 +409,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // extract color +│ spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,vaColorL.val,0,0 +│ // prepare dark color +│ sys0=vaColorL.val>>11 // red +│ vaColorD.val=sys0*8/10<<11 // store and shift +├── cardEntities.txt +│ @@ -530,15 +530,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardEntities," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -562,15 +562,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardEntities," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -1232,39 +1232,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // get Type +│ spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +├── cardGrid.txt +│ @@ -468,15 +468,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardGrid," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -500,15 +500,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardGrid," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -659,39 +659,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // get Type +│ spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +├── cardMedia.txt +│ @@ -444,15 +444,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardMedia," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -476,15 +476,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardMedia," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -607,39 +607,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //entity name +│ spstr strCommand.txt,entn.txt,"~",3 +│ //icon +│ spstr strCommand.txt,tIcon.txt,"~",4 +│ //icon farbe +│ spstr strCommand.txt,tTmp.txt,"~",5 +├── cardPower.txt +│ @@ -343,15 +343,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardPower," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -375,15 +375,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -565,39 +565,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // icon color home +│ spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,t1.pco,0,0 +│ // icon home +│ spstr strCommand.txt,t1.txt,"~",4 +│ // text home +├── cardQR.txt +│ @@ -184,15 +184,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardQR," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -216,15 +216,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -456,39 +456,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //text qrcode +│ spstr strCommand.txt,vaQR.txt,"~",3 +│ // get Type +│ spstr strCommand.txt,type1.txt,"~",4 +│ // get internal name +│ spstr strCommand.txt,entn1.txt,"~",5 +├── cardThermo.txt +│ @@ -291,15 +291,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardThermo," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -323,15 +323,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardThermo," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -904,39 +904,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //entity name +│ spstr strCommand.txt,entn.txt,"~",3 +│ //currentTemp +│ spstr strCommand.txt,tCurTemp.txt,"~",4 +│ //dstTemp +│ spstr strCommand.txt,tTmp.txt,"~",5 ├── pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index a1def98a..f79a3c92 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -1455,6 +1455,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/cardChart.txt b/HMI/US/landscape/n2t-out-visual/cardChart.txt new file mode 100644 index 00000000..c7d19373 --- /dev/null +++ b/HMI/US/landscape/n2t-out-visual/cardChart.txt @@ -0,0 +1,909 @@ +Page cardChart + 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 + cardChart.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 : 4 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) strCommand + Attributes + ID : 3 + Scope : local + Text : + Max. Text Size: 275 + +Variable (string) strTmp + Attributes + ID : 14 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tId + Attributes + ID : 11 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 12 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tSend + Attributes + ID : 7 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 10 + Scope : local + Text : + Max. Text Size: 20 + +Variable (int32) vMax + Attributes + ID : 25 + Scope: local + Value: 0 + +Variable (int32) vNValues + Attributes + ID : 13 + Scope: local + Value: 0 + +Variable (int32) vaBottom + Attributes + ID : 18 + Scope: local + Value: 0 + +Variable (int32) vaColorD + Attributes + ID : 24 + Scope: local + Value: 0 + +Variable (int32) vaColorL + Attributes + ID : 23 + Scope: local + Value: 0 + +Variable (int32) vaLast + Attributes + ID : 21 + Scope: local + Value: 4294967295 + +Variable (int32) vaLeft + Attributes + ID : 19 + Scope: local + Value: 0 + +Variable (int32) vaUnit + Attributes + ID : 16 + Scope: local + Value: 0 + +Variable (int32) vaValue + Attributes + ID : 17 + Scope: local + Value: 0 + +Variable (string) vaValues + Attributes + ID : 20 + Scope : local + Text : + Max. Text Size: 100 + +Variable (int32) vaYUnit + Attributes + ID : 26 + Scope: local + Value: 0 + +XFloat x0 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 190 + y coordinate : 84 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 0 + Border Width : 2 + Font ID : 1 + Back. Color : 0 + Font Color : 50712 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits left : 0 + Significant digits right : 1 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHeading + Attributes + ID : 28 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 81 + 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 : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 406 + 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,cardPower," + if(bNext.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 : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 24 + 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,cardAlarm," + 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 : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 20 + y coordinate : 90 + Width : 440 + Height : 220 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + if(vaLast.val>=0) + { + // spstr vaValues.txt,tTmp.txt,"~",vaLast.val + // covx tTmp.txt,vaValue.val,0,0 + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorD.val + }else + { + sys0=0 + if(vaValue.val<0) + { + vaValue.val*=-1 + sys0=1 + } + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + // line sya0+1,-10*vaValue.val+vaBottom.val,sya1-1,-10*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,sya1,vaBottom.val,vaColorL.val + if(sys0!=0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sys0=vaBottom.val;sys0>=sya1;sys0-=10) + { + sys2=sys0-5 + if(sys2=0) + { + vis x0,1 + vaLast.val=sys0/5 + // n0.val=sys0/5 + spstr vaValues.txt,tTmp.txt,"~",vaLast.val + covx tTmp.txt,vaValue.val,0,0 + // t0.txt=tTmp.txt + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorL.val + x0.val=vaValue.val + }else + { + if(vaValue.val<0) + { + fill sya0+1,vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,-1*vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val*-1 + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val + } + } + }else + { + vis x0,0 + vaLast.val=-1 + } + +Hotspot mSwipeNext + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 472 + y coordinate : 5 + Width : 8 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipePrev + Attributes + ID : 9 + 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 : 8 + 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 : 2 + 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 maxValue + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sya1,0,0 + if(sya1>vMax.val) + { + vMax.val=sya1 + } + // next + vNValues.val++ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + } + // + // calculate unit width + sys0=vNValues.val*4 + sys0+=vNValues.val-1 + vaUnit.val=m0.w-25-40*100 + vaUnit.val/=sys0 + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + vaYUnit.val=m0.h-24/vMax.val + // + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + spstr strCommand.txt,strTmp.txt,"~",5 + sya1=0 + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sys1,0,0 + if(sys1<=vMax.val) + { + line m0.x+25+40-5,-1*vaYUnit.val*sys1+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sys1+vaBottom.val,14823 + sys2=sys1%10 + sys1/=10 + if(sys1>0) + { + covx sys1,tTmp.txt,0,0 + }else + { + tTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + tTmp.txt=tTmp.txt+"."+tId.txt + } + xstr m0.x+28,sys1*10+sys2*-1*vaYUnit.val+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,tTmp.txt + } + // next + sya1++ + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + } + // + // y achis label + spstr strCommand.txt,tTmp.txt,"~",4 + // tTmp.txt="Gas [kW]" + strlen tTmp.txt,sys1 + sya1=sys1*12+m0.h-48/2 + for(sys0=0;sys00) + { + vaValues.txt+="~" + } + // extract next entry + spstr strCommand.txt,tTmp.txt,"~",sys0+6 + // calculate left + sys1=sys0*5*vaUnit.val + sys1+=vaLeft.val + // if there is a colon in the obtained value we have a label/and gridline + spstr tTmp.txt,strTmp.txt,"^",1 + strlen strTmp.txt,sya0 + if(sya0>0) + { + // we have a label!!! + // -> extract label + sys2=vaUnit.val*2+sys1/100 + // draw label + xstr sya0*-6+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + // draw line + // line sys2,vaBottom.val,sys2,m0.y,defaultFontColor + sya1=1 + //spstr tTmp.txt,strTmp.txt,":",0 + spstr tTmp.txt,tTmp.txt,":",0 + vaValues.txt+="-" + }else + { + sya1=0 + } + vaValues.txt+=tTmp.txt + covx tTmp.txt,vaValue.val,0,0 + sya0=sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,vaUnit.val*4+sys1/100,vaBottom.val,vaColorD.val + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + line sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaUnit.val*4+sys1/100-1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4+sys1/100,vaBottom.val,vaColorL.val + } + if(sya1>0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sya0=vaBottom.val-5;sya0>m0.y;sya0-=10) + { + sys1=sya0+5 + if(sya0>=sya1) + { + line sys2,sya0,sys2,sys1,vaColorL.val + }else + { + if(sys1>=sya1) + { + line sys2,sya0,sys2,sya1-1,14823 + line sys2,sya1,sys2,sys1,vaColorL.val + }else + { + line sys2,sya0,sys2,sys1,14823 + } + } + } + } + } + } + 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 + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + ID : 5 + 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 : 6 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 774d72ba..51d11a30 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2876,6 +2876,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 5e6ceb20..2afb72a5 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1326,6 +1326,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 0a468134..7fa59213 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -1232,6 +1232,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/cardPower.txt b/HMI/US/landscape/n2t-out-visual/cardPower.txt index a01c3b4f..38ad0da4 100644 --- a/HMI/US/landscape/n2t-out-visual/cardPower.txt +++ b/HMI/US/landscape/n2t-out-visual/cardPower.txt @@ -1299,6 +1299,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 94af1989..c681c9d2 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -1022,6 +1022,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 970f04e1..4d2499ee 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -1904,6 +1904,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 7fbfe41f..d245471e 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -6,73 +6,77 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -cardQR - 32 Component(s) - 421 Line(s) of event code - 242 Unique line(s) of event code -popupNotify - 19 Component(s) - 253 Line(s) of event code - 164 Unique line(s) of event code -cardAlarm - 40 Component(s) - 439 Line(s) of event code - 261 Unique line(s) of event code -pageStartup - 19 Component(s) - 177 Line(s) of event code - 127 Unique line(s) of event code -popupShutter - 25 Component(s) - 394 Line(s) of event code - 216 Unique line(s) of event code -popupFan - 27 Component(s) - 347 Line(s) of event code - 202 Unique line(s) of event code pageTest - 14 Component(s) - 14 Line(s) of event code - 14 Unique line(s) of event code -popupLight - 28 Component(s) - 404 Line(s) of event code - 223 Unique line(s) of event code -cardGrid - 42 Component(s) - 490 Line(s) of event code - 286 Unique line(s) of event code -cardPower - 43 Component(s) - 435 Line(s) of event code - 297 Unique line(s) of event code + 15 Component(s) + 15 Line(s) of event code + 15 Unique line(s) of event code cardMedia 34 Component(s) - 421 Line(s) of event code - 222 Unique line(s) of event code + 425 Line(s) of event code + 224 Unique line(s) of event code +pageStartup + 19 Component(s) + 181 Line(s) of event code + 129 Unique line(s) of event code +cardChart + 31 Component(s) + 452 Line(s) of event code + 297 Unique line(s) of event code +popupNotify + 19 Component(s) + 257 Line(s) of event code + 166 Unique line(s) of event code +popupLight + 28 Component(s) + 408 Line(s) of event code + 225 Unique line(s) of event code +popupShutter + 25 Component(s) + 398 Line(s) of event code + 218 Unique line(s) of event code +popupFan + 27 Component(s) + 351 Line(s) of event code + 204 Unique line(s) of event code +cardQR + 32 Component(s) + 425 Line(s) of event code + 244 Unique line(s) of event code cardThermo 53 Component(s) - 608 Line(s) of event code - 316 Unique line(s) of event code -screensaver - 45 Component(s) - 396 Line(s) of event code - 294 Unique line(s) of event code -popupThermo - 44 Component(s) - 515 Line(s) of event code - 272 Unique line(s) of event code + 612 Line(s) of event code + 318 Unique line(s) of event code popupInSel 34 Component(s) - 529 Line(s) of event code - 257 Unique line(s) of event code + 533 Line(s) of event code + 259 Unique line(s) of event code +cardGrid + 42 Component(s) + 494 Line(s) of event code + 288 Unique line(s) of event code +cardPower + 43 Component(s) + 439 Line(s) of event code + 299 Unique line(s) of event code +cardAlarm + 40 Component(s) + 443 Line(s) of event code + 263 Unique line(s) of event code +popupThermo + 44 Component(s) + 519 Line(s) of event code + 274 Unique line(s) of event code +screensaver + 45 Component(s) + 400 Line(s) of event code + 296 Unique line(s) of event code cardEntities 65 Component(s) - 1165 Line(s) of event code - 530 Unique line(s) of event code + 1169 Line(s) of event code + 532 Unique line(s) of event code Total - 17 Page(s) - 571 Component(s) - 7019 Line(s) of event code - 1805 Unique line(s) of event code + 18 Page(s) + 603 Component(s) + 7532 Line(s) of event code + 1938 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 996accd9..7fa62448 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -655,6 +655,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/pageTest.txt b/HMI/US/landscape/n2t-out-visual/pageTest.txt index 6a548d7e..b40fcb18 100644 --- a/HMI/US/landscape/n2t-out-visual/pageTest.txt +++ b/HMI/US/landscape/n2t-out-visual/pageTest.txt @@ -183,6 +183,42 @@ Button b11 Touch Press Event page cardGrid +Button b12 + Attributes + ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 115 + y coordinate : 244 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 1 + 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 ID : 13 diff --git a/HMI/US/landscape/n2t-out-visual/popupFan.txt b/HMI/US/landscape/n2t-out-visual/popupFan.txt index 268216fe..abea1102 100644 --- a/HMI/US/landscape/n2t-out-visual/popupFan.txt +++ b/HMI/US/landscape/n2t-out-visual/popupFan.txt @@ -914,6 +914,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/popupInSel.txt b/HMI/US/landscape/n2t-out-visual/popupInSel.txt index f7bbc199..b0bef33a 100644 --- a/HMI/US/landscape/n2t-out-visual/popupInSel.txt +++ b/HMI/US/landscape/n2t-out-visual/popupInSel.txt @@ -1277,6 +1277,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 97e1ba30..8e38cf6d 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -1035,6 +1035,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index 183dbc5b..8d2f3ce0 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -670,6 +670,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 47013efa..dc676dac 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -984,6 +984,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/popupThermo.txt b/HMI/US/landscape/n2t-out-visual/popupThermo.txt index 8d3f6b60..14ff9b27 100644 --- a/HMI/US/landscape/n2t-out-visual/popupThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/popupThermo.txt @@ -1372,6 +1372,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 465214e5..7ee5bae3 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1319,6 +1319,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 8f1a4c48..92ae3d32 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -872,6 +872,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardChart.txt b/HMI/US/landscape/n2t-out/cardChart.txt new file mode 100644 index 00000000..35290529 --- /dev/null +++ b/HMI/US/landscape/n2t-out/cardChart.txt @@ -0,0 +1,747 @@ +Page cardChart + 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 + cardChart.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: 275 + +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: 20 + +Variable (int32) vMax + Attributes + Scope: local + Value: 0 + +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) vaLast + Attributes + Scope: local + Value: 4294967295 + +Variable (int32) vaLeft + Attributes + Scope: local + Value: 0 + +Variable (int32) vaUnit + Attributes + Scope: local + Value: 0 + +Variable (int32) vaValue + Attributes + Scope: local + Value: 0 + +Variable (string) vaValues + Attributes + Scope : local + Text : + Max. Text Size: 100 + +Variable (int32) vaYUnit + Attributes + Scope: local + Value: 0 + +XFloat x0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + 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,cardPower," + if(bNext.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,cardAlarm," + 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 + if(vaLast.val>=0) + { + // spstr vaValues.txt,tTmp.txt,"~",vaLast.val + // covx tTmp.txt,vaValue.val,0,0 + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorD.val + }else + { + sys0=0 + if(vaValue.val<0) + { + vaValue.val*=-1 + sys0=1 + } + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + // line sya0+1,-10*vaValue.val+vaBottom.val,sya1-1,-10*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,sya1,vaBottom.val,vaColorL.val + if(sys0!=0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sys0=vaBottom.val;sys0>=sya1;sys0-=10) + { + sys2=sys0-5 + if(sys2=0) + { + vis x0,1 + vaLast.val=sys0/5 + // n0.val=sys0/5 + spstr vaValues.txt,tTmp.txt,"~",vaLast.val + covx tTmp.txt,vaValue.val,0,0 + // t0.txt=tTmp.txt + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorL.val + x0.val=vaValue.val + }else + { + if(vaValue.val<0) + { + fill sya0+1,vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,-1*vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val*-1 + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val + } + } + }else + { + vis x0,0 + vaLast.val=-1 + } + +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 maxValue + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sya1,0,0 + if(sya1>vMax.val) + { + vMax.val=sya1 + } + // next + vNValues.val++ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + } + // + // calculate unit width + sys0=vNValues.val*4 + sys0+=vNValues.val-1 + vaUnit.val=m0.w-25-40*100 + vaUnit.val/=sys0 + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + vaYUnit.val=m0.h-24/vMax.val + // + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + spstr strCommand.txt,strTmp.txt,"~",5 + sya1=0 + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sys1,0,0 + if(sys1<=vMax.val) + { + line m0.x+25+40-5,-1*vaYUnit.val*sys1+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sys1+vaBottom.val,14823 + sys2=sys1%10 + sys1/=10 + if(sys1>0) + { + covx sys1,tTmp.txt,0,0 + }else + { + tTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + tTmp.txt=tTmp.txt+"."+tId.txt + } + xstr m0.x+28,sys1*10+sys2*-1*vaYUnit.val+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,tTmp.txt + } + // next + sya1++ + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + } + // + // y achis label + spstr strCommand.txt,tTmp.txt,"~",4 + // tTmp.txt="Gas [kW]" + strlen tTmp.txt,sys1 + sya1=sys1*12+m0.h-48/2 + for(sys0=0;sys00) + { + vaValues.txt+="~" + } + // extract next entry + spstr strCommand.txt,tTmp.txt,"~",sys0+6 + // calculate left + sys1=sys0*5*vaUnit.val + sys1+=vaLeft.val + // if there is a colon in the obtained value we have a label/and gridline + spstr tTmp.txt,strTmp.txt,"^",1 + strlen strTmp.txt,sya0 + if(sya0>0) + { + // we have a label!!! + // -> extract label + sys2=vaUnit.val*2+sys1/100 + // draw label + xstr sya0*-6+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + // draw line + // line sys2,vaBottom.val,sys2,m0.y,defaultFontColor + sya1=1 + //spstr tTmp.txt,strTmp.txt,":",0 + spstr tTmp.txt,tTmp.txt,":",0 + vaValues.txt+="-" + }else + { + sya1=0 + } + vaValues.txt+=tTmp.txt + covx tTmp.txt,vaValue.val,0,0 + sya0=sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,vaUnit.val*4+sys1/100,vaBottom.val,vaColorD.val + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + line sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaUnit.val*4+sys1/100-1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4+sys1/100,vaBottom.val,vaColorL.val + } + if(sya1>0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sya0=vaBottom.val-5;sya0>m0.y;sya0-=10) + { + sys1=sya0+5 + if(sya0>=sya1) + { + line sys2,sya0,sys2,sys1,vaColorL.val + }else + { + if(sys1>=sya1) + { + line sys2,sya0,sys2,sya1-1,14823 + line sys2,sya1,sys2,sys1,vaColorL.val + }else + { + line sys2,sya0,sys2,sys1,14823 + } + } + } + } + } + } + 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 + } + } + // 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/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index cc5569a8..4562d181 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1923,6 +1923,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 7121a1ec..7c959fd6 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -880,6 +880,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index cd127457..a99fab40 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -800,6 +800,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardPower.txt b/HMI/US/landscape/n2t-out/cardPower.txt index 705d64f4..cfc75293 100644 --- a/HMI/US/landscape/n2t-out/cardPower.txt +++ b/HMI/US/landscape/n2t-out/cardPower.txt @@ -793,6 +793,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 87bf1223..9b3e879a 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -723,6 +723,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 3072eea8..1ff706bb 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -1184,6 +1184,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 9513edf5..b44d3f76 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -360,6 +360,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/pageTest.txt b/HMI/US/landscape/n2t-out/pageTest.txt index 53a5261d..a6c9f873 100644 --- a/HMI/US/landscape/n2t-out/pageTest.txt +++ b/HMI/US/landscape/n2t-out/pageTest.txt @@ -77,6 +77,20 @@ Button b11 Touch Press Event page cardGrid +Button b12 + 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/US/landscape/n2t-out/popupFan.txt b/HMI/US/landscape/n2t-out/popupFan.txt index 1241982e..6a557672 100644 --- a/HMI/US/landscape/n2t-out/popupFan.txt +++ b/HMI/US/landscape/n2t-out/popupFan.txt @@ -623,6 +623,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/popupInSel.txt b/HMI/US/landscape/n2t-out/popupInSel.txt index 37f29287..d984cb27 100644 --- a/HMI/US/landscape/n2t-out/popupInSel.txt +++ b/HMI/US/landscape/n2t-out/popupInSel.txt @@ -897,6 +897,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 91ddd9cc..62684594 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -686,6 +686,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index a137ef6e..554a90ca 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -441,6 +441,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 9fdce22d..b56fc209 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -675,6 +675,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/popupThermo.txt b/HMI/US/landscape/n2t-out/popupThermo.txt index 878a8ae8..8a3616fb 100644 --- a/HMI/US/landscape/n2t-out/popupThermo.txt +++ b/HMI/US/landscape/n2t-out/popupThermo.txt @@ -946,6 +946,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index da8ae319..4e40c722 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -747,6 +747,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index ea0f91c2..3450793a 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -14,6 +14,194 @@ │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 │ page pageStartup +├── cardAlarm.txt +│ @@ -479,15 +479,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -511,15 +511,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -650,39 +650,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //text arm1 +│ spstr strCommand.txt,arm1.txt,"~",3 +│ if(arm1.txt!="") +│ { +│ vis arm1,1 +│ } +├── cardChart.txt +│ @@ -175,16 +175,16 @@ +│ 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="event,buttonPress2,cardPower," +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -207,16 +207,16 @@ +│ 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="event,buttonPress2,cardAlarm," +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -309,14 +309,25 @@ +│ } +│ }else +│ { +│ vis x0,0 +│ vaLast.val=-1 +│ } +│ +│ +Hotspot m1 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + +│ + Events +│ + Touch Press Event +│ + click bPrev,1 +│ + +│ Hotspot mSwipeNext +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -409,39 +420,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // extract color +│ spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,vaColorL.val,0,0 +│ // prepare dark color +│ sys0=vaColorL.val>>11 // red +│ vaColorD.val=sys0*8/10<<11 // store and shift ├── cardEntities.txt │ @@ -61,14 +61,24 @@ │ vis tIcon4,0 @@ -199,7 +387,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -517,14 +596,39 @@ +│ @@ -517,28 +596,53 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -239,6 +427,38 @@ │ 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,cardEntities," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -562,15 +666,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardEntities," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc │ @@ -681,14 +785,39 @@ │ crcputs tSend.txt,0 │ //send cmd @@ -447,6 +667,50 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ +│ @@ -1232,39 +1469,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // get Type +│ spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { │ @@ -1854,14 +2091,163 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 @@ -611,6 +875,401 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 +├── cardGrid.txt +│ @@ -468,15 +468,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardGrid," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -500,15 +500,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardGrid," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -659,39 +659,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // get Type +│ spstr strCommand.txt,type1.txt,"~",3 +│ // get internal name +│ spstr strCommand.txt,entn1.txt,"~",4 +│ if(type1.txt=="delete"||type1.txt=="") +│ { +├── cardMedia.txt +│ @@ -444,15 +444,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardMedia," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -476,15 +476,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardMedia," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -607,39 +607,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //entity name +│ spstr strCommand.txt,entn.txt,"~",3 +│ //icon +│ spstr strCommand.txt,tIcon.txt,"~",4 +│ //icon farbe +│ spstr strCommand.txt,tTmp.txt,"~",5 +├── cardPower.txt +│ @@ -343,15 +343,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardPower," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -375,15 +375,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -565,39 +565,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ // icon color home +│ spstr strCommand.txt,tTmp.txt,"~",3 +│ covx tTmp.txt,t1.pco,0,0 +│ // icon home +│ spstr strCommand.txt,t1.txt,"~",4 +│ // text home +├── cardQR.txt +│ @@ -184,15 +184,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardQR," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -216,15 +216,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardAlarm," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -456,39 +456,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //text qrcode +│ spstr strCommand.txt,vaQR.txt,"~",3 +│ // get Type +│ spstr strCommand.txt,type1.txt,"~",4 +│ // get internal name +│ spstr strCommand.txt,entn1.txt,"~",5 +├── cardThermo.txt +│ @@ -291,15 +291,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardThermo," +│ - if(bNext.txt=="?") +│ + if(bNext.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ //send calc crc +│ @@ -323,15 +323,15 @@ +│ State : unpressed +│ Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ tSend.txt="event,buttonPress2,cardThermo," +│ - if(bPrev.txt=="?") +│ + if(bPrev.txt=="") +│ { +│ tSend.txt+="bUp" +│ }else +│ { +│ tSend.txt+="bPrev" +│ } +│ //send calc crc +│ @@ -904,39 +904,39 @@ +│ tsw mSwipeUp,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,1 +│ tsw mSwipeUp,0 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bPrev,1 +│ tsw mSwipePrev,0 +│ tsw mSwipeUp,1 +│ - bPrev.txt="?" +│ + bPrev.txt="" +│ } +│ spstr tId.txt,tTmp.txt,"|",1 +│ if(tTmp.txt=="0") +│ { +│ vis bNext,0 +│ tsw mSwipeNext,0 +│ } +│ if(tTmp.txt=="1") +│ { +│ vis bNext,1 +│ tsw mSwipeNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ if(tTmp.txt=="2") +│ { +│ vis bNext,1 +│ - bNext.txt="?" +│ + bNext.txt="" +│ } +│ //entity name +│ spstr strCommand.txt,entn.txt,"~",3 +│ //currentTemp +│ spstr strCommand.txt,tCurTemp.txt,"~",4 +│ //dstTemp +│ spstr strCommand.txt,tTmp.txt,"~",5 ├── pageStartup.txt │ @@ -118,15 +118,15 @@ │ Text tMsg3 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index e69de29b..bb567b56 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -0,0 +1,661 @@ ++++ /dev/fd/62 2022-11-23 21:49:00.416099064 +0000 ++rdAlarm.txt ++15 +479,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bNext.txt=="?") ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++15 +511,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bPrev.txt=="?") ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++39 +650,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ //text arm1 ++ spstr strCommand.txt,arm1.txt,"~",3 ++ if(arm1.txt!="") ++ { ++ vis arm1,1 ++ } ++rdChart.txt ++16 +175,16 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardChart," ++ if(bPrev.txt=="?") ++ tSend.txt="event,buttonPress2,cardPower," ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++16 +207,16 @@ ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardChart," ++ if(bPrev.txt=="?") ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++14 +309,25 @@ ++ } ++ }else ++ { ++ vis x0,0 ++ vaLast.val=-1 ++ } ++ ++ m1 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ ++nts ++ Touch Press Event ++ click bPrev,1 ++ ++ mSwipeNext ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ ++39 +420,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ // extract color ++ spstr strCommand.txt,tTmp.txt,"~",3 ++ covx tTmp.txt,vaColorL.val,0,0 ++ // prepare dark color ++ sys0=vaColorL.val>>11 // red ++ vaColorD.val=sys0*8/10<<11 // store and shift ++28 +596,53 @@ ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardEntities," ++ if(bNext.txt=="?") ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++15 +666,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardEntities," ++ if(bPrev.txt=="?") ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++,39 +1469,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ // get Type ++ spstr strCommand.txt,type1.txt,"~",3 ++ // get internal name ++ spstr strCommand.txt,entn1.txt,"~",4 ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++rdGrid.txt ++15 +468,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardGrid," ++ if(bNext.txt=="?") ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++15 +500,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardGrid," ++ if(bPrev.txt=="?") ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++39 +659,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ // get Type ++ spstr strCommand.txt,type1.txt,"~",3 ++ // get internal name ++ spstr strCommand.txt,entn1.txt,"~",4 ++ if(type1.txt=="delete"||type1.txt=="") ++ { ++rdMedia.txt ++15 +444,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardMedia," ++ if(bNext.txt=="?") ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++15 +476,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardMedia," ++ if(bPrev.txt=="?") ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++39 +607,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ //entity name ++ spstr strCommand.txt,entn.txt,"~",3 ++ //icon ++ spstr strCommand.txt,tIcon.txt,"~",4 ++ //icon farbe ++ spstr strCommand.txt,tTmp.txt,"~",5 ++rdPower.txt ++15 +343,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardPower," ++ if(bNext.txt=="?") ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++15 +375,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bPrev.txt=="?") ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++39 +565,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ // icon color home ++ spstr strCommand.txt,tTmp.txt,"~",3 ++ covx tTmp.txt,t1.pco,0,0 ++ // icon home ++ spstr strCommand.txt,t1.txt,"~",4 ++ // text home ++rdQR.txt ++15 +184,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardQR," ++ if(bNext.txt=="?") ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++15 +216,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardAlarm," ++ if(bPrev.txt=="?") ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++39 +456,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ //text qrcode ++ spstr strCommand.txt,vaQR.txt,"~",3 ++ // get Type ++ spstr strCommand.txt,type1.txt,"~",4 ++ // get internal name ++ spstr strCommand.txt,entn1.txt,"~",5 ++rdThermo.txt ++15 +291,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardThermo," ++ if(bNext.txt=="?") ++ if(bNext.txt=="") ++ { ++ tSend.txt+="bHome" ++ }else ++ { ++ tSend.txt+="bNext" ++ } ++ //send calc crc ++15 +323,15 @@ ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,cardThermo," ++ if(bPrev.txt=="?") ++ if(bPrev.txt=="") ++ { ++ tSend.txt+="bUp" ++ }else ++ { ++ tSend.txt+="bPrev" ++ } ++ //send calc crc ++39 +904,39 @@ ++ tsw mSwipeUp,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,1 ++ tsw mSwipeUp,0 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bPrev,1 ++ tsw mSwipePrev,0 ++ tsw mSwipeUp,1 ++ bPrev.txt="?" ++ bPrev.txt="" ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ vis bNext,0 ++ tsw mSwipeNext,0 ++ } ++ if(tTmp.txt=="1") ++ { ++ vis bNext,1 ++ tsw mSwipeNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ if(tTmp.txt=="2") ++ { ++ vis bNext,1 ++ bNext.txt="?" ++ bNext.txt="" ++ } ++ //entity name ++ spstr strCommand.txt,entn.txt,"~",3 ++ //currentTemp ++ spstr strCommand.txt,tCurTemp.txt,"~",4 ++ //dstTemp ++ spstr strCommand.txt,tTmp.txt,"~",5 diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index b4e78a21..bc9755b2 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1455,6 +1455,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardChart.txt b/HMI/US/portrait/n2t-out-visual/cardChart.txt new file mode 100644 index 00000000..b04f30c1 --- /dev/null +++ b/HMI/US/portrait/n2t-out-visual/cardChart.txt @@ -0,0 +1,929 @@ +Page cardChart + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 320 + 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 + cardChart.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 : 4 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) strCommand + Attributes + ID : 3 + Scope : local + Text : + Max. Text Size: 275 + +Variable (string) strTmp + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tId + Attributes + ID : 10 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 11 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tSend + Attributes + ID : 7 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 9 + Scope : local + Text : + Max. Text Size: 20 + +Variable (int32) vMax + Attributes + ID : 24 + Scope: local + Value: 0 + +Variable (int32) vNValues + Attributes + ID : 12 + Scope: local + Value: 0 + +Variable (int32) vaBottom + Attributes + ID : 17 + Scope: local + Value: 0 + +Variable (int32) vaColorD + Attributes + ID : 23 + Scope: local + Value: 0 + +Variable (int32) vaColorL + Attributes + ID : 22 + Scope: local + Value: 0 + +Variable (int32) vaLast + Attributes + ID : 20 + Scope: local + Value: 4294967295 + +Variable (int32) vaLeft + Attributes + ID : 18 + Scope: local + Value: 0 + +Variable (int32) vaUnit + Attributes + ID : 15 + Scope: local + Value: 0 + +Variable (int32) vaValue + Attributes + ID : 16 + Scope: local + Value: 0 + +Variable (string) vaValues + Attributes + ID : 19 + Scope : local + Text : + Max. Text Size: 100 + +Variable (int32) vaYUnit + Attributes + ID : 25 + Scope: local + Value: 0 + +XFloat x0 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 108 + y coordinate : 77 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 0 + Border Width : 2 + Font ID : 1 + Back. Color : 0 + Font Color : 50712 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits left : 0 + Significant digits right : 1 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHeading + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 66 + y coordinate : 26 + Width : 184 + 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 : 319 + Height : 479 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Button bNext + Attributes + ID : 28 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + 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,cardPower," + if(bNext.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 : 26 + 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,cardAlarm," + 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 : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 20 + y coordinate : 90 + Width : 280 + Height : 370 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + if(vaLast.val>=0) + { + // spstr vaValues.txt,tTmp.txt,"~",vaLast.val + // covx tTmp.txt,vaValue.val,0,0 + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorD.val + }else + { + sys0=0 + if(vaValue.val<0) + { + vaValue.val*=-1 + sys0=1 + } + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + // line sya0+1,-10*vaValue.val+vaBottom.val,sya1-1,-10*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,sya1,vaBottom.val,vaColorL.val + if(sys0!=0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sys0=vaBottom.val;sys0>=sya1;sys0-=10) + { + sys2=sys0-5 + if(sys2=0) + { + vis x0,1 + vaLast.val=sys0/5 + // n0.val=sys0/5 + spstr vaValues.txt,tTmp.txt,"~",vaLast.val + covx tTmp.txt,vaValue.val,0,0 + // t0.txt=tTmp.txt + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorL.val + x0.val=vaValue.val + }else + { + if(vaValue.val<0) + { + fill sya0+1,vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,-1*vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val*-1 + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val + } + } + }else + { + vis x0,0 + vaLast.val=-1 + } + +Hotspot m1 + Attributes + ID : 30 + 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 mSwipeNext + Attributes + ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 7 + Height : 475 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipePrev + Attributes + ID : 8 + 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 : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 298 + Height : 8 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + ID : 2 + 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 maxValue + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sya1,0,0 + if(sya1>vMax.val) + { + vMax.val=sya1 + } + // next + vNValues.val++ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + } + // + // calculate unit width + sys0=vNValues.val*4 + sys0+=vNValues.val-1 + vaUnit.val=m0.w-25-40*100 + vaUnit.val/=sys0 + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + vaYUnit.val=m0.h-24/vMax.val + // + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + spstr strCommand.txt,strTmp.txt,"~",5 + sya1=0 + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sys1,0,0 + if(sys1<=vMax.val) + { + line m0.x+25+40-5,-1*vaYUnit.val*sys1+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sys1+vaBottom.val,14823 + sys2=sys1%10 + sys1/=10 + if(sys1>0) + { + covx sys1,tTmp.txt,0,0 + }else + { + tTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + tTmp.txt=tTmp.txt+"."+tId.txt + } + xstr m0.x+28,sys1*10+sys2*-1*vaYUnit.val+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,tTmp.txt + } + // next + sya1++ + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + } + // + // y achis label + spstr strCommand.txt,tTmp.txt,"~",4 + // tTmp.txt="Gas [kW]" + strlen tTmp.txt,sys1 + sya1=sys1*12+m0.h-48/2 + for(sys0=0;sys00) + { + vaValues.txt+="~" + } + // extract next entry + spstr strCommand.txt,tTmp.txt,"~",sys0+6 + // calculate left + sys1=sys0*5*vaUnit.val + sys1+=vaLeft.val + // if there is a colon in the obtained value we have a label/and gridline + spstr tTmp.txt,strTmp.txt,"^",1 + strlen strTmp.txt,sya0 + if(sya0>0) + { + // we have a label!!! + // -> extract label + sys2=vaUnit.val*2+sys1/100 + // draw label + xstr sya0*-6+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + // draw line + // line sys2,vaBottom.val,sys2,m0.y,defaultFontColor + sya1=1 + //spstr tTmp.txt,strTmp.txt,":",0 + spstr tTmp.txt,tTmp.txt,":",0 + vaValues.txt+="-" + }else + { + sya1=0 + } + vaValues.txt+=tTmp.txt + covx tTmp.txt,vaValue.val,0,0 + sya0=sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,vaUnit.val*4+sys1/100,vaBottom.val,vaColorD.val + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + line sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaUnit.val*4+sys1/100-1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4+sys1/100,vaBottom.val,vaColorL.val + } + if(sya1>0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sya0=vaBottom.val-5;sya0>m0.y;sya0-=10) + { + sys1=sya0+5 + if(sya0>=sya1) + { + line sys2,sya0,sys2,sys1,vaColorL.val + }else + { + if(sys1>=sya1) + { + line sys2,sya0,sys2,sya1-1,14823 + line sys2,sya1,sys2,sys1,vaColorL.val + }else + { + line sys2,sya0,sys2,sys1,14823 + } + } + } + } + } + } + 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 + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + ID : 5 + 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 : 6 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index bca2fd71..a79ad9e9 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -3455,6 +3455,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 3029ca01..527e873f 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1326,6 +1326,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index d2596308..1f2677a4 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1232,6 +1232,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardPower.txt b/HMI/US/portrait/n2t-out-visual/cardPower.txt index 8aa4597a..78840c2f 100644 --- a/HMI/US/portrait/n2t-out-visual/cardPower.txt +++ b/HMI/US/portrait/n2t-out-visual/cardPower.txt @@ -1299,6 +1299,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index f9298eac..bbe77058 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -1022,6 +1022,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index b854bbbd..08413bbe 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1904,6 +1904,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 5af8d52a..211cf320 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -10,69 +10,73 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -cardGrid - 42 Component(s) - 490 Line(s) of event code - 286 Unique line(s) of event code -popupShutter - 25 Component(s) - 394 Line(s) of event code - 216 Unique line(s) of event code pageStartup 19 Component(s) - 177 Line(s) of event code - 127 Unique line(s) of event code -popupThermo - 44 Component(s) - 515 Line(s) of event code - 272 Unique line(s) of event code -popupInSel - 34 Component(s) - 529 Line(s) of event code - 257 Unique line(s) of event code -cardQR - 32 Component(s) - 421 Line(s) of event code - 242 Unique line(s) of event code -popupNotify - 19 Component(s) - 253 Line(s) of event code - 164 Unique line(s) of event code + 181 Line(s) of event code + 129 Unique line(s) of event code popupLight 28 Component(s) - 404 Line(s) of event code - 223 Unique line(s) of event code + 408 Line(s) of event code + 225 Unique line(s) of event code +popupNotify + 19 Component(s) + 257 Line(s) of event code + 166 Unique line(s) of event code popupFan 27 Component(s) - 347 Line(s) of event code - 202 Unique line(s) of event code -cardMedia - 34 Component(s) - 421 Line(s) of event code - 222 Unique line(s) of event code -cardPower - 43 Component(s) - 435 Line(s) of event code + 351 Line(s) of event code + 204 Unique line(s) of event code +cardChart + 32 Component(s) + 453 Line(s) of event code 297 Unique line(s) of event code -cardAlarm - 40 Component(s) - 439 Line(s) of event code - 261 Unique line(s) of event code +popupInSel + 34 Component(s) + 533 Line(s) of event code + 259 Unique line(s) of event code cardThermo 53 Component(s) - 608 Line(s) of event code - 316 Unique line(s) of event code + 612 Line(s) of event code + 318 Unique line(s) of event code +cardPower + 43 Component(s) + 439 Line(s) of event code + 299 Unique line(s) of event code +popupShutter + 25 Component(s) + 398 Line(s) of event code + 218 Unique line(s) of event code +popupThermo + 44 Component(s) + 519 Line(s) of event code + 274 Unique line(s) of event code +cardMedia + 34 Component(s) + 425 Line(s) of event code + 224 Unique line(s) of event code +cardAlarm + 40 Component(s) + 443 Line(s) of event code + 263 Unique line(s) of event code screensaver 45 Component(s) - 396 Line(s) of event code - 294 Unique line(s) of event code + 400 Line(s) of event code + 296 Unique line(s) of event code +cardGrid + 42 Component(s) + 494 Line(s) of event code + 288 Unique line(s) of event code +cardQR + 32 Component(s) + 425 Line(s) of event code + 244 Unique line(s) of event code cardEntities 77 Component(s) - 1391 Line(s) of event code - 617 Unique line(s) of event code + 1395 Line(s) of event code + 619 Unique line(s) of event code Total - 17 Page(s) - 583 Component(s) - 7246 Line(s) of event code - 1880 Unique line(s) of event code + 18 Page(s) + 615 Component(s) + 7759 Line(s) of event code + 2012 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index c8bfecb7..512d5d70 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -655,6 +655,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupFan.txt b/HMI/US/portrait/n2t-out-visual/popupFan.txt index 833a2a25..6b49a181 100644 --- a/HMI/US/portrait/n2t-out-visual/popupFan.txt +++ b/HMI/US/portrait/n2t-out-visual/popupFan.txt @@ -914,6 +914,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupInSel.txt b/HMI/US/portrait/n2t-out-visual/popupInSel.txt index e05d6a96..1d77fded 100644 --- a/HMI/US/portrait/n2t-out-visual/popupInSel.txt +++ b/HMI/US/portrait/n2t-out-visual/popupInSel.txt @@ -1277,6 +1277,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 81e2b85f..96ed6ff7 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -1035,6 +1035,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index bba94a71..d11ebee8 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt @@ -670,6 +670,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 9c1ea8e7..305eb326 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -984,6 +984,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupThermo.txt b/HMI/US/portrait/n2t-out-visual/popupThermo.txt index e122ffe2..11323694 100644 --- a/HMI/US/portrait/n2t-out-visual/popupThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/popupThermo.txt @@ -1372,6 +1372,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 69d6651e..0c9e486d 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1319,6 +1319,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 8f1a4c48..92ae3d32 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -872,6 +872,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardChart.txt b/HMI/US/portrait/n2t-out/cardChart.txt new file mode 100644 index 00000000..ab2df2fa --- /dev/null +++ b/HMI/US/portrait/n2t-out/cardChart.txt @@ -0,0 +1,758 @@ +Page cardChart + 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 + cardChart.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: 275 + +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: 20 + +Variable (int32) vMax + Attributes + Scope: local + Value: 0 + +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) vaLast + Attributes + Scope: local + Value: 4294967295 + +Variable (int32) vaLeft + Attributes + Scope: local + Value: 0 + +Variable (int32) vaUnit + Attributes + Scope: local + Value: 0 + +Variable (int32) vaValue + Attributes + Scope: local + Value: 0 + +Variable (string) vaValues + Attributes + Scope : local + Text : + Max. Text Size: 100 + +Variable (int32) vaYUnit + Attributes + Scope: local + Value: 0 + +XFloat x0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + 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,cardPower," + if(bNext.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,cardAlarm," + 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 + if(vaLast.val>=0) + { + // spstr vaValues.txt,tTmp.txt,"~",vaLast.val + // covx tTmp.txt,vaValue.val,0,0 + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorD.val + }else + { + sys0=0 + if(vaValue.val<0) + { + vaValue.val*=-1 + sys0=1 + } + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + // line sya0+1,-10*vaValue.val+vaBottom.val,sya1-1,-10*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,sya1,vaBottom.val,vaColorL.val + if(sys0!=0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sys0=vaBottom.val;sys0>=sya1;sys0-=10) + { + sys2=sys0-5 + if(sys2=0) + { + vis x0,1 + vaLast.val=sys0/5 + // n0.val=sys0/5 + spstr vaValues.txt,tTmp.txt,"~",vaLast.val + covx tTmp.txt,vaValue.val,0,0 + // t0.txt=tTmp.txt + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorL.val + x0.val=vaValue.val + }else + { + if(vaValue.val<0) + { + fill sya0+1,vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,-1*vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val*-1 + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val + } + } + }else + { + vis x0,0 + vaLast.val=-1 + } + +Hotspot m1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bPrev,1 + +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 maxValue + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sya1,0,0 + if(sya1>vMax.val) + { + vMax.val=sya1 + } + // next + vNValues.val++ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + } + // + // calculate unit width + sys0=vNValues.val*4 + sys0+=vNValues.val-1 + vaUnit.val=m0.w-25-40*100 + vaUnit.val/=sys0 + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + vaYUnit.val=m0.h-24/vMax.val + // + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + spstr strCommand.txt,strTmp.txt,"~",5 + sya1=0 + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sys1,0,0 + if(sys1<=vMax.val) + { + line m0.x+25+40-5,-1*vaYUnit.val*sys1+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sys1+vaBottom.val,14823 + sys2=sys1%10 + sys1/=10 + if(sys1>0) + { + covx sys1,tTmp.txt,0,0 + }else + { + tTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + tTmp.txt=tTmp.txt+"."+tId.txt + } + xstr m0.x+28,sys1*10+sys2*-1*vaYUnit.val+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,tTmp.txt + } + // next + sya1++ + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + } + // + // y achis label + spstr strCommand.txt,tTmp.txt,"~",4 + // tTmp.txt="Gas [kW]" + strlen tTmp.txt,sys1 + sya1=sys1*12+m0.h-48/2 + for(sys0=0;sys00) + { + vaValues.txt+="~" + } + // extract next entry + spstr strCommand.txt,tTmp.txt,"~",sys0+6 + // calculate left + sys1=sys0*5*vaUnit.val + sys1+=vaLeft.val + // if there is a colon in the obtained value we have a label/and gridline + spstr tTmp.txt,strTmp.txt,"^",1 + strlen strTmp.txt,sya0 + if(sya0>0) + { + // we have a label!!! + // -> extract label + sys2=vaUnit.val*2+sys1/100 + // draw label + xstr sya0*-6+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + // draw line + // line sys2,vaBottom.val,sys2,m0.y,defaultFontColor + sya1=1 + //spstr tTmp.txt,strTmp.txt,":",0 + spstr tTmp.txt,tTmp.txt,":",0 + vaValues.txt+="-" + }else + { + sya1=0 + } + vaValues.txt+=tTmp.txt + covx tTmp.txt,vaValue.val,0,0 + sya0=sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,vaUnit.val*4+sys1/100,vaBottom.val,vaColorD.val + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + line sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaUnit.val*4+sys1/100-1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4+sys1/100,vaBottom.val,vaColorL.val + } + if(sya1>0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sya0=vaBottom.val-5;sya0>m0.y;sya0-=10) + { + sys1=sya0+5 + if(sya0>=sya1) + { + line sys2,sya0,sys2,sys1,vaColorL.val + }else + { + if(sys1>=sya1) + { + line sys2,sya0,sys2,sya1-1,14823 + line sys2,sya1,sys2,sys1,vaColorL.val + }else + { + line sys2,sya0,sys2,sys1,14823 + } + } + } + } + } + } + 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 + } + } + // 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/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 3164d71c..1e04ef3b 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -2309,6 +2309,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 7121a1ec..7c959fd6 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -880,6 +880,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index cd127457..a99fab40 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -800,6 +800,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardPower.txt b/HMI/US/portrait/n2t-out/cardPower.txt index 705d64f4..cfc75293 100644 --- a/HMI/US/portrait/n2t-out/cardPower.txt +++ b/HMI/US/portrait/n2t-out/cardPower.txt @@ -793,6 +793,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 87bf1223..9b3e879a 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -723,6 +723,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 3072eea8..1ff706bb 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -1184,6 +1184,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index f4d64fa0..5f56ca25 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -360,6 +360,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupFan.txt b/HMI/US/portrait/n2t-out/popupFan.txt index 1241982e..6a557672 100644 --- a/HMI/US/portrait/n2t-out/popupFan.txt +++ b/HMI/US/portrait/n2t-out/popupFan.txt @@ -623,6 +623,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupInSel.txt b/HMI/US/portrait/n2t-out/popupInSel.txt index 37f29287..d984cb27 100644 --- a/HMI/US/portrait/n2t-out/popupInSel.txt +++ b/HMI/US/portrait/n2t-out/popupInSel.txt @@ -897,6 +897,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 91ddd9cc..62684594 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -686,6 +686,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index a137ef6e..554a90ca 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -441,6 +441,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 9fdce22d..b56fc209 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -675,6 +675,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupThermo.txt b/HMI/US/portrait/n2t-out/popupThermo.txt index 878a8ae8..8a3616fb 100644 --- a/HMI/US/portrait/n2t-out/popupThermo.txt +++ b/HMI/US/portrait/n2t-out/popupThermo.txt @@ -946,6 +946,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 7a1cc9f8..cf6b593f 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -747,6 +747,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index cfe5c8a6..8bfd3fee 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1015,7 +1015,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -1069,7 +1069,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -1237,14 +1237,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1256,12 +1256,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 @@ -1455,6 +1455,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/cardChart.txt b/HMI/n2t-out-visual/cardChart.txt new file mode 100644 index 00000000..70b1ed1a --- /dev/null +++ b/HMI/n2t-out-visual/cardChart.txt @@ -0,0 +1,909 @@ +Page cardChart + 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 + cardChart.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: 275 + +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: 20 + +Variable (int32) vMax + Attributes + ID : 29 + Scope: local + Value: 0 + +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 : 28 + Scope: local + Value: 0 + +Variable (int32) vaColorL + Attributes + ID : 27 + Scope: local + Value: 0 + +Variable (int32) vaLast + Attributes + ID : 25 + Scope: local + Value: 4294967295 + +Variable (int32) vaLeft + Attributes + ID : 23 + Scope: local + Value: 0 + +Variable (int32) vaUnit + Attributes + ID : 20 + Scope: local + Value: 0 + +Variable (int32) vaValue + Attributes + ID : 21 + Scope: local + Value: 0 + +Variable (string) vaValues + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 100 + +Variable (int32) vaYUnit + Attributes + ID : 30 + Scope: local + Value: 0 + +XFloat x0 + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 173 + y coordinate : 84 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 0 + Border Width : 2 + Font ID : 1 + Back. Color : 0 + Font Color : 50712 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits left : 0 + Significant digits right : 1 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 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 + if(vaLast.val>=0) + { + // spstr vaValues.txt,tTmp.txt,"~",vaLast.val + // covx tTmp.txt,vaValue.val,0,0 + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorD.val + }else + { + sys0=0 + if(vaValue.val<0) + { + vaValue.val*=-1 + sys0=1 + } + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + // line sya0+1,-10*vaValue.val+vaBottom.val,sya1-1,-10*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,sya1,vaBottom.val,vaColorL.val + if(sys0!=0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sys0=vaBottom.val;sys0>=sya1;sys0-=10) + { + sys2=sys0-5 + if(sys2=0) + { + vis x0,1 + vaLast.val=sys0/5 + // n0.val=sys0/5 + spstr vaValues.txt,tTmp.txt,"~",vaLast.val + covx tTmp.txt,vaValue.val,0,0 + // t0.txt=tTmp.txt + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorL.val + x0.val=vaValue.val + }else + { + if(vaValue.val<0) + { + fill sya0+1,vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,-1*vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val*-1 + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val + } + } + }else + { + vis x0,0 + vaLast.val=-1 + } + +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 maxValue + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sya1,0,0 + if(sya1>vMax.val) + { + vMax.val=sya1 + } + // next + vNValues.val++ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + } + // + // calculate unit width + sys0=vNValues.val*4 + sys0+=vNValues.val-1 + vaUnit.val=m0.w-25-40*100 + vaUnit.val/=sys0 + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + vaYUnit.val=m0.h-24/vMax.val + // + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + spstr strCommand.txt,strTmp.txt,"~",5 + sya1=0 + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sys1,0,0 + if(sys1<=vMax.val) + { + line m0.x+25+40-5,-1*vaYUnit.val*sys1+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sys1+vaBottom.val,14823 + sys2=sys1%10 + sys1/=10 + if(sys1>0) + { + covx sys1,tTmp.txt,0,0 + }else + { + tTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + tTmp.txt=tTmp.txt+"."+tId.txt + } + xstr m0.x+28,sys1*10+sys2*-1*vaYUnit.val+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,tTmp.txt + } + // next + sya1++ + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + } + // + // y achis label + spstr strCommand.txt,tTmp.txt,"~",4 + // tTmp.txt="Gas [kW]" + strlen tTmp.txt,sys1 + sya1=sys1*12+m0.h-48/2 + for(sys0=0;sys00) + { + vaValues.txt+="~" + } + // extract next entry + spstr strCommand.txt,tTmp.txt,"~",sys0+6 + // calculate left + sys1=sys0*5*vaUnit.val + sys1+=vaLeft.val + // if there is a colon in the obtained value we have a label/and gridline + spstr tTmp.txt,strTmp.txt,"^",1 + strlen strTmp.txt,sya0 + if(sya0>0) + { + // we have a label!!! + // -> extract label + sys2=vaUnit.val*2+sys1/100 + // draw label + xstr sya0*-6+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + // draw line + // line sys2,vaBottom.val,sys2,m0.y,defaultFontColor + sya1=1 + //spstr tTmp.txt,strTmp.txt,":",0 + spstr tTmp.txt,tTmp.txt,":",0 + vaValues.txt+="-" + }else + { + sya1=0 + } + vaValues.txt+=tTmp.txt + covx tTmp.txt,vaValue.val,0,0 + sya0=sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,vaUnit.val*4+sys1/100,vaBottom.val,vaColorD.val + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + line sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaUnit.val*4+sys1/100-1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4+sys1/100,vaBottom.val,vaColorL.val + } + if(sya1>0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sya0=vaBottom.val-5;sya0>m0.y;sya0-=10) + { + sys1=sya0+5 + if(sya0>=sya1) + { + line sys2,sya0,sys2,sys1,vaColorL.val + }else + { + if(sys1>=sya1) + { + line sys2,sya0,sys2,sya1-1,14823 + line sys2,sya1,sys2,sys1,vaColorL.val + }else + { + line sys2,sya0,sys2,sys1,14823 + } + } + } + } + } + } + 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 + } + } + // 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/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index d9e43e60..576c63e8 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -1056,7 +1056,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -1110,7 +1110,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -2189,14 +2189,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -2208,12 +2208,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } // get Type spstr strCommand.txt,type1.txt,"~",3 @@ -2876,6 +2876,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 40a068c7..bdd46057 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -858,7 +858,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -912,7 +912,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -1109,14 +1109,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1128,12 +1128,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } // get Type spstr strCommand.txt,type1.txt,"~",3 @@ -1326,6 +1326,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 7757c47f..05c99be3 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -829,7 +829,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -883,7 +883,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -1043,14 +1043,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1062,12 +1062,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //entity name spstr strCommand.txt,entn.txt,"~",3 @@ -1232,6 +1232,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt index b412a471..0c565e9a 100644 --- a/HMI/n2t-out-visual/cardPower.txt +++ b/HMI/n2t-out-visual/cardPower.txt @@ -802,7 +802,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardPower," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -856,7 +856,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -1075,14 +1075,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1094,12 +1094,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } // icon color home spstr strCommand.txt,tTmp.txt,"~",3 @@ -1299,6 +1299,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index fdc390d4..21095f23 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -339,7 +339,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardQR," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -393,7 +393,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -759,14 +759,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -778,12 +778,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //text qrcode spstr strCommand.txt,vaQR.txt,"~",3 @@ -1022,6 +1022,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index efd19d57..b912e07d 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -635,7 +635,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -689,7 +689,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -1628,14 +1628,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1647,12 +1647,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //entity name spstr strCommand.txt,entn.txt,"~",3 @@ -1904,6 +1904,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 81be602e..eeefdeba 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -6,73 +6,77 @@ pageIcons 7 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -popupShutter - 25 Component(s) - 394 Line(s) of event code - 216 Unique line(s) of event code popupLight 28 Component(s) - 404 Line(s) of event code - 223 Unique line(s) of event code -pageTest - 21 Component(s) - 66 Line(s) of event code - 63 Unique line(s) of event code -popupNotify - 19 Component(s) - 253 Line(s) of event code - 164 Unique line(s) of event code -screensaver - 45 Component(s) - 396 Line(s) of event code - 294 Unique line(s) of event code -cardQR - 32 Component(s) - 421 Line(s) of event code - 242 Unique line(s) of event code + 408 Line(s) of event code + 225 Unique line(s) of event code cardGrid 42 Component(s) - 490 Line(s) of event code + 494 Line(s) of event code 286 Unique line(s) of event code -cardMedia - 34 Component(s) - 421 Line(s) of event code - 222 Unique line(s) of event code +pageTest + 22 Component(s) + 67 Line(s) of event code + 64 Unique line(s) of event code pageStartup 19 Component(s) - 177 Line(s) of event code - 127 Unique line(s) of event code -cardThermo - 53 Component(s) - 608 Line(s) of event code - 316 Unique line(s) of event code -popupFan - 27 Component(s) - 347 Line(s) of event code - 202 Unique line(s) of event code -cardPower - 43 Component(s) - 435 Line(s) of event code - 297 Unique line(s) of event code -popupThermo - 44 Component(s) - 515 Line(s) of event code - 272 Unique line(s) of event code + 181 Line(s) of event code + 129 Unique line(s) of event code +popupNotify + 19 Component(s) + 257 Line(s) of event code + 166 Unique line(s) of event code +cardChart + 31 Component(s) + 452 Line(s) of event code + 293 Unique line(s) of event code popupInSel 34 Component(s) - 529 Line(s) of event code - 257 Unique line(s) of event code + 533 Line(s) of event code + 259 Unique line(s) of event code +popupFan + 27 Component(s) + 351 Line(s) of event code + 204 Unique line(s) of event code +popupShutter + 25 Component(s) + 398 Line(s) of event code + 218 Unique line(s) of event code +cardPower + 43 Component(s) + 439 Line(s) of event code + 297 Unique line(s) of event code +screensaver + 45 Component(s) + 400 Line(s) of event code + 296 Unique line(s) of event code +cardQR + 32 Component(s) + 425 Line(s) of event code + 242 Unique line(s) of event code cardAlarm 40 Component(s) - 439 Line(s) of event code + 443 Line(s) of event code 261 Unique line(s) of event code +cardMedia + 34 Component(s) + 425 Line(s) of event code + 222 Unique line(s) of event code +popupThermo + 44 Component(s) + 519 Line(s) of event code + 274 Unique line(s) of event code +cardThermo + 53 Component(s) + 612 Line(s) of event code + 316 Unique line(s) of event code cardEntities 65 Component(s) - 1165 Line(s) of event code + 1169 Line(s) of event code 530 Unique line(s) of event code Total - 17 Page(s) - 578 Component(s) - 7073 Line(s) of event code - 1820 Unique line(s) of event code + 18 Page(s) + 610 Component(s) + 7586 Line(s) of event code + 1952 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 78ddac4d..0d287586 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -655,6 +655,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index b1b82cf2..d373f86d 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -280,8 +280,8 @@ Button b13 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 129 - y coordinate : 216 + x coordinate : 215 + y coordinate : 243 Width : 100 Height : 50 Effect : load @@ -308,6 +308,42 @@ Button b13 Touch Press Event page popupThermo +Button b14 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 100 + y coordinate : 193 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 1 + 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 ID : 13 diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index 9b214b96..c3654ad2 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -914,6 +914,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupInSel.txt b/HMI/n2t-out-visual/popupInSel.txt index 35b11a78..96f81fa9 100644 --- a/HMI/n2t-out-visual/popupInSel.txt +++ b/HMI/n2t-out-visual/popupInSel.txt @@ -1277,6 +1277,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 351c08be..875d5298 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -1035,6 +1035,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index b4ea9d1d..0145e1b9 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -670,6 +670,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index dcb43077..86833bac 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -984,6 +984,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupThermo.txt b/HMI/n2t-out-visual/popupThermo.txt index df2b6004..56e4b68e 100644 --- a/HMI/n2t-out-visual/popupThermo.txt +++ b/HMI/n2t-out-visual/popupThermo.txt @@ -1372,6 +1372,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index f5e88712..49299a48 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1319,6 +1319,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 8f1a4c48..242eb6b2 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -483,7 +483,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -515,7 +515,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -654,14 +654,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -673,12 +673,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 @@ -872,6 +872,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardChart.txt b/HMI/n2t-out/cardChart.txt new file mode 100644 index 00000000..a2cb965b --- /dev/null +++ b/HMI/n2t-out/cardChart.txt @@ -0,0 +1,747 @@ +Page cardChart + 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 + cardChart.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: 275 + +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: 20 + +Variable (int32) vMax + Attributes + Scope: local + Value: 0 + +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) vaLast + Attributes + Scope: local + Value: 4294967295 + +Variable (int32) vaLeft + Attributes + Scope: local + Value: 0 + +Variable (int32) vaUnit + Attributes + Scope: local + Value: 0 + +Variable (int32) vaValue + Attributes + Scope: local + Value: 0 + +Variable (string) vaValues + Attributes + Scope : local + Text : + Max. Text Size: 100 + +Variable (int32) vaYUnit + Attributes + Scope: local + Value: 0 + +XFloat x0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + 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 + if(vaLast.val>=0) + { + // spstr vaValues.txt,tTmp.txt,"~",vaLast.val + // covx tTmp.txt,vaValue.val,0,0 + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorD.val + }else + { + sys0=0 + if(vaValue.val<0) + { + vaValue.val*=-1 + sys0=1 + } + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + // line sya0+1,-10*vaValue.val+vaBottom.val,sya1-1,-10*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,sya1,vaBottom.val,vaColorL.val + if(sys0!=0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sys0=vaBottom.val;sys0>=sya1;sys0-=10) + { + sys2=sys0-5 + if(sys2=0) + { + vis x0,1 + vaLast.val=sys0/5 + // n0.val=sys0/5 + spstr vaValues.txt,tTmp.txt,"~",vaLast.val + covx tTmp.txt,vaValue.val,0,0 + // t0.txt=tTmp.txt + sys1=vaLast.val*5*vaUnit.val + sys1+=vaLeft.val + sya0=sys1/100 + sya1=vaUnit.val*4+sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,sya1,vaBottom.val,vaColorL.val + x0.val=vaValue.val + }else + { + if(vaValue.val<0) + { + fill sya0+1,vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,-1*vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val*-1 + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorL.val + x0.val=vaValue.val + } + } + }else + { + vis x0,0 + vaLast.val=-1 + } + +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 maxValue + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sya1,0,0 + if(sya1>vMax.val) + { + vMax.val=sya1 + } + // next + vNValues.val++ + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+6 + strlen tTmp.txt,sya0 + } + // + // calculate unit width + sys0=vNValues.val*4 + sys0+=vNValues.val-1 + vaUnit.val=m0.w-25-40*100 + vaUnit.val/=sys0 + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + vaYUnit.val=m0.h-24/vMax.val + // + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+10,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + spstr strCommand.txt,strTmp.txt,"~",5 + sya1=0 + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + while(sya0>0) + { + covx tTmp.txt,sys1,0,0 + if(sys1<=vMax.val) + { + line m0.x+25+40-5,-1*vaYUnit.val*sys1+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sys1+vaBottom.val,14823 + sys2=sys1%10 + sys1/=10 + if(sys1>0) + { + covx sys1,tTmp.txt,0,0 + }else + { + tTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + tTmp.txt=tTmp.txt+"."+tId.txt + } + xstr m0.x+28,sys1*10+sys2*-1*vaYUnit.val+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,tTmp.txt + } + // next + sya1++ + spstr strTmp.txt,tTmp.txt,":",sya1 + strlen tTmp.txt,sya0 + } + // + // y achis label + spstr strCommand.txt,tTmp.txt,"~",4 + // tTmp.txt="Gas [kW]" + strlen tTmp.txt,sys1 + sya1=sys1*12+m0.h-48/2 + for(sys0=0;sys00) + { + vaValues.txt+="~" + } + // extract next entry + spstr strCommand.txt,tTmp.txt,"~",sys0+6 + // calculate left + sys1=sys0*5*vaUnit.val + sys1+=vaLeft.val + // if there is a colon in the obtained value we have a label/and gridline + spstr tTmp.txt,strTmp.txt,"^",1 + strlen strTmp.txt,sya0 + if(sya0>0) + { + // we have a label!!! + // -> extract label + sys2=vaUnit.val*2+sys1/100 + // draw label + xstr sya0*-6+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + // draw line + // line sys2,vaBottom.val,sys2,m0.y,defaultFontColor + sya1=1 + //spstr tTmp.txt,strTmp.txt,":",0 + spstr tTmp.txt,tTmp.txt,":",0 + vaValues.txt+="-" + }else + { + sya1=0 + } + vaValues.txt+=tTmp.txt + covx tTmp.txt,vaValue.val,0,0 + sya0=sys1/100 + if(vaValue.val==0) + { + line sya0,vaBottom.val,vaUnit.val*4+sys1/100,vaBottom.val,vaColorD.val + }else + { + fill sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4/100,vaYUnit.val*vaValue.val-1,vaColorD.val + line sya0+1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaUnit.val*4+sys1/100-1,-1*vaYUnit.val*vaValue.val+vaBottom.val,vaColorL.val + draw sya0,-1*vaYUnit.val*vaValue.val+vaBottom.val+1,vaUnit.val*4+sys1/100,vaBottom.val,vaColorL.val + } + if(sya1>0) + { + sya1=-1*vaYUnit.val*vaValue.val+vaBottom.val + for(sya0=vaBottom.val-5;sya0>m0.y;sya0-=10) + { + sys1=sya0+5 + if(sya0>=sya1) + { + line sys2,sya0,sys2,sys1,vaColorL.val + }else + { + if(sys1>=sya1) + { + line sys2,sya0,sys2,sya1-1,14823 + line sys2,sya1,sys2,sys1,vaColorL.val + }else + { + line sys2,sya0,sys2,sys1,14823 + } + } + } + } + } + } + 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 + } + } + // 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/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index cc5569a8..5417ae6b 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -534,7 +534,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -566,7 +566,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardEntities," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -1236,14 +1236,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -1255,12 +1255,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } // get Type spstr strCommand.txt,type1.txt,"~",3 @@ -1923,6 +1923,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 7121a1ec..2eb4f153 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -472,7 +472,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -504,7 +504,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardGrid," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -663,14 +663,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -682,12 +682,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } // get Type spstr strCommand.txt,type1.txt,"~",3 @@ -880,6 +880,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index cd127457..79face53 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -448,7 +448,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -480,7 +480,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardMedia," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -611,14 +611,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -630,12 +630,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //entity name spstr strCommand.txt,entn.txt,"~",3 @@ -800,6 +800,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt index 705d64f4..2cadfaaa 100644 --- a/HMI/n2t-out/cardPower.txt +++ b/HMI/n2t-out/cardPower.txt @@ -347,7 +347,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardPower," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -379,7 +379,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -569,14 +569,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -588,12 +588,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } // icon color home spstr strCommand.txt,tTmp.txt,"~",3 @@ -793,6 +793,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 87bf1223..bb217968 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -188,7 +188,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardQR," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -220,7 +220,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardAlarm," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -460,14 +460,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -479,12 +479,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //text qrcode spstr strCommand.txt,vaQR.txt,"~",3 @@ -723,6 +723,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 3072eea8..b202c349 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -295,7 +295,7 @@ Button bNext Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bNext.txt=="") + if(bNext.txt=="?") { tSend.txt+="bHome" }else @@ -327,7 +327,7 @@ Button bPrev Events Touch Press Event tSend.txt="event,buttonPress2,cardThermo," - if(bPrev.txt=="") + if(bPrev.txt=="?") { tSend.txt+="bUp" }else @@ -908,14 +908,14 @@ Timer tmSerial vis bPrev,1 tsw mSwipePrev,1 tsw mSwipeUp,0 - bPrev.txt="" + bPrev.txt="?" } if(tTmp.txt=="2") { vis bPrev,1 tsw mSwipePrev,0 tsw mSwipeUp,1 - bPrev.txt="" + bPrev.txt="?" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") @@ -927,12 +927,12 @@ Timer tmSerial { vis bNext,1 tsw mSwipeNext,1 - bNext.txt="" + bNext.txt="?" } if(tTmp.txt=="2") { vis bNext,1 - bNext.txt="" + bNext.txt="?" } //entity name spstr strCommand.txt,entn.txt,"~",3 @@ -1184,6 +1184,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 3f522c3c..0bb24a1b 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -360,6 +360,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index b1d140fc..ba9dc59a 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -135,6 +135,20 @@ Button b13 Touch Press Event page popupThermo +Button b14 + 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/popupFan.txt b/HMI/n2t-out/popupFan.txt index 1241982e..6a557672 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -623,6 +623,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupInSel.txt b/HMI/n2t-out/popupInSel.txt index 37f29287..d984cb27 100644 --- a/HMI/n2t-out/popupInSel.txt +++ b/HMI/n2t-out/popupInSel.txt @@ -897,6 +897,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 91ddd9cc..62684594 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -686,6 +686,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index a137ef6e..554a90ca 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -441,6 +441,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 9fdce22d..b56fc209 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -675,6 +675,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupThermo.txt b/HMI/n2t-out/popupThermo.txt index 878a8ae8..8a3616fb 100644 --- a/HMI/n2t-out/popupThermo.txt +++ b/HMI/n2t-out/popupThermo.txt @@ -946,6 +946,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 7a1cc9f8..cf6b593f 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -747,6 +747,10 @@ Timer tmSerial { page cardPower } + if(tId.txt=="cardChart") + { + page cardChart + } } // end of user code udelete payloadLength-1