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

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

View File

@@ -23,6 +23,34 @@
│ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ - 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
│ @@ -779,30 +779,14 @@
│ crcputs tSend.txt,0

View File

@@ -6,6 +6,10 @@ pageIcons
7 Component(s)
0 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
19 Component(s)
253 Line(s) of event code
@@ -26,10 +30,6 @@ popupShutter
25 Component(s)
394 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
14 Component(s)
14 Line(s) of event code

View File

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

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 42
Text : 43
Max. Text Size : 10
Picture p0

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 @@
+tify.txt
+utter.txt

View File

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

View File

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

View File

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

View File

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

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 42
Text : 43
Max. Text Size : 10
Picture p0

View File

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

View File

@@ -22,10 +22,6 @@ popupThermo
24 Component(s)
294 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
19 Component(s)
253 Line(s) of event code
@@ -34,6 +30,10 @@ popupFan
27 Component(s)
347 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
32 Component(s)
409 Line(s) of event code
@@ -50,10 +50,6 @@ screensaver
38 Component(s)
350 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
53 Component(s)
588 Line(s) of event code
@@ -66,9 +62,13 @@ cardEntities
65 Component(s)
1137 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
16 Page(s)
515 Component(s)
6128 Line(s) of event code
1588 Unique line(s) of event code
6131 Line(s) of event code
1590 Unique line(s) of event code

View File

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

View File

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

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 42
Text : 43
Max. Text Size : 10
Picture p0