mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-01-27 16:44:13 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
352ea44f54
commit
90ad6c1908
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 18:46:02.352144025 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 19:32:15.366674234 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -8,9 +8,21 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||
--- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-22 19:32:15.366674234 +0000
|
||||
@@ -34,7 +34,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
- Max. Text Size: 275
|
||||
+ Max. Text Size: 270
|
||||
|
||||
Variable (string) entn
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 18:46:02.352144025 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 19:32:15.366674234 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -292,7 +292,7 @@ QR Code qr0
|
||||
Effect Time : 300
|
||||
Logo overlay : no
|
||||
Text :
|
||||
Max. Text Size : 105
|
||||
Max. Text Size : 100
|
||||
|
||||
Button bNext
|
||||
Attributes
|
||||
@@ -564,8 +564,8 @@ Dual-state Button btOnOff2
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff,"
|
||||
covx btOnOff1.val,tTmp.txt,0,0
|
||||
tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff,"
|
||||
covx btOnOff2.val,tTmp.txt,0,0
|
||||
tSend.txt+=tTmp.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
|
||||
@@ -49,7 +49,7 @@ cardMedia
|
||||
cardQR
|
||||
30 Component(s)
|
||||
363 Line(s) of event code
|
||||
205 Unique line(s) of event code
|
||||
207 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
1133 Line(s) of event code
|
||||
|
||||
@@ -154,7 +154,7 @@ QR Code qr0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Text :
|
||||
Max. Text Size : 105
|
||||
Max. Text Size : 100
|
||||
|
||||
Button bNext
|
||||
Attributes
|
||||
@@ -302,8 +302,8 @@ Dual-state Button btOnOff2
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff,"
|
||||
covx btOnOff1.val,tTmp.txt,0,0
|
||||
tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff,"
|
||||
covx btOnOff2.val,tTmp.txt,0,0
|
||||
tSend.txt+=tTmp.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
|
||||
Reference in New Issue
Block a user