From bbed77f83fad927ddf8c40b304260dcc6655a461 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 19 Dec 2022 22:17:08 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 2 +- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +- .../landscape/n2t-out-visual/screensaver.txt | 8 +- HMI/US/portrait/diff-eu-version.txt | 438 ++++++++++- HMI/US/portrait/diff-filtered.txt | 427 ++++++++++- .../portrait/n2t-out-visual/cardEntities.txt | 683 ++++++++++++++++-- .../n2t-out-visual/nspanel_US_P_Stats.txt | 14 +- HMI/US/portrait/n2t-out/cardEntities.txt | 380 +++++++++- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +- HMI/n2t-out-visual/screensaver.txt | 2 +- HMI/n2t-out/screensaver.txt | 2 +- 11 files changed, 1873 insertions(+), 99 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 92f0e50c..d6515176 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -97,7 +97,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ - Text : 21:32 +│ - Text : 21:32PP │ + Text : 21:32 │ Max. Text Size : 15 │ 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 cc851b49..920728a7 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 @@ -22,10 +22,6 @@ popupNotify 19 Component(s) 257 Line(s) of event code 166 Unique line(s) of event code -screensaver - 45 Component(s) - 410 Line(s) of event code - 298 Unique line(s) of event code popupLight 28 Component(s) 408 Line(s) of event code @@ -46,6 +42,10 @@ cardQR 32 Component(s) 425 Line(s) of event code 244 Unique line(s) of event code +screensaver + 45 Component(s) + 410 Line(s) of event code + 298 Unique line(s) of event code cardEntities 65 Component(s) 1169 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 5d62206d..a6bd1531 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -157,7 +157,7 @@ Text tAMPM Send Component ID : disabled Opacity : 127 x coordinate : 359 - y coordinate : 49 + y coordinate : 56 Width : 104 Height : 57 Effect : load @@ -579,7 +579,7 @@ Text tIcon1 x coordinate : 0 y coordinate : 0 Width : 85 - Height : 48 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -609,7 +609,7 @@ Text tIcon2 x coordinate : 393 y coordinate : 0 Width : 85 - Height : 48 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -877,7 +877,7 @@ Text tTime Send Component ID : disabled Opacity : 127 x coordinate : 53 - y coordinate : 18 + y coordinate : 25 Width : 376 Height : 112 Effect : load diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index fc63378d..024402a8 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -103,7 +103,7 @@ │ { │ b[sys0].bco=defaultBcoColor │ b[sys0].pco=defaultFontColor -│ @@ -106,14 +116,20 @@ +│ @@ -106,14 +116,26 @@ │ │ Variable (string) entn4 │ Attributes @@ -117,6 +117,12 @@ │ + Text : │ + Max. Text Size: 80 │ + +│ +Variable (string) entn6 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 80 +│ + │ Variable (string) strCommand │ Attributes │ Scope : local @@ -124,7 +130,7 @@ │ Max. Text Size: 500 │ │ Variable (string) tSend -│ @@ -142,14 +158,20 @@ +│ @@ -142,14 +164,26 @@ │ │ Variable (string) type4 │ Attributes @@ -138,6 +144,12 @@ │ + Text : │ + Max. Text Size: 10 │ + +│ +Variable (string) type6 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 10 +│ + │ Number nNum1 │ Attributes │ Scope : local @@ -145,7 +157,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -178,14 +200,23 @@ +│ @@ -178,14 +212,32 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 @@ -162,6 +174,15 @@ │ + Associated Keyboard : none │ + Value : 0 │ + +│ +Number nNum6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Value : 0 +│ + │ Text tEntity1 │ Attributes │ Scope : local @@ -169,7 +190,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -218,14 +249,24 @@ +│ @@ -218,14 +270,34 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled @@ -187,6 +208,16 @@ │ + Text : tEntity5 │ + Max. Text Size : 30 │ + +│ +Text tEntity6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : tEntity5 +│ + Max. Text Size : 30 +│ + │ Text tHeading │ Attributes │ Scope : local @@ -194,7 +225,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -268,14 +309,24 @@ +│ @@ -268,14 +340,34 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled @@ -212,6 +243,16 @@ │ + Text :  │ + Max. Text Size : 5 │ + +│ +Text tIcon6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text :  +│ + Max. Text Size : 5 +│ + │ Text tId │ Attributes │ Scope : local @@ -219,7 +260,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -417,14 +468,42 @@ +│ @@ -417,14 +509,70 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -255,6 +296,34 @@ │ + prints tSend.txt,0 │ + prints crcval,2 │ + +│ +Slider hSlider6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Position : 50 +│ + Upper range limit : 100 +│ + Lower range limit : 0 +│ + +│ + Events +│ + Touch Release Event +│ + nNum5.val=hSlider5.val +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," +│ + covx nNum5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //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 bDown1 │ Attributes │ Scope : local @@ -262,7 +331,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -517,14 +596,39 @@ +│ @@ -517,14 +665,64 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -295,6 +364,31 @@ │ + prints tSend.txt,0 │ + prints crcval,2 │ + +│ +Button bDown6 +│ + 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,"+entn6.txt+",down" +│ + //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 bNext │ Attributes │ Scope : local @@ -302,7 +396,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -681,14 +785,39 @@ +│ @@ -681,14 +879,64 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -335,6 +429,31 @@ │ + prints tSend.txt,0 │ + prints crcval,2 │ + +│ +Button bStop6 +│ + 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,"+entn6.txt+",stop" +│ + //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 bText1 │ Attributes │ Scope : local @@ -342,7 +461,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -781,14 +910,39 @@ +│ @@ -781,14 +1029,64 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -375,6 +494,31 @@ │ + prints tSend.txt,0 │ + prints crcval,2 │ + +│ +Button bText6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text : +│ + Max. Text Size : 45 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",button" +│ + //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 bUp1 │ Attributes │ Scope : local @@ -382,7 +526,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -881,14 +1035,39 @@ +│ @@ -881,14 +1179,64 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -415,6 +559,31 @@ │ + prints tSend.txt,0 │ + prints crcval,2 │ + +│ +Button bUp6 +│ + 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,"+entn6.txt+",up" +│ + //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 +│ + │ Dual-state Button btOnOff1 │ Attributes │ Scope : local @@ -422,7 +591,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -989,14 +1168,41 @@ +│ @@ -989,14 +1337,68 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -457,6 +626,33 @@ │ + prints tSend.txt,0 │ + prints crcval,2 │ + +│ +Dual-state Button btOnOff6 +│ + 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,"+entn6.txt+",OnOff," +│ + covx btOnOff5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //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 @@ -464,7 +660,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1113,14 +1319,45 @@ +│ @@ -1113,14 +1515,76 @@ │ page popupFan │ } │ if(type4.txt=="input_sel") @@ -503,6 +699,37 @@ │ + page popupInSel │ + } │ + +│ +Hotspot m5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + +│ + Events +│ + Touch Press Event +│ + pageIcons.tTmp1.txt=tEntity6.txt +│ + pageIcons.tTmp2.txt=entn6.txt +│ + pageIcons.tTmp3.txt=tIcon6.txt +│ + if(type6.txt=="shutter") +│ + { +│ + //popupShutter.tHeading.txt=tEntity5.txt +│ + page popupShutter +│ + } +│ + if(type6.txt=="light") +│ + { +│ + //popupLight.tEntity.txt=tEntity5.txt +│ + page popupLight +│ + } +│ + if(type6.txt=="fan") +│ + { +│ + page popupFan +│ + } +│ + if(type6.txt=="input_sel") +│ + { +│ + page popupInSel +│ + } +│ + │ Hotspot mSpecial │ Attributes │ Scope : local @@ -510,7 +737,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -1854,14 +2091,163 @@ +│ @@ -1854,14 +2318,312 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 │ //third value is max value @@ -667,6 +894,155 @@ │ + covx tTmp.txt,sys0,0,0 │ + hSlider5.maxval=sys0 │ + } +│ + // get Type +│ + spstr strCommand.txt,type6.txt,"~",33 +│ + // get internal name +│ + spstr strCommand.txt,entn6.txt,"~",34 +│ + if(type6.txt=="delete"||type6.txt=="") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis tEntity6,0 +│ + vis tIcon6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + }else +│ + { +│ + // change icon +│ + spstr strCommand.txt,tIcon6.txt,"~",35 +│ + vis tIcon6,1 +│ + // change icon color +│ + spstr strCommand.txt,tTmp.txt,"~",36 +│ + covx tTmp.txt,sys0,0,0 +│ + tIcon6.pco=sys0 +│ + // set name +│ + spstr strCommand.txt,tEntity6.txt,"~",37 +│ + vis tEntity6,1 +│ + } +│ + if(type6.txt=="shutter") +│ + { +│ + vis bUp6,1 +│ + vis bStop6,1 +│ + vis bDown6,1 +│ + vis btOnOff6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tId.txt,"~",38 +│ + // up button +│ + spstr tId.txt,tTmp.txt,"|",3 +│ + if(tTmp.txt=="disable") +│ + { +│ + bUp6.pco=27501 +│ + spstr tId.txt,bUp6.txt,"|",0 +│ + tsw bUp6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bUp6.pco=65535 +│ + spstr tId.txt,bUp6.txt,"|",0 +│ + tsw bUp6,1 +│ + } +│ + // stop button +│ + spstr tId.txt,tTmp.txt,"|",4 +│ + if(tTmp.txt=="disable") +│ + { +│ + bStop6.pco=27501 +│ + spstr tId.txt,bStop6.txt,"|",1 +│ + tsw bStop6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bStop6.pco=65535 +│ + spstr tId.txt,bStop6.txt,"|",1 +│ + tsw bStop6,1 +│ + } +│ + // down button +│ + spstr tId.txt,tTmp.txt,"|",5 +│ + if(tTmp.txt=="disable") +│ + { +│ + bDown6.pco=27501 +│ + spstr tId.txt,bDown6.txt,"|",2 +│ + tsw bDown6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bDown6.pco=65535 +│ + spstr tId.txt,bDown6.txt,"|",2 +│ + tsw bDown6,1 +│ + } +│ + } +│ + if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,1 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tTmp.txt,"~",38 +│ + covx tTmp.txt,sys0,0,0 +│ + btOnOff6.val=sys0 +│ + } +│ + if(type6.txt=="text") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,1 +│ + tsw bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + bText6.pco=65535 +│ + bText6.pco2=65535 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText6.txt,"~",38 +│ + } +│ + if(type6.txt=="button"||type6.txt=="input_sel") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,1 +│ + tsw bText6,1 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + bText6.pco=1374 +│ + bText6.pco2=1374 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText6.txt,"~",38 +│ + } +│ + if(type6.txt=="number") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,0 +│ + tsw bText6,0 +│ + vis hSlider6,1 +│ + vis nNum6,1 +│ + // get config (optional Value) (use bText as variable) +│ + spstr strCommand.txt,bText6.txt,"~",38 +│ + //first value is current value +│ + spstr bText6.txt,tTmp.txt,"|",0 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.val=sys0 +│ + nNum6.val=sys0 +│ + //second value is min value +│ + spstr bText6.txt,tTmp.txt,"|",1 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.minval=sys0 +│ + //third value is max value +│ + spstr bText6.txt,tTmp.txt,"|",2 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.maxval=sys0 +│ + } │ } │ if(tInstruction.txt=="pageType") │ { @@ -674,6 +1050,25 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 +│ @@ -1919,18 +2681,14 @@ +│ { +│ page cardQR +│ } +│ if(tId.txt=="cardPower") +│ { +│ page cardPower +│ } +│ - if(tId.txt=="cardChart") +│ - { +│ - page cardChart +│ - } +│ } +│ if(tInstruction.txt=="time") +│ { +│ // get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ } +│ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardGrid.txt ├── +++ HMI/US/portrait/n2t-out/cardGrid.txt │ @@ -609,14 +609,18 @@ @@ -787,3 +1182,20 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -370,15 +351,15 @@ +│ Text tTime +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ - Text : 21:32PP +│ + Text : 21:32 +│ Max. Text Size : 15 +│ +│ Text tTimeAdd +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 28be1a59..f37fa740 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-19 21:57:51.229884209 +0000 ++++ /dev/fd/62 2022-12-19 22:17:01.757088934 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -64,6 +64,414 @@ + Send Component ID : disabled +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt ++14 +116,26 @@ ++e (string) entn6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ ++14 +164,26 @@ ++e (string) type6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 10 ++ ++14 +212,32 @@ ++nNum6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Value : 0 ++ ++14 +270,34 @@ ++ntity6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : tEntity5 ++ Max. Text Size : 30 ++ ++14 +340,34 @@ ++con6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text :  ++ Max. Text Size : 5 ++ ++14 +509,70 @@ ++hSlider6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Position : 50 ++ Upper range limit : 100 ++ Lower range limit : 0 ++ ++nts ++ Touch Release Event ++ nNum5.val=hSlider5.val ++ tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," ++ covx nNum5.val,tTmp.txt,0,0 ++ tSend.txt+=tTmp.txt ++ //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 ++ ++14 +665,64 @@ ++bDown6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",down" ++ //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 ++ ++14 +879,64 @@ ++bStop6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",stop" ++ //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 ++ ++14 +1029,64 @@ ++bText6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : ++ Max. Text Size : 45 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",button" ++ //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 ++ ++14 +1179,64 @@ ++bUp6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",up" ++ //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 ++ ++14 +1337,68 @@ ++ate Button btOnOff6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff," ++ covx btOnOff5.val,tTmp.txt,0,0 ++ tSend.txt+=tTmp.txt ++ //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 ++ ++,14 +1515,76 @@ ++ m5 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ ++nts ++ Touch Press Event ++ pageIcons.tTmp1.txt=tEntity6.txt ++ pageIcons.tTmp2.txt=entn6.txt ++ pageIcons.tTmp3.txt=tIcon6.txt ++ if(type6.txt=="shutter") ++ { ++ //popupShutter.tHeading.txt=tEntity5.txt ++ page popupShutter ++ } ++ if(type6.txt=="light") ++ { ++ //popupLight.tEntity.txt=tEntity5.txt ++ page popupLight ++ } ++ if(type6.txt=="fan") ++ { ++ page popupFan ++ } ++ if(type6.txt=="input_sel") ++ { ++ page popupInSel ++ } ++ ++,14 +2318,312 @@ ++ // get Type ++ spstr strCommand.txt,type6.txt,"~",33 ++ // get internal name ++ spstr strCommand.txt,entn6.txt,"~",34 ++ if(type6.txt=="delete"||type6.txt=="") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis tEntity6,0 ++ vis tIcon6,0 ++ vis bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon6.txt,"~",35 ++ vis tIcon6,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",36 ++ covx tTmp.txt,sys0,0,0 ++ tIcon6.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity6.txt,"~",37 ++ vis tEntity6,1 ++ } ++ if(type6.txt=="shutter") ++ { ++ vis bUp6,1 ++ vis bStop6,1 ++ vis bDown6,1 ++ vis btOnOff6,0 ++ vis bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",38 ++ // up button ++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") ++ { ++ bUp6.pco=27501 ++ spstr tId.txt,bUp6.txt,"|",0 ++ tsw bUp6,0 ++ }else if(tTmp.txt=="enable") ++ { ++ bUp6.pco=65535 ++ spstr tId.txt,bUp6.txt,"|",0 ++ tsw bUp6,1 ++ } ++ // stop button ++ spstr tId.txt,tTmp.txt,"|",4 ++ if(tTmp.txt=="disable") ++ { ++ bStop6.pco=27501 ++ spstr tId.txt,bStop6.txt,"|",1 ++ tsw bStop6,0 ++ }else if(tTmp.txt=="enable") ++ { ++ bStop6.pco=65535 ++ spstr tId.txt,bStop6.txt,"|",1 ++ tsw bStop6,1 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",5 ++ if(tTmp.txt=="disable") ++ { ++ bDown6.pco=27501 ++ spstr tId.txt,bDown6.txt,"|",2 ++ tsw bDown6,0 ++ }else if(tTmp.txt=="enable") ++ { ++ bDown6.pco=65535 ++ spstr tId.txt,bDown6.txt,"|",2 ++ tsw bDown6,1 ++ } ++ } ++ if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,1 ++ vis bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",38 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff6.val=sys0 ++ } ++ if(type6.txt=="text") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis bText6,1 ++ tsw bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ bText6.pco=65535 ++ bText6.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText6.txt,"~",38 ++ } ++ if(type6.txt=="button"||type6.txt=="input_sel") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis bText6,1 ++ tsw bText6,1 ++ vis hSlider6,0 ++ vis nNum6,0 ++ bText6.pco=1374 ++ bText6.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText6.txt,"~",38 ++ } ++ if(type6.txt=="number") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis bText6,0 ++ tsw bText6,0 ++ vis hSlider6,1 ++ vis nNum6,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText6.txt,"~",38 ++ //first value is current value ++ spstr bText6.txt,tTmp.txt,"|",0 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.val=sys0 ++ nNum6.val=sys0 ++ //second value is min value ++ spstr bText6.txt,tTmp.txt,"|",1 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.minval=sys0 ++ //third value is max value ++ spstr bText6.txt,tTmp.txt,"|",2 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.maxval=sys0 ++ } ++,18 +2681,14 @@ ++ { ++ page cardQR ++ } ++ if(tId.txt=="cardPower") ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ // get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ } ++ if(tInstruction.txt=="date") +I/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt +14 +609,18 @@ @@ -143,3 +551,20 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++15 +351,15 @@ ++ime ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : 21:32PP ++ Text : 21:32 ++ Max. Text Size : 15 ++ ++imeAdd ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index ae01290d..405c8482 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -139,6 +139,13 @@ Variable (string) entn5 Text : Max. Text Size: 80 +Variable (string) entn6 + Attributes + ID : 88 + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes ID : 27 @@ -188,6 +195,13 @@ Variable (string) type5 Text : Max. Text Size: 10 +Variable (string) type6 + Attributes + ID : 87 + Scope : local + Text : + Max. Text Size: 10 + Number nNum1 Attributes ID : 68 @@ -197,7 +211,7 @@ Number nNum1 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 77 + y coordinate : 87 Width : 46 Height : 50 Effect : load @@ -227,7 +241,7 @@ Number nNum2 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 154 + y coordinate : 155 Width : 46 Height : 50 Effect : load @@ -257,7 +271,7 @@ Number nNum3 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 232 + y coordinate : 222 Width : 45 Height : 50 Effect : load @@ -287,7 +301,7 @@ Number nNum4 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 311 + y coordinate : 289 Width : 44 Height : 50 Effect : load @@ -317,7 +331,37 @@ Number nNum5 Send Component ID : disabled Opacity : 127 x coordinate : 268 - y coordinate : 391 + y coordinate : 358 + Width : 44 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Value : 0 + Significant digits shown : all + Format : decimal + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Number nNum6 + Attributes + ID : 86 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 268 + y coordinate : 424 Width : 44 Height : 50 Effect : load @@ -347,7 +391,7 @@ Text tEntity1 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 76 + y coordinate : 86 Width : 115 Height : 53 Effect : load @@ -377,7 +421,7 @@ Text tEntity2 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 152 + y coordinate : 153 Width : 115 Height : 53 Effect : load @@ -407,7 +451,7 @@ Text tEntity3 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 230 + y coordinate : 220 Width : 115 Height : 53 Effect : load @@ -437,7 +481,7 @@ Text tEntity4 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 310 + y coordinate : 288 Width : 115 Height : 53 Effect : load @@ -467,7 +511,37 @@ Text tEntity5 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 390 + y coordinate : 357 + Width : 115 + Height : 53 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : tEntity5 + Max. Text Size : 30 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tEntity6 + Attributes + ID : 77 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 49 + y coordinate : 423 Width : 115 Height : 53 Effect : load @@ -527,7 +601,7 @@ Text tIcon1 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 84 + y coordinate : 94 Width : 33 Height : 30 Effect : load @@ -557,7 +631,7 @@ Text tIcon2 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 163 + y coordinate : 164 Width : 33 Height : 30 Effect : load @@ -587,7 +661,7 @@ Text tIcon3 Send Component ID : disabled Opacity : 127 x coordinate : 13 - y coordinate : 241 + y coordinate : 231 Width : 33 Height : 30 Effect : load @@ -617,7 +691,7 @@ Text tIcon4 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 321 + y coordinate : 299 Width : 32 Height : 30 Effect : load @@ -647,7 +721,37 @@ Text tIcon5 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 401 + y coordinate : 368 + Width : 33 + 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 : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon6 + Attributes + ID : 78 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 15 + y coordinate : 434 Width : 33 Height : 30 Effect : load @@ -784,7 +888,7 @@ Slider hSlider1 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 80 + y coordinate : 90 Width : 100 Height : 43 Effect : load @@ -827,7 +931,7 @@ Slider hSlider2 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 157 + y coordinate : 158 Width : 100 Height : 43 Effect : load @@ -870,7 +974,7 @@ Slider hSlider3 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 235 + y coordinate : 225 Width : 100 Height : 43 Effect : load @@ -913,7 +1017,7 @@ Slider hSlider4 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 314 + y coordinate : 292 Width : 100 Height : 43 Effect : load @@ -956,7 +1060,7 @@ Slider hSlider5 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 394 + y coordinate : 361 Width : 100 Height : 43 Effect : load @@ -990,6 +1094,49 @@ Slider hSlider5 prints tSend.txt,0 prints crcval,2 +Slider hSlider6 + Attributes + ID : 85 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 164 + y coordinate : 427 + Width : 100 + Height : 43 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID : 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + + Events + Touch Release Event + nNum5.val=hSlider5.val + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," + covx nNum5.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //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 bDown1 Attributes ID : 11 @@ -999,7 +1146,7 @@ Button bDown1 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 77 + y coordinate : 87 Width : 50 Height : 50 Effect : load @@ -1046,7 +1193,7 @@ Button bDown2 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 154 + y coordinate : 155 Width : 50 Height : 50 Effect : load @@ -1093,7 +1240,7 @@ Button bDown3 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 233 + y coordinate : 223 Width : 50 Height : 50 Effect : load @@ -1140,7 +1287,7 @@ Button bDown4 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 311 + y coordinate : 289 Width : 50 Height : 50 Effect : load @@ -1187,7 +1334,7 @@ Button bDown5 Send Component ID : disabled Opacity : 127 x coordinate : 268 - y coordinate : 391 + y coordinate : 358 Width : 50 Height : 50 Effect : load @@ -1225,6 +1372,53 @@ Button bDown5 prints tSend.txt,0 prints crcval,2 +Button bDown6 + Attributes + ID : 80 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 268 + y coordinate : 424 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + 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,"+entn6.txt+",down" + //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 bNext Attributes ID : 33 @@ -1342,7 +1536,7 @@ Button bStop1 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 77 + y coordinate : 87 Width : 50 Height : 50 Effect : load @@ -1389,7 +1583,7 @@ Button bStop2 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 154 + y coordinate : 155 Width : 50 Height : 50 Effect : load @@ -1436,7 +1630,7 @@ Button bStop3 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 232 + y coordinate : 222 Width : 50 Height : 50 Effect : load @@ -1483,7 +1677,7 @@ Button bStop4 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 311 + y coordinate : 289 Width : 50 Height : 50 Effect : load @@ -1530,7 +1724,7 @@ Button bStop5 Send Component ID : disabled Opacity : 127 x coordinate : 218 - y coordinate : 391 + y coordinate : 358 Width : 50 Height : 50 Effect : load @@ -1568,6 +1762,53 @@ Button bStop5 prints tSend.txt,0 prints crcval,2 +Button bStop6 + Attributes + ID : 79 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 218 + y coordinate : 424 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + 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,"+entn6.txt+",stop" + //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 bText1 Attributes ID : 36 @@ -1577,7 +1818,7 @@ Button bText1 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 76 + y coordinate : 86 Width : 145 Height : 53 Effect : load @@ -1624,7 +1865,7 @@ Button bText2 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 152 + y coordinate : 153 Width : 145 Height : 53 Effect : load @@ -1671,7 +1912,7 @@ Button bText3 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 230 + y coordinate : 220 Width : 145 Height : 53 Effect : load @@ -1718,7 +1959,7 @@ Button bText4 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 310 + y coordinate : 288 Width : 145 Height : 53 Effect : load @@ -1765,7 +2006,7 @@ Button bText5 Send Component ID : disabled Opacity : 127 x coordinate : 168 - y coordinate : 390 + y coordinate : 357 Width : 145 Height : 53 Effect : load @@ -1803,6 +2044,53 @@ Button bText5 prints tSend.txt,0 prints crcval,2 +Button bText6 + Attributes + ID : 83 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 168 + y coordinate : 423 + Width : 145 + Height : 53 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 1374 + Font Color (Pressed) : 65535 + Horizontal Alignment : right + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 45 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn6.txt+",button" + //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 bUp1 Attributes ID : 12 @@ -1812,7 +2100,7 @@ Button bUp1 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 77 + y coordinate : 87 Width : 50 Height : 50 Effect : load @@ -1859,7 +2147,7 @@ Button bUp2 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 154 + y coordinate : 155 Width : 50 Height : 50 Effect : load @@ -1906,7 +2194,7 @@ Button bUp3 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 232 + y coordinate : 222 Width : 50 Height : 50 Effect : load @@ -1953,7 +2241,7 @@ Button bUp4 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 311 + y coordinate : 289 Width : 50 Height : 50 Effect : load @@ -2000,7 +2288,7 @@ Button bUp5 Send Component ID : disabled Opacity : 127 x coordinate : 168 - y coordinate : 391 + y coordinate : 358 Width : 50 Height : 50 Effect : load @@ -2038,6 +2326,53 @@ Button bUp5 prints tSend.txt,0 prints crcval,2 +Button bUp6 + Attributes + ID : 81 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 168 + y coordinate : 424 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + 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,"+entn6.txt+",up" + //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 + Dual-state Button btOnOff1 Attributes ID : 23 @@ -2047,7 +2382,7 @@ Dual-state Button btOnOff1 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 77 + y coordinate : 87 Width : 50 Height : 50 Effect : load @@ -2092,7 +2427,7 @@ Dual-state Button btOnOff2 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 154 + y coordinate : 155 Width : 50 Height : 50 Effect : load @@ -2137,7 +2472,7 @@ Dual-state Button btOnOff3 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 232 + y coordinate : 222 Width : 50 Height : 50 Effect : load @@ -2182,7 +2517,7 @@ Dual-state Button btOnOff4 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 311 + y coordinate : 289 Width : 50 Height : 50 Effect : load @@ -2227,7 +2562,7 @@ Dual-state Button btOnOff5 Send Component ID : disabled Opacity : 127 x coordinate : 268 - y coordinate : 391 + y coordinate : 358 Width : 50 Height : 50 Effect : load @@ -2263,6 +2598,51 @@ Dual-state Button btOnOff5 prints tSend.txt,0 prints crcval,2 +Dual-state Button btOnOff6 + Attributes + ID : 82 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 268 + y coordinate : 424 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + 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,"+entn6.txt+",OnOff," + covx btOnOff5.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //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 : 42 @@ -2272,9 +2652,9 @@ Hotspot m0 Send Component ID : disabled Opacity : 127 x coordinate : 14 - y coordinate : 64 + y coordinate : 74 Width : 150 - Height : 75 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2312,9 +2692,9 @@ Hotspot m1 Send Component ID : disabled Opacity : 127 x coordinate : 14 - y coordinate : 142 + y coordinate : 143 Width : 150 - Height : 75 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2352,9 +2732,9 @@ Hotspot m2 Send Component ID : disabled Opacity : 127 x coordinate : 13 - y coordinate : 221 + y coordinate : 211 Width : 150 - Height : 71 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2392,9 +2772,9 @@ Hotspot m3 Send Component ID : disabled Opacity : 127 x coordinate : 16 - y coordinate : 302 + y coordinate : 280 Width : 150 - Height : 73 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2432,9 +2812,9 @@ Hotspot m4 Send Component ID : disabled Opacity : 127 x coordinate : 13 - y coordinate : 380 + y coordinate : 347 Width : 150 - Height : 73 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2463,6 +2843,46 @@ Hotspot m4 page popupInSel } +Hotspot m5 + Attributes + ID : 84 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 13 + y coordinate : 413 + Width : 150 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity6.txt + pageIcons.tTmp2.txt=entn6.txt + pageIcons.tTmp3.txt=tIcon6.txt + if(type6.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity5.txt + page popupShutter + } + if(type6.txt=="light") + { + //popupLight.tEntity.txt=tEntity5.txt + page popupLight + } + if(type6.txt=="fan") + { + page popupFan + } + if(type6.txt=="input_sel") + { + page popupInSel + } + Hotspot mSpecial Attributes ID : 34 @@ -3390,6 +3810,155 @@ Timer tmSerial covx tTmp.txt,sys0,0,0 hSlider5.maxval=sys0 } + // get Type + spstr strCommand.txt,type6.txt,"~",33 + // get internal name + spstr strCommand.txt,entn6.txt,"~",34 + if(type6.txt=="delete"||type6.txt=="") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis tEntity6,0 + vis tIcon6,0 + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 + }else + { + // change icon + spstr strCommand.txt,tIcon6.txt,"~",35 + vis tIcon6,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",36 + covx tTmp.txt,sys0,0,0 + tIcon6.pco=sys0 + // set name + spstr strCommand.txt,tEntity6.txt,"~",37 + vis tEntity6,1 + } + if(type6.txt=="shutter") + { + vis bUp6,1 + vis bStop6,1 + vis bDown6,1 + vis btOnOff6,0 + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",38 + // up button + spstr tId.txt,tTmp.txt,"|",3 + if(tTmp.txt=="disable") + { + bUp6.pco=27501 + spstr tId.txt,bUp6.txt,"|",0 + tsw bUp6,0 + }else if(tTmp.txt=="enable") + { + bUp6.pco=65535 + spstr tId.txt,bUp6.txt,"|",0 + tsw bUp6,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",4 + if(tTmp.txt=="disable") + { + bStop6.pco=27501 + spstr tId.txt,bStop6.txt,"|",1 + tsw bStop6,0 + }else if(tTmp.txt=="enable") + { + bStop6.pco=65535 + spstr tId.txt,bStop6.txt,"|",1 + tsw bStop6,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",5 + if(tTmp.txt=="disable") + { + bDown6.pco=27501 + spstr tId.txt,bDown6.txt,"|",2 + tsw bDown6,0 + }else if(tTmp.txt=="enable") + { + bDown6.pco=65535 + spstr tId.txt,bDown6.txt,"|",2 + tsw bDown6,1 + } + } + if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,1 + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",38 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } + if(type6.txt=="text") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis bText6,1 + tsw bText6,0 + vis hSlider6,0 + vis nNum6,0 + bText6.pco=65535 + bText6.pco2=65535 + // get Text (optional Value) + spstr strCommand.txt,bText6.txt,"~",38 + } + if(type6.txt=="button"||type6.txt=="input_sel") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis bText6,1 + tsw bText6,1 + vis hSlider6,0 + vis nNum6,0 + bText6.pco=1374 + bText6.pco2=1374 + // get Text (optional Value) + spstr strCommand.txt,bText6.txt,"~",38 + } + if(type6.txt=="number") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis bText6,0 + tsw bText6,0 + vis hSlider6,1 + vis nNum6,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText6.txt,"~",38 + //first value is current value + spstr bText6.txt,tTmp.txt,"|",0 + covx tTmp.txt,sys0,0,0 + hSlider6.val=sys0 + nNum6.val=sys0 + //second value is min value + spstr bText6.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider6.minval=sys0 + //third value is max value + spstr bText6.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } } if(tInstruction.txt=="pageType") { @@ -3455,10 +4024,6 @@ 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 0de12016..54f071b9 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 @@ -62,10 +62,6 @@ cardQR 32 Component(s) 425 Line(s) of event code 244 Unique line(s) of event code -cardEntities - 77 Component(s) - 1395 Line(s) of event code - 619 Unique line(s) of event code cardThermo 55 Component(s) 555 Line(s) of event code @@ -74,9 +70,13 @@ popupInSel 34 Component(s) 617 Line(s) of event code 295 Unique line(s) of event code +cardEntities + 89 Component(s) + 1608 Line(s) of event code + 692 Unique line(s) of event code Total 18 Page(s) - 640 Component(s) - 8055 Line(s) of event code - 2065 Unique line(s) of event code + 652 Component(s) + 8268 Line(s) of event code + 2128 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 2ba0c865..9f827f26 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -126,6 +126,12 @@ Variable (string) entn5 Text : Max. Text Size: 80 +Variable (string) entn6 + Attributes + Scope : local + Text : + Max. Text Size: 80 + Variable (string) strCommand Attributes Scope : local @@ -168,6 +174,12 @@ Variable (string) type5 Text : Max. Text Size: 10 +Variable (string) type6 + Attributes + Scope : local + Text : + Max. Text Size: 10 + Number nNum1 Attributes Scope : local @@ -213,6 +225,15 @@ Number nNum5 Associated Keyboard : none Value : 0 +Number nNum6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + Text tEntity1 Attributes Scope : local @@ -263,6 +284,16 @@ Text tEntity5 Text : tEntity5 Max. Text Size : 30 +Text tEntity6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity5 + Max. Text Size : 30 + Text tHeading Attributes Scope : local @@ -323,6 +354,16 @@ Text tIcon5 Text :  Max. Text Size : 5 +Text tIcon6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + Text tId Attributes Scope : local @@ -500,6 +541,34 @@ Slider hSlider5 prints tSend.txt,0 prints crcval,2 +Slider hSlider6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + + Events + Touch Release Event + nNum5.val=hSlider5.val + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," + covx nNum5.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //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 bDown1 Attributes Scope : local @@ -625,6 +694,31 @@ Button bDown5 prints tSend.txt,0 prints crcval,2 +Button bDown6 + 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,"+entn6.txt+",down" + //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 bNext Attributes Scope : local @@ -814,6 +908,31 @@ Button bStop5 prints tSend.txt,0 prints crcval,2 +Button bStop6 + 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,"+entn6.txt+",stop" + //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 bText1 Attributes Scope : local @@ -939,6 +1058,31 @@ Button bText5 prints tSend.txt,0 prints crcval,2 +Button bText6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 45 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn6.txt+",button" + //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 bUp1 Attributes Scope : local @@ -1064,6 +1208,31 @@ Button bUp5 prints tSend.txt,0 prints crcval,2 +Button bUp6 + 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,"+entn6.txt+",up" + //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 + Dual-state Button btOnOff1 Attributes Scope : local @@ -1199,6 +1368,33 @@ Dual-state Button btOnOff5 prints tSend.txt,0 prints crcval,2 +Dual-state Button btOnOff6 + 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,"+entn6.txt+",OnOff," + covx btOnOff5.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //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 @@ -1354,6 +1550,37 @@ Hotspot m4 page popupInSel } +Hotspot m5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity6.txt + pageIcons.tTmp2.txt=entn6.txt + pageIcons.tTmp3.txt=tIcon6.txt + if(type6.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity5.txt + page popupShutter + } + if(type6.txt=="light") + { + //popupLight.tEntity.txt=tEntity5.txt + page popupLight + } + if(type6.txt=="fan") + { + page popupFan + } + if(type6.txt=="input_sel") + { + page popupInSel + } + Hotspot mSpecial Attributes Scope : local @@ -2244,6 +2471,155 @@ Timer tmSerial covx tTmp.txt,sys0,0,0 hSlider5.maxval=sys0 } + // get Type + spstr strCommand.txt,type6.txt,"~",33 + // get internal name + spstr strCommand.txt,entn6.txt,"~",34 + if(type6.txt=="delete"||type6.txt=="") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis tEntity6,0 + vis tIcon6,0 + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 + }else + { + // change icon + spstr strCommand.txt,tIcon6.txt,"~",35 + vis tIcon6,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",36 + covx tTmp.txt,sys0,0,0 + tIcon6.pco=sys0 + // set name + spstr strCommand.txt,tEntity6.txt,"~",37 + vis tEntity6,1 + } + if(type6.txt=="shutter") + { + vis bUp6,1 + vis bStop6,1 + vis bDown6,1 + vis btOnOff6,0 + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",38 + // up button + spstr tId.txt,tTmp.txt,"|",3 + if(tTmp.txt=="disable") + { + bUp6.pco=27501 + spstr tId.txt,bUp6.txt,"|",0 + tsw bUp6,0 + }else if(tTmp.txt=="enable") + { + bUp6.pco=65535 + spstr tId.txt,bUp6.txt,"|",0 + tsw bUp6,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",4 + if(tTmp.txt=="disable") + { + bStop6.pco=27501 + spstr tId.txt,bStop6.txt,"|",1 + tsw bStop6,0 + }else if(tTmp.txt=="enable") + { + bStop6.pco=65535 + spstr tId.txt,bStop6.txt,"|",1 + tsw bStop6,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",5 + if(tTmp.txt=="disable") + { + bDown6.pco=27501 + spstr tId.txt,bDown6.txt,"|",2 + tsw bDown6,0 + }else if(tTmp.txt=="enable") + { + bDown6.pco=65535 + spstr tId.txt,bDown6.txt,"|",2 + tsw bDown6,1 + } + } + if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,1 + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",38 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } + if(type6.txt=="text") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis bText6,1 + tsw bText6,0 + vis hSlider6,0 + vis nNum6,0 + bText6.pco=65535 + bText6.pco2=65535 + // get Text (optional Value) + spstr strCommand.txt,bText6.txt,"~",38 + } + if(type6.txt=="button"||type6.txt=="input_sel") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis bText6,1 + tsw bText6,1 + vis hSlider6,0 + vis nNum6,0 + bText6.pco=1374 + bText6.pco2=1374 + // get Text (optional Value) + spstr strCommand.txt,bText6.txt,"~",38 + } + if(type6.txt=="number") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis btOnOff6,0 + vis bText6,0 + tsw bText6,0 + vis hSlider6,1 + vis nNum6,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText6.txt,"~",38 + //first value is current value + spstr bText6.txt,tTmp.txt,"|",0 + covx tTmp.txt,sys0,0,0 + hSlider6.val=sys0 + nNum6.val=sys0 + //second value is min value + spstr bText6.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider6.minval=sys0 + //third value is max value + spstr bText6.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } } if(tInstruction.txt=="pageType") { @@ -2309,10 +2685,6 @@ 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 b51da2a3..48df224e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,10 +18,6 @@ cardChart 31 Component(s) 452 Line(s) of event code 296 Unique line(s) of event code -screensaver - 47 Component(s) - 411 Line(s) of event code - 299 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -50,6 +46,10 @@ pageTest 21 Component(s) 66 Line(s) of event code 64 Unique line(s) of event code +screensaver + 47 Component(s) + 411 Line(s) of event code + 299 Unique line(s) of event code cardPower 43 Component(s) 439 Line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index e148844b..be1e7155 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -932,7 +932,7 @@ Text tTime Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 21:32 + Text : 21:32PP Max. Text Size : 15 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 5cff612e..7d19dbe9 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -374,7 +374,7 @@ Text tTime Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 21:32 + Text : 21:32PP Max. Text Size : 15 Text tTimeAdd