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

fix direction on US-P Power card (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-10-23 14:41:17 +00:00
committed by github-actions[bot]
parent 5903e862a4
commit 9fdf1c3730
15 changed files with 92 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,34 @@
│ - // fix touch offset │ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020 │ - lcd_dev fffb 0002 0000 0020
│ - page pageStartup │ - page pageStartup
├── cardPower.txt
│ @@ -42,22 +42,19 @@
│ for(sys0=0;sys0<43;sys0++)
│ {
│ if(b[sys0].type==98||b[sys0].type==116)
│ {
│ b[sys0].bco=defaultBcoColor
│ b[sys0].pco=defaultFontColor
│ }
│ - if(defaultBcoColor==0)
│ + if(b[sys0].type==1)
│ {
│ - if(b[sys0].type==1)
│ - {
│ - b[sys0].pic=19
│ - b[sys0].pic1=19
│ - b[sys0].pic2=15
│ - }
│ + b[sys0].pic=19
│ + b[sys0].pic1=19
│ + b[sys0].pic2=15
│ }
│ }
│
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
├── cardThermo.txt ├── cardThermo.txt
│ @@ -779,30 +779,14 @@ │ @@ -779,30 +779,14 @@
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0

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

@@ -6,6 +6,10 @@ pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
pageStartup
19 Component(s)
172 Line(s) of event code
125 Unique line(s) of event code
popupNotify popupNotify
19 Component(s) 19 Component(s)
253 Line(s) of event code 253 Line(s) of event code
@@ -26,10 +30,6 @@ popupShutter
25 Component(s) 25 Component(s)
394 Line(s) of event code 394 Line(s) of event code
216 Unique line(s) of event code 216 Unique line(s) of event code
pageStartup
19 Component(s)
172 Line(s) of event code
125 Unique line(s) of event code
pageTest pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code

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

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 42 Text : 43
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -152,7 +152,7 @@ Text tVersion
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 : 42 Text : 43
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-16 08:26:34.101954953 +0000 +++ /dev/fd/62 2022-10-23 14:41:10.580318674 +0000
++9,8 @@ ++9,8 @@
+tify.txt +tify.txt
+utter.txt +utter.txt

21
HMI/US/portrait/n2t-out-visual/cardPower.txt
View File

@@ -54,11 +54,14 @@ Page cardPower
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
if(b[sys0].type==1) if(defaultBcoColor==0)
{ {
b[sys0].pic=19 if(b[sys0].type==1)
b[sys0].pic1=19 {
b[sys0].pic2=15 b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
} }
} }
@@ -629,7 +632,7 @@ Slider h1
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Direction : horizontal Direction : vertical
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
@@ -654,7 +657,7 @@ Slider h4
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Direction : horizontal Direction : vertical
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
@@ -704,7 +707,7 @@ Slider h2
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Direction : horizontal Direction : vertical
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
@@ -729,7 +732,7 @@ Slider h5
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Direction : horizontal Direction : vertical
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
@@ -754,7 +757,7 @@ Slider h3
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Direction : horizontal Direction : vertical
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255

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

@@ -14,10 +14,10 @@ popupFan
27 Component(s) 27 Component(s)
347 Line(s) of event code 347 Line(s) of event code
202 Unique line(s) of event code 202 Unique line(s) of event code
pageStartup cardPower
19 Component(s) 43 Component(s)
172 Line(s) of event code 423 Line(s) of event code
125 Unique line(s) of event code 293 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
394 Line(s) of event code 394 Line(s) of event code
@@ -26,10 +26,10 @@ popupLight
27 Component(s) 27 Component(s)
391 Line(s) of event code 391 Line(s) of event code
214 Unique line(s) of event code 214 Unique line(s) of event code
cardPower pageStartup
43 Component(s) 19 Component(s)
420 Line(s) of event code 172 Line(s) of event code
292 Unique line(s) of event code 125 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
474 Line(s) of event code 474 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
496 Component(s) 496 Component(s)
5983 Line(s) of event code 5986 Line(s) of event code
1629 Unique line(s) of event code 1631 Unique line(s) of event code

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

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 42 Text : 43
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

11
HMI/US/portrait/n2t-out/cardPower.txt
View File

@@ -46,11 +46,14 @@ Page cardPower
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
if(b[sys0].type==1) if(defaultBcoColor==0)
{ {
b[sys0].pic=19 if(b[sys0].type==1)
b[sys0].pic1=19 {
b[sys0].pic2=15 b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
} }
} }

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

@@ -152,7 +152,7 @@ Text tVersion
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 : 42 Text : 43
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

11
HMI/n2t-out-visual/cardPower.txt
View File

@@ -54,11 +54,14 @@ Page cardPower
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
if(b[sys0].type==1) if(defaultBcoColor==0)
{ {
b[sys0].pic=19 if(b[sys0].type==1)
b[sys0].pic1=19 {
b[sys0].pic2=15 b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
} }
} }

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

@@ -22,10 +22,6 @@ popupThermo
24 Component(s) 24 Component(s)
294 Line(s) of event code 294 Line(s) of event code
175 Unique line(s) of event code 175 Unique line(s) of event code
pageStartup
19 Component(s)
172 Line(s) of event code
125 Unique line(s) of event code
popupNotify popupNotify
19 Component(s) 19 Component(s)
253 Line(s) of event code 253 Line(s) of event code
@@ -34,6 +30,10 @@ popupFan
27 Component(s) 27 Component(s)
347 Line(s) of event code 347 Line(s) of event code
202 Unique line(s) of event code 202 Unique line(s) of event code
pageStartup
19 Component(s)
172 Line(s) of event code
125 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
409 Line(s) of event code 409 Line(s) of event code
@@ -50,10 +50,6 @@ screensaver
38 Component(s) 38 Component(s)
350 Line(s) of event code 350 Line(s) of event code
266 Unique line(s) of event code 266 Unique line(s) of event code
cardPower
43 Component(s)
420 Line(s) of event code
292 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
588 Line(s) of event code 588 Line(s) of event code
@@ -66,9 +62,13 @@ cardEntities
65 Component(s) 65 Component(s)
1137 Line(s) of event code 1137 Line(s) of event code
522 Unique line(s) of event code 522 Unique line(s) of event code
cardPower
43 Component(s)
423 Line(s) of event code
293 Unique line(s) of event code
Total Total
16 Page(s) 16 Page(s)
515 Component(s) 515 Component(s)
6128 Line(s) of event code 6131 Line(s) of event code
1588 Unique line(s) of event code 1590 Unique line(s) of event code

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

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 42 Text : 43
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

11
HMI/n2t-out/cardPower.txt
View File

@@ -46,11 +46,14 @@ Page cardPower
b[sys0].bco=defaultBcoColor b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor b[sys0].pco=defaultFontColor
} }
if(b[sys0].type==1) if(defaultBcoColor==0)
{ {
b[sys0].pic=19 if(b[sys0].type==1)
b[sys0].pic1=19 {
b[sys0].pic2=15 b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
} }
} }

2
HMI/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
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 : 42 Text : 43
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0