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

This commit is contained in:
joBr99
2023-05-13 09:17:32 +00:00
committed by github-actions[bot]
parent 0fd984826e
commit 0204d76b40
9 changed files with 1429 additions and 1531 deletions

View File

@@ -33,25 +33,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/landscape/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,popupTimer,bExit"
│ + tSend.txt="event,buttonPress2,popupFan,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/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@
@@ -162,33 +143,6 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : PM
│ @@ -408,24 +385,24 @@
│ Text tIcon1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│ Text tIcon2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│ Text tMainIcon
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ @@ -572,15 +549,14 @@
│ if(tTmp.txt!="")
│ {

View File

@@ -70,10 +70,6 @@ screensaver
46 Component(s)
431 Line(s) of event code
307 Unique line(s) of event code
screensaver2
58 Component(s)
344 Line(s) of event code
243 Unique line(s) of event code
popupLight
23 Component(s)
406 Line(s) of event code
@@ -82,6 +78,10 @@ popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
screensaver2
58 Component(s)
344 Line(s) of event code
243 Unique line(s) of event code
cardEntities
67 Component(s)
1166 Line(s) of event code

View File

@@ -3,7 +3,6 @@ Page screensaver2
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 480
@@ -130,7 +129,6 @@ Text d1Icon
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 30
@@ -160,7 +158,6 @@ Text d1Val
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 65
@@ -190,7 +187,6 @@ Text d2Icon
ID : 33
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 29
@@ -220,7 +216,6 @@ Text d2Val
ID : 32
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 65
@@ -250,7 +245,6 @@ Text d3Icon
ID : 34
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 29
@@ -280,7 +274,6 @@ Text d3Val
ID : 35
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 65
@@ -310,7 +303,6 @@ Text e1Icon
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 20
@@ -340,7 +332,6 @@ Text e1Name
ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 20
@@ -370,7 +361,6 @@ Text e1Val
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 20
@@ -400,7 +390,6 @@ Text e2Icon
ID : 37
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 94
@@ -430,7 +419,6 @@ Text e2Name
ID : 36
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 93
@@ -460,7 +448,6 @@ Text e2Val
ID : 38
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 94
@@ -490,7 +477,6 @@ Text e3Icon
ID : 40
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 168
@@ -520,7 +506,6 @@ Text e3Name
ID : 39
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 168
@@ -550,7 +535,6 @@ Text e3Val
ID : 41
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 168
@@ -580,7 +564,6 @@ Text e4Icon
ID : 43
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 245
@@ -610,7 +593,6 @@ Text e4Name
ID : 42
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 245
@@ -640,7 +622,6 @@ Text e4Val
ID : 44
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 245
@@ -670,7 +651,6 @@ Text e5Icon
ID : 46
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 319
@@ -700,7 +680,6 @@ Text e5Name
ID : 45
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 319
@@ -730,7 +709,6 @@ Text e5Val
ID : 47
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 319
@@ -760,7 +738,6 @@ Text e6Icon
ID : 49
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 392
@@ -790,7 +767,6 @@ Text e6Name
ID : 48
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 392
@@ -820,7 +796,6 @@ Text e6Val
ID : 50
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 392
@@ -850,7 +825,6 @@ Text f1Icon
ID : 55
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 183
@@ -880,7 +854,6 @@ Text f2Icon
ID : 53
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 239
@@ -910,7 +883,6 @@ Text f3Icon
ID : 54
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 295
@@ -940,7 +912,6 @@ Text f4Icon
ID : 52
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 351
@@ -970,7 +941,6 @@ Text f5Icon
ID : 51
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 407
@@ -1000,7 +970,6 @@ Text tAMPM
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 424
@@ -1030,7 +999,6 @@ Text tDate
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 190
@@ -1060,7 +1028,6 @@ Text tIcon1
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
@@ -1080,7 +1047,7 @@ Text tIcon1
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 10
Max. Text Size : 16
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1090,7 +1057,6 @@ Text tIcon2
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 242
@@ -1110,7 +1076,7 @@ Text tIcon2
Vertical Alignment : top
Input Type : character
Text :
Max. Text Size : 10
Max. Text Size : 16
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -1120,7 +1086,6 @@ Text tMainIcon
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 29
@@ -1150,7 +1115,6 @@ Text tMainText
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 100
@@ -1180,7 +1144,6 @@ Text tNotifyHead
ID : 56
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
@@ -1210,7 +1173,6 @@ Text tNotifyText
ID : 57
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
@@ -1240,7 +1202,6 @@ Text tTime
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 266
@@ -1270,7 +1231,6 @@ Text tTimeAdd
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 105
@@ -1300,7 +1260,6 @@ Picture p0
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID: disabled
Opacity : 127
x coordinate : 0

View File

@@ -389,7 +389,7 @@ Text tIcon1
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 10
Max. Text Size : 16
Text tIcon2
Attributes
@@ -398,7 +398,7 @@ Text tIcon2
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 10
Max. Text Size : 16
Text tMainIcon
Attributes

View File

@@ -1463,7 +1463,7 @@
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupTimer,bExit"
│ - tSend.txt="event,buttonPress2,popupFan,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-05-13 09:07:31.593800900 +0000
+++ /dev/fd/62 2023-05-13 09:17:23.360441539 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@
@@ -1001,7 +1001,7 @@
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupTimer,bExit"
+ tSend.txt="event,buttonPress2,popupFan,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0

View File

@@ -10,14 +10,14 @@ pageTest
27 Component(s)
68 Line(s) of event code
66 Unique line(s) of event code
popupNotify
19 Component(s)
263 Line(s) of event code
170 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
204 Unique line(s) of event code
popupNotify
19 Component(s)
263 Line(s) of event code
170 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
@@ -91,4 +91,4 @@ Total
21 Page(s)
798 Component(s)
9253 Line(s) of event code
2338 Unique line(s) of event code
2339 Unique line(s) of event code

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 : 480
@@ -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 : 43
@@ -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 : 92
@@ -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 : 100
@@ -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 : 343
@@ -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 : 44
@@ -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 : 397
@@ -397,7 +387,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupTimer,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 : 11
@@ -467,7 +456,6 @@ Button bMode2
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 135
@@ -519,7 +507,6 @@ Button bMode3
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 259
@@ -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 : 388
@@ -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 : 370

View File

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