Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2023-01-23 17:28:52 +00:00
committed by github-actions[bot]
parent 39cedae1f8
commit 3efe659c2e
11 changed files with 92 additions and 61 deletions

View File

@@ -1047,25 +1047,27 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
│ @@ -25,15 +25,15 @@
vis bEntity1,0
vis bEntity2,0
vis bEntity3,0
vis bEntity4,0
vis bEntity5,0
vis bEntity6,0
cardMedia.bco=defaultBcoColor
│ - for(sys0=0;sys0<52;sys0++)
+ for(sys0=0;sys0<34;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -891,18 +891,14 @@
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
│ - if(tId.txt=="cardLChart")
- {
- page cardLChart
- }
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -602,19 +602,19 @@