h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-19 22:24:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-09-26 13:46:00 +00:00
committed by github-actions[bot]
parent 40ca7694f9
commit 32e58e5fe3
12 changed files with 30 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -462,7 +462,7 @@
│ } │ }
│ } │ }
├── screensaver.txt ├── screensaver.txt
│ @@ -691,18 +691,14 @@ │ @@ -675,18 +675,14 @@
│ { │ {
│ page cardAlarm │ page cardAlarm
│ } │ }

12
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -38,6 +38,10 @@ cardGrid
42 Component(s) 42 Component(s)
469 Line(s) of event code 469 Line(s) of event code
278 Unique line(s) of event code 278 Unique line(s) of event code
screensaver
38 Component(s)
333 Line(s) of event code
259 Unique line(s) of event code
cardThermo cardThermo
52 Component(s) 52 Component(s)
580 Line(s) of event code 580 Line(s) of event code
@@ -46,10 +50,6 @@ popupShutter
25 Component(s) 25 Component(s)
389 Line(s) of event code 389 Line(s) of event code
212 Unique line(s) of event code 212 Unique line(s) of event code
screensaver
38 Component(s)
349 Line(s) of event code
263 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
422 Line(s) of event code 422 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total Total
14 Page(s) 14 Page(s)
439 Component(s) 439 Component(s)
5280 Line(s) of event code 5264 Line(s) of event code
1415 Unique line(s) of event code 1411 Unique line(s) of event code

20
HMI/US/landscape/n2t-out-visual/screensaver.txt
View File

@@ -1012,7 +1012,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="weatherUpdate") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1
vis tMainIconAlt,0 vis tMainIconAlt,0
@@ -1086,16 +1086,8 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
} }
if(tNotifyText.txt!="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
@@ -1183,14 +1175,6 @@ Timer tmSerial
tForecast3.pco=tForecast2.pco tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco tForecast2.pco=tForecast1.pco
} }
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")
{ {

20
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -447,7 +447,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="weatherUpdate") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1
vis tMainIconAlt,0 vis tMainIconAlt,0
@@ -521,16 +521,8 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
} }
if(tNotifyText.txt!="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
@@ -618,14 +610,6 @@ Timer tmSerial
tForecast3.pco=tForecast2.pco tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco tForecast2.pco=tForecast1.pco
} }
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")
{ {

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

@@ -1069,7 +1069,7 @@
│ Scope : local │ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ @@ -691,18 +691,14 @@ │ @@ -675,18 +675,14 @@
│ { │ {
│ page cardAlarm │ page cardAlarm
│ } │ }

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-09-22 16:21:40.160676588 +0000 +++ /dev/fd/62 2022-09-26 13:45:52.701819549 +0000
+rdAlarm.txt +rdAlarm.txt
+18 +833,14 @@ +18 +833,14 @@
+ { + {
@@ -381,7 +381,7 @@
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+18 +691,14 @@ +18 +675,14 @@
+ { + {
+ page cardAlarm + page cardAlarm
+ } + }

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

@@ -52,8 +52,8 @@ cardThermo
303 Unique line(s) of event code 303 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
349 Line(s) of event code 333 Line(s) of event code
263 Unique line(s) of event code 259 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1354 Line(s) of event code 1354 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total Total
14 Page(s) 14 Page(s)
451 Component(s) 451 Component(s)
5503 Line(s) of event code 5487 Line(s) of event code
1489 Unique line(s) of event code 1485 Unique line(s) of event code

20
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -1012,7 +1012,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="weatherUpdate") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1
vis tMainIconAlt,0 vis tMainIconAlt,0
@@ -1086,16 +1086,8 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
} }
if(tNotifyText.txt!="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
@@ -1183,14 +1175,6 @@ Timer tmSerial
tForecast3.pco=tForecast2.pco tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco tForecast2.pco=tForecast1.pco
} }
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")
{ {

20
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -447,7 +447,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="weatherUpdate") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1
vis tMainIconAlt,0 vis tMainIconAlt,0
@@ -521,16 +521,8 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
} }
if(tNotifyText.txt!="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
@@ -618,14 +610,6 @@ Timer tmSerial
tForecast3.pco=tForecast2.pco tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco tForecast2.pco=tForecast1.pco
} }
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")
{ {

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

@@ -24,8 +24,8 @@ popupLight
213 Unique line(s) of event code 213 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
353 Line(s) of event code 337 Line(s) of event code
265 Unique line(s) of event code 261 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
346 Line(s) of event code 346 Line(s) of event code
@@ -66,5 +66,5 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
488 Component(s) 488 Component(s)
5741 Line(s) of event code 5725 Line(s) of event code
1534 Unique line(s) of event code 1530 Unique line(s) of event code

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

@@ -1012,7 +1012,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="weatherUpdate") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1
vis tMainIconAlt,0 vis tMainIconAlt,0
@@ -1086,16 +1086,8 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
} }
if(tNotifyText.txt!="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
@@ -1183,14 +1175,6 @@ Timer tmSerial
tForecast3.pco=tForecast2.pco tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco tForecast2.pco=tForecast1.pco
} }
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")
{ {

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

@@ -447,7 +447,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0 covx tTmp.txt,sleepTimeout,0,0
} }
if(tInstruction.txt=="weatherUpdate") if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {
vis tMainIcon,1 vis tMainIcon,1
vis tMainIconAlt,0 vis tMainIconAlt,0
@@ -521,16 +521,8 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
} }
if(tNotifyText.txt!="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{
ref tNotifyText
}
}
if(tInstruction.txt=="color")
{ {
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0 covx tTmp.txt,tTime.bco,0,0
@@ -618,14 +610,6 @@ Timer tmSerial
tForecast3.pco=tForecast2.pco tForecast3.pco=tForecast2.pco
tForecast2.pco=tForecast1.pco tForecast2.pco=tForecast1.pco
} }
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="notify") if(tInstruction.txt=="notify")
{ {