mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-21 15:04:24 +01:00
. (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
b406d0c67e
commit
b9b22cdbb5
@@ -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-23 05:51:11.625618526 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 05:51:12.437634460 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 06:20:45.196459256 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 05:51:12.441634539 +0000
|
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 06:20:45.196459256 +0000
|
||||||
@@ -34,7 +34,7 @@
|
@@ -34,7 +34,7 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
|||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
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-23 05:51:11.625618526 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 05:51:12.437634460 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 06:20:45.196459256 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
|
|||||||
@@ -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-23 05:51:11.625618526 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +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-23 05:51:11.625618526 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +0000
|
||||||
@@ -62,6 +62,16 @@
|
@@ -62,6 +62,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -468,8 +468,8 @@ 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
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +0000
|
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +0000
|
||||||
@@ -34,7 +34,7 @@
|
@@ -34,7 +34,7 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
|||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
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-23 05:51:11.625618526 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +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
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-23 05:51:12.049626846 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-23 06:20:44.752453318 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +0000
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-23 05:51:11.625618526 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +0000
|
||||||
+ Hotspot mSwipeNext
|
+ Hotspot mSwipeNext
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
+@@ -1892,6 +2120,169 @@
|
+@@ -1892,6 +2120,169 @@
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
++ }else if(tTmp.txt=="enable")
|
++ }else if(tTmp.txt=="enable")
|
||||||
++ spstr tId.txt,bDown5.txt,"|",2
|
++ spstr tId.txt,bDown5.txt,"|",2
|
||||||
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
+--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000
|
+--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +0000
|
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +0000
|
||||||
+@@ -34,7 +34,7 @@
|
+@@ -34,7 +34,7 @@
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
@@ -43,5 +43,5 @@
|
|||||||
+
|
+
|
||||||
+ Variable (string) entn
|
+ Variable (string) entn
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +0000
|
||||||
|
|||||||
@@ -42,14 +42,14 @@ cardMedia
|
|||||||
33 Component(s)
|
33 Component(s)
|
||||||
350 Line(s) of event code
|
350 Line(s) of event code
|
||||||
179 Unique line(s) of event code
|
179 Unique line(s) of event code
|
||||||
popupShutter
|
|
||||||
20 Component(s)
|
|
||||||
244 Line(s) of event code
|
|
||||||
138 Unique line(s) of event code
|
|
||||||
screensaver
|
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
|
||||||
|
popupShutter
|
||||||
|
20 Component(s)
|
||||||
|
244 Line(s) of event code
|
||||||
|
138 Unique line(s) of event code
|
||||||
cardEntities
|
cardEntities
|
||||||
77 Component(s)
|
77 Component(s)
|
||||||
1363 Line(s) of event code
|
1363 Line(s) of event code
|
||||||
|
|||||||
@@ -417,8 +417,8 @@ Button bDown1
|
|||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 199
|
x coordinate : 199
|
||||||
y coordinate : 156
|
y coordinate : 156
|
||||||
Width : 50
|
Width : 70
|
||||||
Height : 50
|
Height : 70
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -462,10 +462,10 @@ Button bStop1
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 136
|
x coordinate : 125
|
||||||
y coordinate : 156
|
y coordinate : 156
|
||||||
Width : 50
|
Width : 70
|
||||||
Height : 50
|
Height : 70
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -509,10 +509,10 @@ Button bUp1
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 73
|
x coordinate : 51
|
||||||
y coordinate : 156
|
y coordinate : 156
|
||||||
Width : 50
|
Width : 70
|
||||||
Height : 50
|
Height : 70
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
|
|||||||
Reference in New Issue
Block a user