mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-26 19:02:15 +01:00
sync us-p (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
db6c1a2864
commit
a380f19526
@@ -2,7 +2,7 @@
|
||||
+++ HMI/US/portrait/n2t-out
|
||||
│ --- HMI/n2t-out/Program.s.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
│ @@ -10,11 +10,10 @@
|
||||
│ @@ -10,11 +10,11 @@
|
||||
│ int sleepValue=0
|
||||
│ // dim value
|
||||
│ int dimValue=40
|
||||
@@ -12,9 +12,9 @@
|
||||
│ int defaultBcoColor=6371
|
||||
│ - // fix touch offset
|
||||
│ - lcd_dev fffb 0002 0000 0020
|
||||
│ - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
|
||||
│ + // fix touch offset (Removed for US version)
|
||||
│ + //lcd_dev fffb 0002 0000 0020
|
||||
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
|
||||
│ page pageStartup
|
||||
│ --- HMI/n2t-out/cardEntities.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
@@ -2197,27 +2197,7 @@
|
||||
│ //send cmd
|
||||
│ --- HMI/n2t-out/popupLight.txt
|
||||
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
|
||||
│ @@ -1,31 +1,33 @@
|
||||
│ Page popupLight
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - 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
|
||||
│ + 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
|
||||
│
|
||||
│ @@ -12,20 +12,21 @@
|
||||
│ Events
|
||||
│ Preinitialize Event
|
||||
│ dim=dimValueNormal
|
||||
@@ -2240,7 +2220,7 @@
|
||||
│ //send calc crc
|
||||
│ btlen tSend.txt,sys0
|
||||
│ crcrest 1,0xffff // reset CRC
|
||||
│ @@ -34,24 +36,24 @@
|
||||
│ @@ -34,24 +35,24 @@
|
||||
│ crcputs tSend.txt,0
|
||||
│ //send cmd
|
||||
│ printh 55 bb
|
||||
@@ -2271,7 +2251,7 @@
|
||||
│ {
|
||||
│ if(b[sys0].type==98||b[sys0].type==116)
|
||||
│ {
|
||||
│ @@ -62,26 +64,22 @@
|
||||
│ @@ -62,26 +63,22 @@
|
||||
│ {
|
||||
│ b[sys0].pic=10
|
||||
│ b[sys0].pic2=11
|
||||
@@ -2303,7 +2283,7 @@
|
||||
│ Max. Text Size: 80
|
||||
│
|
||||
│ Variable (int32) mode
|
||||
│ @@ -96,52 +94,133 @@
|
||||
│ @@ -96,47 +93,116 @@
|
||||
│
|
||||
│ Variable (string) strCommand
|
||||
│ Attributes
|
||||
@@ -2312,177 +2292,133 @@
|
||||
│ Max. Text Size: 500
|
||||
│
|
||||
│ -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
|
||||
│ +Variable (string) tSend
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
│ Text :
|
||||
│ Max. Text Size: 200
|
||||
│ - Max. Text Size: 20
|
||||
│ + Max. Text Size: 200
|
||||
│
|
||||
│ -Variable (string) tTmp
|
||||
│ -Variable (string) tInstruction
|
||||
│ +Text t0
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Text :
|
||||
│ - Max. Text Size: 80
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text : Color
|
||||
│ + Max. Text Size : 50
|
||||
│ +
|
||||
│ - Max. Text Size: 20
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text : Color
|
||||
│ + Max. Text Size : 50
|
||||
│
|
||||
│ -Variable (string) tSend
|
||||
│ +Text t1
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text : Brightness
|
||||
│ + Max. Text Size : 50
|
||||
│ +
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Text :
|
||||
│ - Max. Text Size: 200
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text : Brightness
|
||||
│ + Max. Text Size : 50
|
||||
│
|
||||
│ -Variable (string) tTmp
|
||||
│ +Text t2
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text : î
|
||||
│ + Max. Text Size : 10
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Text :
|
||||
│ - Max. Text Size: 80
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text : î
|
||||
│ + Max. Text Size : 10
|
||||
│ +
|
||||
│ +Text t3
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text : î
|
||||
│ + Max. Text Size : 10
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text : î
|
||||
│ + Max. Text Size : 10
|
||||
│ +
|
||||
│ +Text t4
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text : Temperature
|
||||
│ + Max. Text Size : 50
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text : Temperature
|
||||
│ + Max. Text Size : 50
|
||||
│
|
||||
│ Text tEntity
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID : disabled
|
||||
│ - Associated Keyboard: none
|
||||
│ - Text : tEntity1
|
||||
│ - Max. Text Size : 25
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text : tEntity1
|
||||
│ + Max. Text Size : 25
|
||||
│ +
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard: none
|
||||
│ Text : tEntity1
|
||||
│ Max. Text Size : 25
|
||||
│
|
||||
│ +Text tIcon1
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text : î´
|
||||
│ + Max. Text Size : 10
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text : î´
|
||||
│ + Max. Text Size : 10
|
||||
│ +
|
||||
│ +Text tId
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text :
|
||||
│ + Max. Text Size : 20
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text :
|
||||
│ + Max. Text Size : 20
|
||||
│ +
|
||||
│ +Text tInstruction
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text :
|
||||
│ + Max. Text Size : 20
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text :
|
||||
│ + Max. Text Size : 20
|
||||
│ +
|
||||
│ +Text tTmp
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard : none
|
||||
│ + Text :
|
||||
│ + Max. Text Size : 80
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Associated Keyboard: none
|
||||
│ + Text :
|
||||
│ + Max. Text Size : 80
|
||||
│ +
|
||||
│ +Picture p0
|
||||
│ + Attributes
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Send Component ID: disabled
|
||||
│ +
|
||||
│ Picture pColorWheel
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID: disabled
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Send Component ID: disabled
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
│ //craft command
|
||||
│ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel,"
|
||||
│ sys0=tch0
|
||||
│ sys0=sys0-pColorWheel.x
|
||||
│ @@ -165,37 +244,24 @@
|
||||
│ printh 55 bb
|
||||
│ prints sys0,2
|
||||
│ prints tSend.txt,0
|
||||
│ prints crcval,2
|
||||
│
|
||||
│ Slider hBrightness
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID: disabled
|
||||
│ - Position : 50
|
||||
│ - Upper range limit: 100
|
||||
│ - Lower range limit: 0
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + Position : 50
|
||||
│ + Upper range limit : 100
|
||||
│ + Lower range limit : 0
|
||||
│ @@ -174,28 +240,14 @@
|
||||
│ Send Component ID: disabled
|
||||
│ Position : 50
|
||||
│ Upper range limit: 100
|
||||
│ Lower range limit: 0
|
||||
│
|
||||
│ Events
|
||||
│ Touch Release Event
|
||||
@@ -2507,85 +2443,7 @@
|
||||
│ covx hBrightness.val,tTmp.txt,0,0
|
||||
│ tSend.txt+=tTmp.txt
|
||||
│ //send calc crc
|
||||
│ @@ -208,20 +274,21 @@
|
||||
│ printh 55 bb
|
||||
│ prints sys0,2
|
||||
│ prints tSend.txt,0
|
||||
│ prints crcval,2
|
||||
│
|
||||
│ Slider hTempSlider
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID: disabled
|
||||
│ - Position : 50
|
||||
│ - Upper range limit: 100
|
||||
│ - Lower range limit: 0
|
||||
│ + 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
|
||||
│ tmCooldown.en=1
|
||||
│ tmCooldown.tim=2500
|
||||
│ //craft command
|
||||
│ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
|
||||
│ @@ -237,20 +304,21 @@
|
||||
│ printh 55 bb
|
||||
│ prints sys0,2
|
||||
│ prints tSend.txt,0
|
||||
│ prints crcval,2
|
||||
│
|
||||
│ Button b0
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID: disabled
|
||||
│ - State : unpressed
|
||||
│ - Text : î
|
||||
│ - Max. Text Size : 10
|
||||
│ + 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,popupLight,bExit"
|
||||
│ //send calc crc
|
||||
│ btlen tSend.txt,sys0
|
||||
│ crcrest 1,0xffff // reset CRC
|
||||
│ @@ -261,69 +329,73 @@
|
||||
│ printh 55 bb
|
||||
│ prints sys0,2
|
||||
│ prints tSend.txt,0
|
||||
│ prints crcval,2
|
||||
│
|
||||
│ Button bColor
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID: disabled
|
||||
│ - State : unpressed
|
||||
│ - Text : î
|
||||
│ - Max. Text Size : 10
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + State : unpressed
|
||||
│ + Text : î
|
||||
│ + Max. Text Size : 10
|
||||
│
|
||||
│ Events
|
||||
│ @@ -276,27 +328,27 @@
|
||||
│ Touch Press Event
|
||||
│ if(mode.val==1)
|
||||
│ {
|
||||
@@ -2616,19 +2474,10 @@
|
||||
│
|
||||
│ Button bEffect
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID: disabled
|
||||
│ - State : unpressed
|
||||
│ - Text : 
|
||||
│ - Max. Text Size : 10
|
||||
│ + Scope : local
|
||||
│ + Dragging : 0
|
||||
│ + Disable release event after dragging: 0
|
||||
│ + Send Component ID : disabled
|
||||
│ + State : unpressed
|
||||
│ + Text : 
|
||||
│ + Max. Text Size : 10
|
||||
│ Scope : local
|
||||
│ @@ -306,14 +358,15 @@
|
||||
│ Text : 
|
||||
│ Max. Text Size : 10
|
||||
│
|
||||
│ Events
|
||||
│ Touch Press Event
|
||||
@@ -2639,27 +2488,10 @@
|
||||
│
|
||||
│ Dual-state Button btOnOff1
|
||||
│ Attributes
|
||||
│ - Scope : local
|
||||
│ - Dragging : 0
|
||||
│ - Send Component ID: disabled
|
||||
│ - State : unpressed
|
||||
│ - Text :
|
||||
│ - Max. Text Size : 10
|
||||
│ + 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
|
||||
│ //craft command
|
||||
│ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff,"
|
||||
│ covx btOnOff1.val,tTmp.txt,0,0
|
||||
│ tSend.txt+=tTmp.txt
|
||||
│ @@ -345,38 +417,14 @@
|
||||
│ Scope : local
|
||||
│ Dragging : 0
|
||||
│ Send Component ID: disabled
|
||||
│ @@ -345,38 +398,14 @@
|
||||
│ Period (ms): 100
|
||||
│ Enabled : no
|
||||
│
|
||||
@@ -2698,7 +2530,7 @@
|
||||
│ Enabled : yes
|
||||
│
|
||||
│ Events
|
||||
│ @@ -425,48 +473,48 @@
|
||||
│ @@ -425,48 +454,48 @@
|
||||
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
||||
│ spstr strCommand.txt,tInstruction.txt,"~",0
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
@@ -2759,7 +2591,7 @@
|
||||
│ // switch mode
|
||||
│ click bColor,1
|
||||
│ click bColor,0
|
||||
│ @@ -481,16 +529,16 @@
|
||||
│ @@ -481,16 +510,16 @@
|
||||
│ click bColor,1
|
||||
│ click bColor,0
|
||||
│ }
|
||||
@@ -2778,7 +2610,7 @@
|
||||
│ }
|
||||
│ // mode == 0 is rgb controls currently shown
|
||||
│ if(mode.val==0)
|
||||
│ @@ -501,36 +549,36 @@
|
||||
│ @@ -501,36 +530,36 @@
|
||||
│ }
|
||||
│ }
|
||||
│ // get Color value
|
||||
|
||||
Reference in New Issue
Block a user