sync (add nextion2text)

This commit is contained in:
joBr99
2022-10-23 21:53:37 +00:00
committed by github-actions[bot]
parent eef9956b32
commit 93ee6542aa
5 changed files with 21 additions and 43 deletions

View File

@@ -12,34 +12,6 @@
│ - // 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 :
├── pageStartup.txt ├── pageStartup.txt
│ @@ -173,15 +173,15 @@ │ @@ -173,15 +173,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10

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
}
} }
} }

View File

@@ -50,10 +50,6 @@ cardQR
32 Component(s) 32 Component(s)
409 Line(s) of event code 409 Line(s) of event code
238 Unique line(s) of event code 238 Unique line(s) of event code
cardPower
43 Component(s)
420 Line(s) of event code
292 Unique line(s) of event code
popupThermo popupThermo
44 Component(s) 44 Component(s)
515 Line(s) of event code 515 Line(s) of event code
@@ -62,6 +58,10 @@ cardThermo
53 Component(s) 53 Component(s)
596 Line(s) of event code 596 Line(s) of event code
313 Unique line(s) of event code 313 Unique line(s) of event code
cardPower
43 Component(s)
423 Line(s) of event code
293 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1137 Line(s) of event code 1137 Line(s) of event code
@@ -70,5 +70,5 @@ cardEntities
Total Total
16 Page(s) 16 Page(s)
529 Component(s) 529 Component(s)
6304 Line(s) of event code 6307 Line(s) of event code
1674 Unique line(s) of event code 1676 Unique line(s) of event code

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
}
} }
} }

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-23 21:42:24.358169322 +0000 +++ /dev/fd/62 2022-10-23 21:53:31.436711258 +0000
+ tSend.txt+="mode-preset_modes,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt
+ tSend.txt+="mode-preset_modes,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt
+reensaver.txt +reensaver.txt