h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-27 09:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-05-22 19:32:16 +00:00
committed by github-actions[bot]
parent 352ea44f54
commit 90ad6c1908
12 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
HMI/US/landscape/diff-eu-version.txt
View File

@@ -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

6
HMI/US/landscape/n2t-out-visual/cardQR.txt
View File

@@ -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

2
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -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

6
HMI/US/landscape/n2t-out/cardQR.txt
View File

@@ -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

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-22 18:46:01.356130319 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:46:01.836136925 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-22 18:46:01.360130374 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:46:01.836136925 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-22 19:32:14.502677064 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -467,9 +467,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +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/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:46:01.836136925 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 18:46:01.852137145 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-22 18:46:01.356130319 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:46:01.836136925 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 18:46:01.360130374 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:46:01.836136925 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 19:32:14.938675636 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 19:32:14.502677064 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000
+ Hotspot mSwipeNext
+ Scope : local
+@@ -1892,6 +2120,169 @@
@@ -31,5 +31,17 @@
++ spstr tId.txt,bDown5.txt,"|",2
++ }else if(tTmp.txt=="enable")
++ spstr tId.txt,bDown5.txt,"|",2
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:46:01.836136925 +0000
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +0000
+@@ -34,7 +34,7 @@
+ Attributes
+ Scope : local
+ Text :
+- Max. Text Size: 275
++ Max. Text Size: 270
+
+ Variable (string) entn
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +0000

6
HMI/US/portrait/n2t-out-visual/cardQR.txt
View File

@@ -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

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

@@ -29,7 +29,7 @@ popupLight
cardQR
30 Component(s)
363 Line(s) of event code
205 Unique line(s) of event code
207 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code

6
HMI/US/portrait/n2t-out/cardQR.txt
View File

@@ -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

8
HMI/n2t-out-visual/cardQR.txt
View File

@@ -43,7 +43,7 @@ Variable (string) strCommand
ID : 6
Scope : local
Text :
Max. Text Size: 270
Max. Text Size: 275
Variable (string) entn
Attributes
@@ -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

2
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -33,7 +33,7 @@ popupLight
cardQR
30 Component(s)
363 Line(s) of event code
205 Unique line(s) of event code
207 Unique line(s) of event code
popupShutter
20 Component(s)
244 Line(s) of event code

8
HMI/n2t-out/cardQR.txt
View File

@@ -34,7 +34,7 @@ Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 270
Max. Text Size: 275
Variable (string) entn
Attributes
@@ -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