h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-28 02:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-12-31 15:35:14 +01:00
parent cfd30a8b5b ee19bcf724
commit bad5a61c12
6 changed files with 156 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2902,3 +2902,39 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -508,35 +489,14 @@
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }
│ - if(tInstruction.txt=="statusUpdate")
│ - {
│ - //statusIcon1
│ - spstr strCommand.txt,tIcon1.txt,"~",1
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - covx tTmp.txt,tIcon1.pco,0,0
│ - //statusIcon2
│ - spstr strCommand.txt,tIcon2.txt,"~",3
│ - spstr strCommand.txt,tTmp.txt,"~",4
│ - covx tTmp.txt,tIcon2.pco,0,0
│ - spstr strCommand.txt,tTmp.txt,"~",5
│ - if(tTmp.txt!="")
│ - {
│ - tIcon1.font=3
│ - }
│ - spstr strCommand.txt,tTmp.txt,"~",6
│ - if(tTmp.txt!="")
│ - {
│ - tIcon2.font=3
│ - }
│ - }
│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
│ vis tMainText,1
│ vis tMainTextAlt,0
│ vis tMRIcon,0

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

@@ -2065,3 +2065,39 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -508,35 +489,14 @@
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }
│ - if(tInstruction.txt=="statusUpdate")
│ - {
│ - //statusIcon1
│ - spstr strCommand.txt,tIcon1.txt,"~",1
│ - spstr strCommand.txt,tTmp.txt,"~",2
│ - covx tTmp.txt,tIcon1.pco,0,0
│ - //statusIcon2
│ - spstr strCommand.txt,tIcon2.txt,"~",3
│ - spstr strCommand.txt,tTmp.txt,"~",4
│ - covx tTmp.txt,tIcon2.pco,0,0
│ - spstr strCommand.txt,tTmp.txt,"~",5
│ - if(tTmp.txt!="")
│ - {
│ - tIcon1.font=3
│ - }
│ - spstr strCommand.txt,tTmp.txt,"~",6
│ - if(tTmp.txt!="")
│ - {
│ - tIcon2.font=3
│ - }
│ - }
│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
│ vis tMainText,1
│ vis tMainTextAlt,0
│ vis tMRIcon,0

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-12-31 00:54:59.785437486 +0000
+++ /dev/fd/62 2022-12-31 14:00:50.738431612 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardAlarm.txt
@@ -366,13 +366,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+14 +176,26 @@
+e (string) type6
@@ -1449,3 +1449,39 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+35 +489,14 @@
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ }
+ if(tInstruction.txt=="statusUpdate")
+ {
+ //statusIcon1
+ spstr strCommand.txt,tIcon1.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,"~",2
+ covx tTmp.txt,tIcon1.pco,0,0
+ //statusIcon2
+ spstr strCommand.txt,tIcon2.txt,"~",3
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,tIcon2.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",5
+ if(tTmp.txt!="")
+ {
+ tIcon1.font=3
+ }
+ spstr strCommand.txt,tTmp.txt,"~",6
+ if(tTmp.txt!="")
+ {
+ tIcon2.font=3
+ }
+ }
+ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
+ {
+ vis tMainIcon,1
+ vis tMainIconAlt,0
+ vis tMainText,1
+ vis tMainTextAlt,0
+ vis tMRIcon,0

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

@@ -76,11 +76,11 @@ cardThermo
313 Unique line(s) of event code
screensaver
47 Component(s)
411 Line(s) of event code
299 Unique line(s) of event code
430 Line(s) of event code
302 Unique line(s) of event code
Total
19 Page(s)
694 Component(s)
8217 Line(s) of event code
2124 Unique line(s) of event code
8236 Line(s) of event code
2127 Unique line(s) of event code

21
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1105,6 +1105,27 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="statusUpdate")
{
//statusIcon1
spstr strCommand.txt,tIcon1.txt,"~",1
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tIcon1.pco,0,0
//statusIcon2
spstr strCommand.txt,tIcon2.txt,"~",3
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
tIcon1.font=3
}
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt!="")
{
tIcon2.font=3
}
}
if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
vis tMainIcon,1

21
HMI/n2t-out/screensaver.txt
View File

@@ -512,6 +512,27 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="statusUpdate")
{
//statusIcon1
spstr strCommand.txt,tIcon1.txt,"~",1
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tIcon1.pco,0,0
//statusIcon2
spstr strCommand.txt,tIcon2.txt,"~",3
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
tIcon1.font=3
}
spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt!="")
{
tIcon2.font=3
}
}
if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
vis tMainIcon,1