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

File diff suppressed because it is too large Load Diff

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