h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-28 13:20:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync us-p (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-04-29 14:58:15 +00:00
committed by github-actions[bot]
parent db6c1a2864
commit a380f19526
7 changed files with 762 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

296
HMI/US/portrait/diff-eu-version.txt
View File

@@ -2,7 +2,7 @@
+++ HMI/US/portrait/n2t-out +++ HMI/US/portrait/n2t-out
│ --- HMI/n2t-out/Program.s.txt │ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -10,11 +10,10 @@ │ @@ -10,11 +10,11 @@
│ int sleepValue=0 │ int sleepValue=0
│ // dim value │ // dim value
│ int dimValue=40 │ int dimValue=40
@@ -12,9 +12,9 @@
│ int defaultBcoColor=6371 │ int defaultBcoColor=6371
│ - // fix touch offset │ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020 │ - 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) │ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020 │ + //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 │ page pageStartup
│ --- HMI/n2t-out/cardEntities.txt │ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
@@ -2197,27 +2197,7 @@
│ //send cmd │ //send cmd
│ --- HMI/n2t-out/popupLight.txt │ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt ├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -1,31 +1,33 @@ │ @@ -12,20 +12,21 @@
│ 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
│
│ Events │ Events
│ Preinitialize Event │ Preinitialize Event
│ dim=dimValueNormal │ dim=dimValueNormal
@@ -2240,7 +2220,7 @@
│ //send calc crc │ //send calc crc
│ btlen tSend.txt,sys0 │ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC │ crcrest 1,0xffff // reset CRC
│ @@ -34,24 +36,24 @@ │ @@ -34,24 +35,24 @@
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ printh 55 bb │ printh 55 bb
@@ -2271,7 +2251,7 @@
│ { │ {
│ if(b[sys0].type==98||b[sys0].type==116) │ if(b[sys0].type==98||b[sys0].type==116)
│ { │ {
│ @@ -62,26 +64,22 @@ │ @@ -62,26 +63,22 @@
│ { │ {
│ b[sys0].pic=10 │ b[sys0].pic=10
│ b[sys0].pic2=11 │ b[sys0].pic2=11
@@ -2303,7 +2283,7 @@
│ Max. Text Size: 80 │ Max. Text Size: 80
│ │
│ Variable (int32) mode │ Variable (int32) mode
│ @@ -96,52 +94,133 @@ │ @@ -96,47 +93,116 @@
│ │
│ Variable (string) strCommand │ Variable (string) strCommand
│ Attributes │ Attributes
@@ -2312,52 +2292,47 @@
│ Max. Text Size: 500 │ Max. Text Size: 500
│ │
│ -Variable (string) tId │ -Variable (string) tId
│ - Attributes │ +Variable (string) tSend
│ - Scope : local
│ - Text :
│ - Max. Text Size: 20
│ -
│ -Variable (string) tInstruction
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 20
│ -
│ Variable (string) tSend
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ Text : │ Text :
│ Max. Text Size: 200 │ - Max. Text Size: 20
│ + Max. Text Size: 200
│
│ -Variable (string) tInstruction
│ +Text t0
│ Attributes
│ - Scope : local
│ - Text :
│ - 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
│ - 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 │ -Variable (string) tTmp
│ +Text t0 │ +Text t2
│ Attributes │ Attributes
│ - Scope : local │ - Scope : local
│ - Text : │ - Text :
│ - Max. Text Size: 80 │ - Max. Text Size: 80
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled
│ + Associated Keyboard : none
│ + Text : Color
│ + Max. Text Size : 50
│ +
│ +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
│ +
│ +Text t2
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled │ + Send Component ID : disabled
│ + Associated Keyboard: none │ + Associated Keyboard: none
│ + Text :  │ + Text : 
@@ -2367,7 +2342,6 @@
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled │ + Send Component ID : disabled
│ + Associated Keyboard: none │ + Associated Keyboard: none
│ + Text :  │ + Text : 
@@ -2377,7 +2351,6 @@
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled │ + Send Component ID : disabled
│ + Associated Keyboard: none │ + Associated Keyboard: none
│ + Text : Temperature │ + Text : Temperature
@@ -2385,25 +2358,17 @@
│ │
│ Text tEntity │ Text tEntity
│ Attributes │ Attributes
│ - Scope : local │ Scope : local
│ - Dragging : 0 │ Dragging : 0
│ - Send Component ID : disabled │ Send Component ID : disabled
│ - Associated Keyboard: none │ Associated Keyboard: none
│ - Text : tEntity1 │ Text : tEntity1
│ - Max. Text Size : 25 │ 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
│ +
│ +Text tIcon1 │ +Text tIcon1
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled │ + Send Component ID : disabled
│ + Associated Keyboard: none │ + Associated Keyboard: none
│ + Text :  │ + Text : 
@@ -2413,7 +2378,6 @@
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled │ + Send Component ID : disabled
│ + Associated Keyboard: none │ + Associated Keyboard: none
│ + Text : │ + Text :
@@ -2423,7 +2387,6 @@
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled │ + Send Component ID : disabled
│ + Associated Keyboard: none │ + Associated Keyboard: none
│ + Text : │ + Text :
@@ -2433,7 +2396,6 @@
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled │ + Send Component ID : disabled
│ + Associated Keyboard: none │ + Associated Keyboard: none
│ + Text : │ + Text :
@@ -2443,46 +2405,20 @@
│ + Attributes │ + Attributes
│ + Scope : local │ + Scope : local
│ + Dragging : 0 │ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID: disabled │ + Send Component ID: disabled
│ │ +
│ Picture pColorWheel │ Picture pColorWheel
│ Attributes │ Attributes
│ - Scope : local │ Scope : local
│ - Dragging : 0 │ Dragging : 0
│ - Send Component ID: disabled │ Send Component ID: disabled
│ + Scope : local
│ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled
│ │
│ Events │ Events
│ Touch Press Event │ @@ -174,28 +240,14 @@
│ //craft command │ Send Component ID: disabled
│ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," │ Position : 50
│ sys0=tch0 │ Upper range limit: 100
│ sys0=sys0-pColorWheel.x │ Lower range limit: 0
│ @@ -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
│ │
│ Events │ Events
│ Touch Release Event │ Touch Release Event
@@ -2507,85 +2443,7 @@
│ covx hBrightness.val,tTmp.txt,0,0 │ covx hBrightness.val,tTmp.txt,0,0
│ tSend.txt+=tTmp.txt │ tSend.txt+=tTmp.txt
│ //send calc crc │ //send calc crc
│ @@ -208,20 +274,21 @@ │ @@ -276,27 +328,27 @@
│ 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
│ Touch Press Event │ Touch Press Event
│ if(mode.val==1) │ if(mode.val==1)
│ { │ {
@@ -2616,19 +2474,10 @@
│ │
│ Button bEffect │ Button bEffect
│ Attributes │ Attributes
│ - Scope : local │ Scope : local
│ - Dragging : 0 │ @@ -306,14 +358,15 @@
│ - Send Component ID: disabled │ Text : 
│ - State : unpressed │ Max. Text Size : 10
│ - 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 │ Events
│ Touch Press Event │ Touch Press Event
@@ -2639,27 +2488,10 @@
│ │
│ Dual-state Button btOnOff1 │ Dual-state Button btOnOff1
│ Attributes │ Attributes
│ - Scope : local │ Scope : local
│ - Dragging : 0 │ Dragging : 0
│ - Send Component ID: disabled │ Send Component ID: disabled
│ - State : unpressed │ @@ -345,38 +398,14 @@
│ - 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 @@
│ Period (ms): 100 │ Period (ms): 100
│ Enabled : no │ Enabled : no
│ │
@@ -2698,7 +2530,7 @@
│ Enabled : yes │ Enabled : yes
│ │
│ Events │ 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) │ // 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,tInstruction.txt,"~",0
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
@@ -2759,7 +2591,7 @@
│ // switch mode │ // switch mode
│ click bColor,1 │ click bColor,1
│ click bColor,0 │ click bColor,0
│ @@ -481,16 +529,16 @@ │ @@ -481,16 +510,16 @@
│ click bColor,1 │ click bColor,1
│ click bColor,0 │ click bColor,0
│ } │ }
@@ -2778,7 +2610,7 @@
│ } │ }
│ // mode == 0 is rgb controls currently shown │ // mode == 0 is rgb controls currently shown
│ if(mode.val==0) │ if(mode.val==0)
│ @@ -501,36 +549,36 @@ │ @@ -501,36 +530,36 @@
│ } │ }
│ } │ }
│ // get Color value │ // get Color value

248
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,7 +1,7 @@
+++ /dev/fd/62 2023-04-29 14:51:43.982371793 +0000 +++ /dev/fd/62 2023-04-29 14:58:06.204485629 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@ +1 +10,11 @@
+nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port +nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
+I/n2t-out/cardEntities.txt +I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt
@@ -1587,27 +1587,7 @@
+ //send cmd + //send cmd
+I/n2t-out/popupLight.txt +I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt ++ HMI/US/portrait/n2t-out/popupLight.txt
+ +1,33 @@ +0 +12,21 @@
+pupLight
+ributes
+ 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
+
+nts +nts
+ Preinitialize Event + Preinitialize Event
+ dim=dimValueNormal + dim=dimValueNormal
@@ -1630,7 +1610,7 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+4 +36,24 @@ +4 +35,24 @@
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -1661,7 +1641,7 @@
+ { + {
+ if(b[sys0].type==98||b[sys0].type==116) + if(b[sys0].type==98||b[sys0].type==116)
+ { + {
+6 +64,22 @@ +6 +63,22 @@
+ { + {
+ b[sys0].pic=10 + b[sys0].pic=10
+ b[sys0].pic2=11 + b[sys0].pic2=11
@@ -1693,7 +1673,7 @@
+ Max. Text Size: 80 + Max. Text Size: 80
+ +
+e (int32) mode +e (int32) mode
+2 +94,133 @@ +7 +93,116 @@
+ +
+e (string) strCommand +e (string) strCommand
+ributes +ributes
@@ -1702,23 +1682,39 @@
+ Max. Text Size: 500 + Max. Text Size: 500
+ +
+e (string) tId +e (string) tId
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+
+e (string) tInstruction
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+
+e (string) tSend +e (string) tSend
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 20
+ Max. Text Size: 200 + Max. Text Size: 200
+ +
+e (string) tInstruction
+
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : Color
+ Max. Text Size : 50
+
+e (string) tSend
+
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 200
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : Brightness
+ Max. Text Size : 50
+
+e (string) tTmp +e (string) tTmp
+ +
+ributes +ributes
@@ -1727,27 +1723,6 @@
+ Max. Text Size: 80 + Max. Text Size: 80
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : Color
+ Max. Text Size : 50
+
+
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : Brightness
+ Max. Text Size : 50
+
+
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text :  + Text : 
@@ -1757,7 +1732,6 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text :  + Text : 
@@ -1767,7 +1741,6 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : Temperature + Text : Temperature
@@ -1781,19 +1754,11 @@
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : tEntity1 + Text : tEntity1
+ Max. Text Size : 25 + 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
+ +
+con1 +con1
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text :  + Text : 
@@ -1803,7 +1768,6 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : + Text :
@@ -1813,7 +1777,6 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : + Text :
@@ -1823,7 +1786,6 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : + Text :
@@ -1833,7 +1795,6 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID: disabled + Send Component ID: disabled
+ +
+ pColorWheel + pColorWheel
@@ -1841,34 +1802,9 @@
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Send Component ID: disabled + Send Component ID: disabled
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ +
+nts +nts
+ Touch Press Event +28 +240,14 @@
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel,"
+ sys0=tch0
+ sys0=sys0-pColorWheel.x
+37 +244,24 @@
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
+hBrightness
+ributes
+ 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 + Send Component ID: disabled
+ Position : 50 + Position : 50
+ Upper range limit: 100 + Upper range limit: 100
@@ -1897,85 +1833,7 @@
+ covx hBrightness.val,tTmp.txt,0,0 + covx hBrightness.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt + tSend.txt+=tTmp.txt
+ //send calc crc + //send calc crc
+20 +274,21 @@ +27 +328,27 @@
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
+hTempSlider
+ributes
+ 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
+
+nts
+ Touch Release Event
+ tmCooldown.en=1
+ tmCooldown.tim=2500
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
+20 +304,21 @@
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
+b0
+ributes
+ 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
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+69 +329,73 @@
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
+bColor
+ributes
+ 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
+
+nts
+ Touch Press Event + Touch Press Event
+ if(mode.val==1) + if(mode.val==1)
+ { + {
@@ -2007,16 +1865,7 @@
+bEffect +bEffect
+ributes +ributes
+ Scope : local + Scope : local
+ Dragging : 0 +14 +358,15 @@
+ 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 :  + Text : 
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
@@ -2032,24 +1881,7 @@
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Send Component ID: disabled + Send Component ID: disabled
+ State : unpressed +38 +398,14 @@
+ 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
+
+nts
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff,"
+ covx btOnOff1.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
+38 +417,14 @@
+ Period (ms): 100 + Period (ms): 100
+ Enabled : no + Enabled : no
+ +
@@ -2088,7 +1920,7 @@
+ Enabled : yes + Enabled : yes
+ +
+nts +nts
+48 +473,48 @@ +48 +454,48 @@
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) + // 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,tInstruction.txt,"~",0
+ spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",1
@@ -2149,7 +1981,7 @@
+ // switch mode + // switch mode
+ click bColor,1 + click bColor,1
+ click bColor,0 + click bColor,0
+16 +529,16 @@ +16 +510,16 @@
+ click bColor,1 + click bColor,1
+ click bColor,0 + click bColor,0
+ } + }
@@ -2168,7 +2000,7 @@
+ } + }
+ // mode == 0 is rgb controls currently shown + // mode == 0 is rgb controls currently shown
+ if(mode.val==0) + if(mode.val==0)
+36 +549,36 @@ +36 +530,36 @@
+ } + }
+ } + }
+ // get Color value + // get Color value

1
HMI/US/portrait/n2t-out-visual/Program.s.txt
View File

@@ -16,4 +16,5 @@ Program.s
int defaultBcoColor=6371 int defaultBcoColor=6371
// fix touch offset (Removed for US version) // fix touch offset (Removed for US version)
//lcd_dev fffb 0002 0000 0020 //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 page pageStartup

10
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -1,7 +1,7 @@
Program.s Program.s
0 Component(s) 0 Component(s)
12 Line(s) of event code 13 Line(s) of event code
12 Unique line(s) of event code 13 Unique line(s) of event code
pageIcons pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
@@ -88,7 +88,7 @@ cardEntities
703 Unique line(s) of event code 703 Unique line(s) of event code
Total Total
21 Page(s) 22 Page(s)
811 Component(s) 811 Component(s)
9628 Line(s) of event code 9629 Line(s) of event code
2453 Unique line(s) of event code 2454 Unique line(s) of event code

23
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -3,7 +3,6 @@ Page popupLight
ID : 0 ID : 0
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
Width : 320 Width : 320
@@ -122,7 +121,6 @@ Text t0
ID : 24 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
@@ -152,7 +150,6 @@ Text t1
ID : 6 ID : 6
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 60 x coordinate : 60
@@ -182,7 +179,6 @@ Text t2
ID : 9 ID : 9
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 10 x coordinate : 10
@@ -212,7 +208,6 @@ Text t3
ID : 10 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 10 x coordinate : 10
@@ -242,7 +237,6 @@ Text t4
ID : 11 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 60 x coordinate : 60
@@ -272,7 +266,6 @@ Text tEntity
ID : 3 ID : 3
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 60 x coordinate : 60
@@ -302,7 +295,6 @@ Text tIcon1
ID : 4 ID : 4
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 11 x coordinate : 11
@@ -332,7 +324,6 @@ Text tId
ID : 18 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 100 x coordinate : 100
@@ -362,7 +353,6 @@ Text tInstruction
ID : 17 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
@@ -392,7 +382,6 @@ Text tTmp
ID : 12 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 282 x coordinate : 282
@@ -422,7 +411,6 @@ Picture p0
ID : 1 ID : 1
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
@@ -439,7 +427,6 @@ Picture pColorWheel
ID : 2 ID : 2
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
Opacity : 127 Opacity : 127
x coordinate : 67 x coordinate : 67
@@ -484,7 +471,6 @@ Slider hBrightness
ID : 7 ID : 7
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
@@ -529,13 +515,12 @@ Slider hTempSlider
ID : 19 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 304 y coordinate : 304
Width : 300 Width : 100
Height : 44 Height : 25
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -574,7 +559,6 @@ Button b0
ID : 5 ID : 5
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 266 x coordinate : 266
@@ -621,7 +605,6 @@ Button bColor
ID : 21 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
@@ -678,7 +661,6 @@ Button bEffect
ID : 27 ID : 27
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
@@ -717,7 +699,6 @@ Dual-state Button btOnOff1
ID : 8 ID : 8
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12

1
HMI/US/portrait/n2t-out/Program.s.txt
View File

@@ -16,4 +16,5 @@ Program.s
int defaultBcoColor=6371 int defaultBcoColor=6371
// fix touch offset (Removed for US version) // fix touch offset (Removed for US version)
//lcd_dev fffb 0002 0000 0020 //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 page pageStartup

19
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -2,7 +2,6 @@ Page popupLight
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Locked : no Locked : no
Swide up page ID : disabled Swide up page ID : disabled
@@ -108,7 +107,6 @@ Text t0
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Color Text : Color
@@ -118,7 +116,6 @@ Text t1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Brightness Text : Brightness
@@ -128,7 +125,6 @@ Text t2
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text :  Text : 
@@ -138,7 +134,6 @@ Text t3
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text :  Text : 
@@ -148,7 +143,6 @@ Text t4
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Temperature Text : Temperature
@@ -158,7 +152,6 @@ Text tEntity
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : tEntity1 Text : tEntity1
@@ -168,7 +161,6 @@ Text tIcon1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text :  Text : 
@@ -178,7 +170,6 @@ Text tId
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Text :
@@ -188,7 +179,6 @@ Text tInstruction
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Text :
@@ -198,7 +188,6 @@ Text tTmp
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Text :
@@ -208,14 +197,12 @@ Picture p0
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
Picture pColorWheel Picture pColorWheel
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
Events Events
@@ -250,7 +237,6 @@ Slider hBrightness
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
Position : 50 Position : 50
Upper range limit: 100 Upper range limit: 100
@@ -280,7 +266,6 @@ Slider hTempSlider
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
Position : 50 Position : 50
Upper range limit: 100 Upper range limit: 100
@@ -310,7 +295,6 @@ Button b0
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
State : unpressed State : unpressed
Text :  Text : 
@@ -335,7 +319,6 @@ Button bColor
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
State : unpressed State : unpressed
Text :  Text : 
@@ -370,7 +353,6 @@ Button bEffect
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
State : unpressed State : unpressed
Text :  Text : 
@@ -387,7 +369,6 @@ Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled Send Component ID: disabled
State : unpressed State : unpressed
Text : Text :