Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2023-05-13 11:02:21 +00:00
committed by github-actions[bot]
parent fae0e88279
commit 7b21e0250c
9 changed files with 1274 additions and 1365 deletions

View File

@@ -1395,6 +1395,23 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ @@ -141,15 +135,15 @@
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ - Text : 50
│ + Text : 51
│ Max. Text Size : 10
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -164,15 +158,15 @@
│ Max. Text Size : 10
@@ -1412,44 +1429,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/portrait/n2t-out/popupFan.txt
│ @@ -200,15 +200,15 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupFan,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/portrait/n2t-out/popupInSel.txt
│ @@ -153,15 +153,15 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupInSel,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-05-13 10:11:16.737208392 +0000
+++ /dev/fd/62 2023-05-13 11:02:12.827868620 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@
@@ -57,13 +57,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+14 +185,26 @@
+e (string) type6
@@ -948,46 +948,25 @@
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+15 +135,15 @@
+
+ersion
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : 50
+ Text : 51
+ Max. Text Size : 10
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+15 +158,15 @@
+ Max. Text Size : 10
+I/n2t-out/popupFan.txt
++ HMI/US/portrait/n2t-out/popupFan.txt
+15 +200,15 @@
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupFan,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/popupInSel.txt
++ HMI/US/portrait/n2t-out/popupInSel.txt
+15 +153,15 @@
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupInSel,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +28,14 @@

View File

@@ -10,6 +10,10 @@ pageTest
14 Component(s)
14 Line(s) of event code
14 Unique line(s) of event code
pageStartup
19 Component(s)
189 Line(s) of event code
133 Unique line(s) of event code
popupLight
23 Component(s)
406 Line(s) of event code
@@ -22,6 +26,10 @@ popupFan
27 Component(s)
351 Line(s) of event code
204 Unique line(s) of event code
popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
popupThermo
44 Component(s)
519 Line(s) of event code
@@ -54,10 +62,6 @@ cardLChart
33 Component(s)
398 Line(s) of event code
264 Unique line(s) of event code
pageStartup
19 Component(s)
189 Line(s) of event code
133 Unique line(s) of event code
popupNotify
19 Component(s)
263 Line(s) of event code
@@ -74,10 +78,6 @@ cardGrid
44 Component(s)
519 Line(s) of event code
293 Unique line(s) of event code
popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
cardEntities
91 Component(s)
1626 Line(s) of event code
@@ -91,4 +91,4 @@ Total
22 Page(s)
806 Component(s)
9627 Line(s) of event code
2447 Unique line(s) of event code
2449 Unique line(s) of event code

View File

@@ -3,7 +3,6 @@ Page pageStartup
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 320
@@ -53,7 +52,6 @@ Number frame_ptr
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 6
@@ -83,7 +81,6 @@ Number frapic_w
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 6
@@ -113,7 +110,6 @@ Number spinner_w
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 6
@@ -143,7 +139,6 @@ Number usual_cnt
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 7
@@ -173,7 +168,6 @@ Text tId
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
@@ -203,7 +197,6 @@ Text tInstruction
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 163
@@ -233,7 +226,6 @@ Text tMsg1
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
@@ -263,7 +255,6 @@ Text tMsg2
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
@@ -293,7 +284,6 @@ Text tMsg3
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
@@ -323,7 +313,6 @@ Text tSend
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
@@ -353,7 +342,6 @@ Text tTmp
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 127
@@ -383,7 +371,6 @@ Text tVersion
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 240
@@ -402,7 +389,7 @@ Text tVersion
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 50
Text : 51
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -413,7 +400,6 @@ Picture p0
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled
Opacity : 127
x coordinate : 0
@@ -430,7 +416,6 @@ Button bSendStartup
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 254
@@ -480,7 +465,6 @@ Hotspot mSpinner
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled
Opacity : 127
x coordinate : 89

View File

@@ -3,7 +3,6 @@ Page popupFan
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 320
@@ -126,7 +125,6 @@ Text t1
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
@@ -156,7 +154,6 @@ Text tEntity
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 63
@@ -186,7 +183,6 @@ Text tIcon1
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
@@ -216,7 +212,6 @@ Text tId
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 90
@@ -246,7 +241,6 @@ Text tInstruction
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
@@ -276,7 +270,6 @@ Text tTmp
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 272
@@ -306,7 +299,6 @@ Picture p0
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled
Opacity : 127
x coordinate : 0
@@ -323,7 +315,6 @@ Slider hSpeed
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 16
@@ -368,7 +359,6 @@ Button b0
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
@@ -397,7 +387,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupFan,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -415,7 +405,6 @@ Button bMode1
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 29
@@ -467,7 +456,6 @@ Button bMode2
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 169
@@ -519,7 +507,6 @@ Button bMode3
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 29
@@ -571,7 +558,6 @@ Button bModeNext
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 208
@@ -642,7 +628,6 @@ Dual-state Button btOnOff1
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 260

View File

@@ -3,7 +3,6 @@ Page popupInSel
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 320
@@ -148,7 +147,6 @@ Text tEntity
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 63
@@ -178,7 +176,6 @@ Text tIcon1
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
@@ -208,7 +205,6 @@ Picture p0
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled
Opacity : 127
x coordinate : 0
@@ -225,7 +221,6 @@ Button b0
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
@@ -254,7 +249,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupInSel,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -272,7 +267,6 @@ Button bMode1
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 30
@@ -324,7 +318,6 @@ Button bMode10
ID : 33
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 171
@@ -376,7 +369,6 @@ Button bMode11
ID : 32
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 32
@@ -428,7 +420,6 @@ Button bMode12
ID : 31
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 172
@@ -480,7 +471,6 @@ Button bMode2
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 170
@@ -532,7 +522,6 @@ Button bMode3
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 29
@@ -584,7 +573,6 @@ Button bMode4
ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 170
@@ -636,7 +624,6 @@ Button bMode5
ID : 26
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 30
@@ -688,7 +675,6 @@ Button bMode6
ID : 27
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 170
@@ -740,7 +726,6 @@ Button bMode7
ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 30
@@ -792,7 +777,6 @@ Button bMode8
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 170
@@ -844,7 +828,6 @@ Button bMode9
ID : 30
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 31
@@ -896,7 +879,6 @@ Button bModeNext
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 259

View File

@@ -139,7 +139,7 @@ Text tVersion
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 50
Text : 51
Max. Text Size : 10
Picture p0

View File

@@ -204,7 +204,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupFan,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -157,7 +157,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupInSel,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC