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

fix some color stuff (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-01-14 10:24:07 +00:00
committed by github-actions[bot]
parent 8db8a108e4
commit 08676c5947
10 changed files with 266 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,23 @@
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
│ @@ -34,15 +34,15 @@
│ vis b9,0
│ vis b10,0
│ vis b11,0
│ vis tCode,0
│ vis bPrev,0
│ vis bNext,0
│ cardAlarm.bco=defaultBcoColor
│ - for(sys0=0;sys0<44;sys0++)
│ + for(sys0=0;sys0<40;sys0++)
│ {
│ if(b[sys0].type==98||b[sys0].type==116)
│ {
│ b[sys0].bco=defaultBcoColor
│ //b[sys0].pco=defaultFontColor
│ }
│ }
│ @@ -123,24 +123,14 @@
│ Dragging : 0
│ Disable release event after dragging: 0
@@ -232,7 +249,7 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -665,24 +633,15 @@
│ @@ -665,26 +633,15 @@
│ // write command to variable strCommand
│ ucopy strCommand.txt,4,payloadLength-5,0
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
@@ -241,13 +258,15 @@
│ {
│ //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
│ - }
│ + spstr strCommand.txt,entn.txt,"~",1
@@ -258,7 +277,7 @@
│ vis bPrev,0
│ }else
│ {
│ @@ -709,56 +668,54 @@
│ @@ -711,77 +668,69 @@
│ spstr strCommand.txt,bNext.txt,"~",10
│ // change icon color
│ spstr strCommand.txt,tTmp.txt,"~",11
@@ -326,7 +345,29 @@
│ vis b2,1
│ vis b3,1
│ vis b4,1
│ @@ -783,30 +740,30 @@
│ vis b5,1
│ vis b6,1
│ vis b7,1
│ vis b8,1
│ vis b9,1
│ vis b10,1
│ vis b11,1
│ - if(tHeading.txt!="")
│ - {
│ - vis tCode,0
│ - }else
│ - {
│ - vis tCode,1
│ - }
│ + vis tCode,1
│ }else
│ {
│ vis b0,0
│ vis b1,0
│ vis b2,0
│ vis b3,0
│ vis b4,0
│ @@ -791,30 +740,30 @@
│ vis b8,0
│ vis b9,0
│ vis b10,0
@@ -361,7 +402,7 @@
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -907,18 +864,14 @@
│ @@ -915,18 +864,14 @@
│ {
│ page cardPower
│ }
@@ -403,6 +444,23 @@
│ }
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -62,15 +62,15 @@
│ vis tEntity4,0
│ vis bText4,0
│ vis hSlider4,0
│ vis nNum4,0
│ vis bPrev,0
│ vis bNext,0
│ cardEntities.bco=defaultBcoColor
│ - for(sys0=0;sys0<67;sys0++)
│ + for(sys0=0;sys0<65;sys0++)
│ {
│ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
│ {
│ b[sys0].bco=defaultBcoColor
│ b[sys0].pco=defaultFontColor
│ }
│ if(b[sys0].type==53&&defaultBcoColor==0)
│ @@ -1931,18 +1931,14 @@
│ {
│ page cardPower
@@ -487,6 +545,28 @@
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -602,19 +602,19 @@
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",26
│ }
│ if(type2.txt=="delete"||type2.txt=="")
│ {
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
│ }
│ }else
│ {
│ - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -715,18 +715,14 @@
│ {
│ page cardPower