h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-18 19:06:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

change usp shutter layout (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-23 05:51:13 +00:00
committed by github-actions[bot]
parent 63d643f2ec
commit 4836debb74
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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-22 19:32:14.502677064 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 19:32:15.366674234 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 05:51:12.437634460 +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-22 19:32:14.502677064 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-22 19:32:15.366674234 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 05:51:12.441634539 +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-22 19:32:14.502677064 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 19:32:15.366674234 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 05:51:12.437634460 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

16
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-22 19:32:14.502677064 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +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-22 19:32:14.502677064 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-23 05:51:11.625618526 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +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-22 19:32:14.502677064 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +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-22 19:32:14.502677064 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +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

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 19:32:14.938675636 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-23 05:51:12.049626846 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-23 05:51:11.625618526 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 05:51:12.005625983 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 19:32:14.502677064 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-23 05:51:11.625618526 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 05:51:12.005625983 +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-22 19:32:14.502677064 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-23 05:51:11.625618526 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 05:51:12.005625983 +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-22 19:32:14.502677064 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-23 05:51:11.625618526 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 05:51:12.005625983 +0000

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

@@ -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
screensaver
35 Component(s)
296 Line(s) of event code
237 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
244 Line(s) of event code 244 Line(s) of event code
138 Unique line(s) of event code 138 Unique line(s) of event code
screensaver
35 Component(s)
296 Line(s) of event code
237 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

20
HMI/US/portrait/n2t-out-visual/popupShutter.txt
View File

@@ -247,8 +247,8 @@ Text tPosHeading
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 : 8 x coordinate : 106
y coordinate : 168 y coordinate : 273
Width : 100 Width : 100
Height : 30 Height : 30
Effect : load Effect : load
@@ -324,8 +324,8 @@ Slider hPosition
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 : 9 x coordinate : 35
y coordinate : 198 y coordinate : 304
Width : 250 Width : 250
Height : 43 Height : 43
Effect : load Effect : load
@@ -415,8 +415,8 @@ Button bDown1
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 : 112 x coordinate : 199
y coordinate : 88 y coordinate : 156
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -462,8 +462,8 @@ 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 : 60 x coordinate : 136
y coordinate : 88 y coordinate : 156
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -509,8 +509,8 @@ 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 : 8 x coordinate : 73
y coordinate : 88 y coordinate : 156
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load