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

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

Browse Source
This commit is contained in:
Johannes
2022-05-22 17:13:46 +02:00
parent 90e7802733 9345fef9de
commit f35b57ebb0
8 changed files with 65 additions and 65 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-22 14:52:29.008661186 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 15:04:28.207793525 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 14:52:29.872661064 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 15:04:28.999799092 +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-22 14:52:29.008661186 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 15:04:28.207793525 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 14:52:29.872661064 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 15:04:28.999799092 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

24
HMI/US/landscape/n2t-out-visual/cardGrid.txt
View File

@@ -592,9 +592,9 @@ Button bEntity1
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 : 53 x coordinate : 23
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -650,9 +650,9 @@ Button bEntity2
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 : 204 x coordinate : 174
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -708,9 +708,9 @@ Button bEntity3
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 : 354 x coordinate : 324
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -766,9 +766,9 @@ Button bEntity4
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 : 37 x coordinate : 24
y coordinate : 194 y coordinate : 194
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -824,9 +824,9 @@ Button bEntity5
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 : 204 x coordinate : 174
y coordinate : 194 y coordinate : 194
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -882,9 +882,9 @@ Button bEntity6
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 : 354 x coordinate : 324
y coordinate : 194 y coordinate : 194
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0

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

@@ -26,6 +26,10 @@ cardAlarm
38 Component(s) 38 Component(s)
364 Line(s) of event code 364 Line(s) of event code
224 Unique line(s) of event code 224 Unique line(s) of event code
cardGrid
42 Component(s)
439 Line(s) of event code
254 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
@@ -42,10 +46,6 @@ 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
cardGrid
42 Component(s)
439 Line(s) of event code
254 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code

12
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 14:52:29.008661186 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-22 15:04:28.207793525 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 14:52:29.428661127 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 15:04:28.595796252 +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 14:52:29.008661186 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-22 15:04:28.211793553 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 14:52:29.432661126 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 15:04:28.595796252 +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/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 14:52:29.008661186 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-22 15:04:28.207793525 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 14:52:29.432661126 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 15:04:28.595796252 +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

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 14:52:29.444661125 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 15:04:28.611796365 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-22 14:52:29.008661186 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 15:04:28.207793525 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 14:52:29.428661127 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 15:04:28.595796252 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-22 14:52:29.008661186 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 15:04:28.211793553 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 14:52:29.432661126 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 15:04:28.595796252 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1892,6 +2120,169 @@ +@@ -1892,6 +2120,169 @@
@@ -31,5 +31,5 @@
++ spstr tId.txt,bDown5.txt,"|",2 ++ spstr tId.txt,bDown5.txt,"|",2
++ }else if(tTmp.txt=="enable") ++ }else if(tTmp.txt=="enable")
++ spstr tId.txt,bDown5.txt,"|",2 ++ spstr tId.txt,bDown5.txt,"|",2
+--- HMI/n2t-out/pageStartup.txt 2022-05-22 14:52:29.008661186 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 15:04:28.207793525 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 14:52:29.432661126 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 15:04:28.595796252 +0000

24
HMI/US/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -592,9 +592,9 @@ Button bEntity1
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 : 43 x coordinate : 13
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -650,9 +650,9 @@ Button bEntity2
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 : 198 x coordinate : 168
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -708,9 +708,9 @@ Button bEntity3
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 : 38 x coordinate : 8
y coordinate : 210 y coordinate : 210
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -766,9 +766,9 @@ Button bEntity4
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 : 198 x coordinate : 168
y coordinate : 210 y coordinate : 210
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -824,9 +824,9 @@ Button bEntity5
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 : 38 x coordinate : 8
y coordinate : 340 y coordinate : 340
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -882,9 +882,9 @@ Button bEntity6
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 : 198 x coordinate : 168
y coordinate : 340 y coordinate : 340
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0

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

@@ -18,6 +18,10 @@ pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
115 Unique line(s) of event code 115 Unique line(s) of event code
cardGrid
42 Component(s)
439 Line(s) of event code
254 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
345 Line(s) of event code 345 Line(s) of event code
@@ -38,10 +42,6 @@ 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
cardGrid
42 Component(s)
439 Line(s) of event code
254 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

32
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -324,7 +324,7 @@ Text tEntity2
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 : 157 x coordinate : 153
y coordinate : 155 y coordinate : 155
Width : 140 Width : 140
Height : 30 Height : 30
@@ -354,7 +354,7 @@ Text tEntity3
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 : 307 x coordinate : 299
y coordinate : 155 y coordinate : 155
Width : 140 Width : 140
Height : 30 Height : 30
@@ -414,7 +414,7 @@ Text tEntity5
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 : 157 x coordinate : 153
y coordinate : 274 y coordinate : 274
Width : 140 Width : 140
Height : 30 Height : 30
@@ -444,7 +444,7 @@ Text tEntity6
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 : 307 x coordinate : 299
y coordinate : 274 y coordinate : 274
Width : 140 Width : 140
Height : 30 Height : 30
@@ -592,9 +592,9 @@ Button bEntity1
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 : 36 x coordinate : 6
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -650,9 +650,9 @@ Button bEntity2
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 : 187 x coordinate : 153
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -708,9 +708,9 @@ Button bEntity3
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 : 337 x coordinate : 299
y coordinate : 75 y coordinate : 75
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -766,9 +766,9 @@ Button bEntity4
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 : 36 x coordinate : 6
y coordinate : 194 y coordinate : 194
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -824,9 +824,9 @@ Button bEntity5
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 : 187 x coordinate : 153
y coordinate : 194 y coordinate : 194
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -882,9 +882,9 @@ Button bEntity6
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 : 337 x coordinate : 299
y coordinate : 194 y coordinate : 194
Width : 80 Width : 140
Height : 80 Height : 80
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0