h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-19 20:54:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
joBr99
2023-01-23 20:12:08 +01:00
parent 8e10bec32f 3efe659c2e
commit 2d25609ff2
11 changed files with 92 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,7 +544,7 @@
│ vis bEntity5,0 │ vis bEntity5,0
│ vis bEntity6,0 │ vis bEntity6,0
│ cardMedia.bco=defaultBcoColor │ cardMedia.bco=defaultBcoColor
│ - for(sys0=0;sys0<52;sys0++) │ - for(sys0=0;sys0<54;sys0++)
│ + for(sys0=0;sys0<34;sys0++) │ + for(sys0=0;sys0<34;sys0++)
│ { │ {
│ if(b[sys0].type==98||b[sys0].type==116) │ if(b[sys0].type==98||b[sys0].type==116)
@@ -824,11 +824,11 @@
│ + if(sys0>h3.maxval) │ + if(sys0>h3.maxval)
│ + { │ + {
│ + h3.val=h3.minval │ + h3.val=h3.minval
│ + } │ }
│ + if(sys0<h3.minval) │ + if(sys0<h3.minval)
│ + { │ + {
│ + h3.val=h3.maxval │ + h3.val=h3.maxval
│ } │ + }
│ + h3.val+=t3Speed.val │ + h3.val+=t3Speed.val
│ + sys0=h4.val+t4Speed.val │ + sys0=h4.val+t4Speed.val
│ + if(sys0>h4.maxval) │ + if(sys0>h4.maxval)
@@ -1072,6 +1072,25 @@
│ vis h5,1 │ vis h5,1
│ }else │ }else
│ { │ {
│ @@ -891,18 +785,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/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt ├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -602,19 +602,19 @@ │ @@ -602,19 +602,19 @@

40
HMI/US/portrait/diff-eu-version.txt
View File

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

44
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-23 17:04:15.689928965 +0000 +++ /dev/fd/62 2023-01-23 17:28:44.671366324 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardEntities.txt +I/n2t-out/cardEntities.txt
@@ -54,13 +54,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+14 +186,26 @@ +14 +186,26 @@
+e (string) type6 +e (string) type6
@@ -466,25 +466,27 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + hSlider6.maxval=sys0
+ } + }
+I/n2t-out/cardMedia.txt +I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardMedia.txt ++ HMI/US/portrait/n2t-out/cardPower.txt
+5 +25,15 @@ +18 +891,14 @@
+ vis bEntity1,0 + {
+ vis bEntity2,0 + page cardPower
+ vis bEntity3,0 + }
+ vis bEntity4,0 + if(tId.txt=="cardChart")
+ vis bEntity5,0 + {
+ vis bEntity6,0 + page cardChart
+ cardMedia.bco=defaultBcoColor + }
+ for(sys0=0;sys0<52;sys0++) + if(tId.txt=="cardLChart")
+ for(sys0=0;sys0<34;sys0++) + {
+ { + page cardLChart
+ if(b[sys0].type==98||b[sys0].type==116) + }
+ { + }
+ b[sys0].bco=defaultBcoColor + if(tInstruction.txt=="time")
+ b[sys0].pco=defaultFontColor + {
+ } + // get set time to global variable
+ } + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+I/n2t-out/cardQR.txt +I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt
+19 +602,19 @@ +19 +602,19 @@

2
HMI/US/portrait/n2t-out-visual/cardMedia.txt
View File

@@ -37,7 +37,7 @@ Page cardMedia
vis bEntity5,0 vis bEntity5,0
vis bEntity6,0 vis bEntity6,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++) for(sys0=0;sys0<54;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

10
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -50,6 +50,10 @@ cardThermo
57 Component(s) 57 Component(s)
532 Line(s) of event code 532 Line(s) of event code
315 Unique line(s) of event code 315 Unique line(s) of event code
cardMedia
59 Component(s)
641 Line(s) of event code
318 Unique line(s) of event code
cardChart cardChart
33 Component(s) 33 Component(s)
429 Line(s) of event code 429 Line(s) of event code
@@ -58,10 +62,6 @@ cardLChart
33 Component(s) 33 Component(s)
408 Line(s) of event code 408 Line(s) of event code
268 Unique line(s) of event code 268 Unique line(s) of event code
cardMedia
59 Component(s)
641 Line(s) of event code
318 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
@@ -87,4 +87,4 @@ Total
20 Page(s) 20 Page(s)
747 Component(s) 747 Component(s)
9231 Line(s) of event code 9231 Line(s) of event code
2382 Unique line(s) of event code 2383 Unique line(s) of event code

2
HMI/US/portrait/n2t-out/cardMedia.txt
View File

@@ -29,7 +29,7 @@ Page cardMedia
vis bEntity5,0 vis bEntity5,0
vis bEntity6,0 vis bEntity6,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++) for(sys0=0;sys0<54;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

2
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -37,7 +37,7 @@ Page cardMedia
vis bEntity5,0 vis bEntity5,0
vis bEntity6,0 vis bEntity6,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<52;sys0++) for(sys0=0;sys0<54;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

4
HMI/n2t-out-visual/cardPower.txt
View File

@@ -1463,6 +1463,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

18
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -30,10 +30,10 @@ pageTest
26 Component(s) 26 Component(s)
68 Line(s) of event code 68 Line(s) of event code
66 Unique line(s) of event code 66 Unique line(s) of event code
cardMedia cardPower
59 Component(s) 48 Component(s)
641 Line(s) of event code 487 Line(s) of event code
318 Unique line(s) of event code 326 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
351 Line(s) of event code 351 Line(s) of event code
@@ -62,10 +62,10 @@ popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
cardPower cardMedia
48 Component(s) 59 Component(s)
483 Line(s) of event code 641 Line(s) of event code
324 Unique line(s) of event code 318 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
737 Component(s) 737 Component(s)
8820 Line(s) of event code 8824 Line(s) of event code
2271 Unique line(s) of event code 2271 Unique line(s) of event code

2
HMI/n2t-out/cardMedia.txt
View File

@@ -29,7 +29,7 @@ Page cardMedia
vis bEntity5,0 vis bEntity5,0
vis bEntity6,0 vis bEntity6,0
cardMedia.bco=defaultBcoColor cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<52;sys0++) for(sys0=0;sys0<54;sys0++)
{ {
if(b[sys0].type==98||b[sys0].type==116) if(b[sys0].type==98||b[sys0].type==116)
{ {

4
HMI/n2t-out/cardPower.txt
View File

@@ -895,6 +895,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {