sync (add nextion2text)

This commit is contained in:
joBr99
2022-12-19 22:17:08 +00:00
committed by github-actions[bot]
parent 591f950bb4
commit 1c5381ede6
11 changed files with 1873 additions and 99 deletions

View File

@@ -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