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

This commit is contained in:
joBr99
2022-12-19 16:01:24 +01:00
17 changed files with 76 additions and 123 deletions

View File

@@ -1197,29 +1197,3 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -592,15 +563,24 @@
│ spstr strCommand.txt,tIcon1.txt,"~",17
│ spstr strCommand.txt,tTmp.txt,"~",18
│ covx tTmp.txt,tIcon1.pco,0,0
│ //statusIcon2
│ spstr strCommand.txt,tIcon2.txt,"~",19
│ spstr strCommand.txt,tTmp.txt,"~",20
│ covx tTmp.txt,tIcon2.pco,0,0
│ - click m0,1
│ + spstr strCommand.txt,tTmp.txt,"~",21
│ + if(tTmp.txt!="")
│ + {
│ + tIcon1.font=3
│ + }
│ + spstr strCommand.txt,tTmp.txt,"~",22
│ + if(tTmp.txt!="")
│ + {
│ + tIcon1.font=3
│ + }
│ }
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco)
│ {

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-12-14 22:34:40.980601919 +0000
+++ /dev/fd/62 2022-12-14 23:02:23.381717287 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardChart.txt
@@ -553,29 +553,3 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+15 +563,24 @@
+ spstr strCommand.txt,tIcon1.txt,"~",17
+ spstr strCommand.txt,tTmp.txt,"~",18
+ covx tTmp.txt,tIcon1.pco,0,0
+ //statusIcon2
+ spstr strCommand.txt,tIcon2.txt,"~",19
+ spstr strCommand.txt,tTmp.txt,"~",20
+ covx tTmp.txt,tIcon2.pco,0,0
+ click m0,1
+ spstr strCommand.txt,tTmp.txt,"~",21
+ if(tTmp.txt!="")
+ {
+ tIcon1.font=3
+ }
+ spstr strCommand.txt,tTmp.txt,"~",22
+ if(tTmp.txt!="")
+ {
+ tIcon1.font=3
+ }
+ }
+ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+ {
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco)
+ {

View File

@@ -62,6 +62,10 @@ cardMedia
57 Component(s)
660 Line(s) of event code
325 Unique line(s) of event code
screensaver
45 Component(s)
410 Line(s) of event code
298 Unique line(s) of event code
cardQR
32 Component(s)
425 Line(s) of event code
@@ -70,13 +74,9 @@ cardEntities
77 Component(s)
1395 Line(s) of event code
619 Unique line(s) of event code
screensaver
45 Component(s)
410 Line(s) of event code
297 Unique line(s) of event code
Total
18 Page(s)
638 Component(s)
8028 Line(s) of event code
2024 Unique line(s) of event code
2025 Unique line(s) of event code

View File

@@ -1147,7 +1147,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",22
if(tTmp.txt!="")
{
tIcon1.font=3
tIcon2.font=3
}
}
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

View File

@@ -575,7 +575,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",22
if(tTmp.txt!="")
{
tIcon1.font=3
tIcon2.font=3
}
}
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")