fix some color stuff (add nextion2text)

This commit is contained in:
joBr99
2023-01-14 10:24:07 +00:00
committed by github-actions[bot]
parent ab39b35d64
commit 0b10ce0a6d
10 changed files with 266 additions and 38 deletions

View File

@@ -46,7 +46,7 @@ Page cardAlarm
vis bPrev,0
vis bNext,0
cardAlarm.bco=defaultBcoColor
for(sys0=0;sys0<40;sys0++)
for(sys0=0;sys0<44;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
@@ -1275,13 +1275,15 @@ Timer tmSerial
{
//entn
spstr strCommand.txt,tHeading.txt,"~",1
if(tHeading.txt=="unknown")
{
tHeading.txt=""
}
if(tHeading.txt!="")
{
vis tCode,0
vis tHeading,1
}else
{
vis tCode,1
vis tHeading,0
}
// navigation icon left
@@ -1374,7 +1376,13 @@ Timer tmSerial
vis b9,1
vis b10,1
vis b11,1
vis tCode,1
if(tHeading.txt!="")
{
vis tCode,0
}else
{
vis tCode,1
}
}else
{
vis b0,0

View File

@@ -74,7 +74,7 @@ Page cardEntities
vis bPrev,0
vis bNext,0
cardEntities.bco=defaultBcoColor
for(sys0=0;sys0<65;sys0++)
for(sys0=0;sys0<67;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
{

View File

@@ -907,11 +907,11 @@ Timer tmSerial
{
if(type1.txt=="delete"||type1.txt=="")
{
qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
}
}else
{
qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
}
}
if(tInstruction.txt=="time")

View File

@@ -32,8 +32,8 @@ pageTest
66 Unique line(s) of event code
cardAlarm
43 Component(s)
451 Line(s) of event code
261 Unique line(s) of event code
459 Line(s) of event code
268 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total
20 Page(s)
734 Component(s)
8727 Line(s) of event code
2230 Unique line(s) of event code
8735 Line(s) of event code
2234 Unique line(s) of event code