h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-04 04:18:55 +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-21 14:55:47 +00:00
committed by github-actions[bot]
parent a4775f95f4
commit 0e34839e5a
6 changed files with 25 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-21 14:48:41.110663520 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-21 14:55:46.021052258 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:48:42.006669223 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:55:46.849063256 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:48:41.110663520 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-21 14:55:46.025052311 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:48:42.006669223 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:55:46.849063256 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

33
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-21 14:48:41.110663520 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-21 14:55:46.021052258 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:48:41.554666346 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:55:46.413057465 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:48:41.114663546 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-21 14:55:46.025052311 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:48:41.554666346 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:55:46.417057518 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -448,30 +448,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="pageType") 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-21 14:48:41.110663520 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:48:41.554666346 +0000
@@ -137,7 +137,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : testHeading
Max. Text Size : 40
Picture p0
@@ -153,7 +153,7 @@
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- Text :
+ Text : WIFI:S:SSID;T:WPA;P:PASSWORD;;
Max. Text Size : 105
Button bNext
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:48:41.110663520 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-21 14:55:46.025052311 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:48:41.554666346 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:55:46.413057465 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -1,53 +1,10 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 14:48:41.566666422 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 14:55:46.457058049 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 14:48:41.110663520 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 14:55:46.021052258 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:48:41.554666346 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:55:46.413057465 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:48:41.114663546 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:55:46.025052311 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:48:41.554666346 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:55:46.417057518 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1816,6 +2044,150 @@ +@@ -1816,6 +2044,150 @@
++ // get Button State (optional Value) +--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:55:46.025052311 +0000
++ spstr strCommand.txt,tId.txt,"~",32 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:55:46.413057465 +0000
++ spstr tId.txt,tTmp.txt,"|",0
++ if(tTmp.txt=="0")
++ {
++ bUp5.pco=27501
++ tsw bUp5,0
++ }else
++ {
++ bUp5.pco=65535
++ tsw bUp5,1
++ }
++ spstr tId.txt,tTmp.txt,"|",1
++ if(tTmp.txt=="0")
++ {
++ bDown5.pco=27501
++ tsw bDown5,0
++ }else
++ {
++ bDown5.pco=65535
++ tsw bDown5,1
++ }
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-05-21 14:48:41.110663520 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:48:41.554666346 +0000
+@@ -137,7 +137,7 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+- Text :
++ Text : testHeading
+ Max. Text Size : 40
+
+ Picture p0
+@@ -153,7 +153,7 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- Text :
++ Text : WIFI:S:SSID;T:WPA;P:PASSWORD;;
+ Max. Text Size : 105
+
+ Button bNext
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:48:41.110663520 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:48:41.554666346 +0000

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

@@ -252,7 +252,7 @@ Text tHeading
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : testHeading Text :
Max. Text Size : 40 Max. Text Size : 40
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -291,7 +291,7 @@ QR Code qr0
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Logo overlay : no Logo overlay : no
Text : WIFI:S:SSID;T:WPA;P:PASSWORD;; Text :
Max. Text Size : 105 Max. Text Size : 105
Button bNext Button bNext

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

@@ -26,6 +26,10 @@ popupLight
27 Component(s) 27 Component(s)
345 Line(s) of event code 345 Line(s) of event code
187 Unique line(s) of event code 187 Unique line(s) of event code
cardQR
30 Component(s)
363 Line(s) of event code
205 Unique line(s) of event code
cardThermo cardThermo
56 Component(s) 56 Component(s)
546 Line(s) of event code 546 Line(s) of event code
@@ -46,10 +50,6 @@ screensaver
35 Component(s) 35 Component(s)
296 Line(s) of event code 296 Line(s) of event code
237 Unique line(s) of event code 237 Unique line(s) of event code
cardQR
30 Component(s)
363 Line(s) of event code
205 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1283 Line(s) of event code 1283 Line(s) of event code

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

@@ -137,7 +137,7 @@ Text tHeading
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : testHeading Text :
Max. Text Size : 40 Max. Text Size : 40
Picture p0 Picture p0
@@ -153,7 +153,7 @@ QR Code qr0
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Text : WIFI:S:SSID;T:WPA;P:PASSWORD;; Text :
Max. Text Size : 105 Max. Text Size : 105
Button bNext Button bNext