h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-24 00: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:
Johannes
2022-05-31 18:49:05 +02:00
parent 479fa26e20 3519573ca1
commit fee11424fe
15 changed files with 109 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 20:13:57.965045854 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-31 15:07:45.430982442 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 20:13:57.969045903 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-31 15:07:45.430982442 +0000
@@ -1925,10 +1925,6 @@ @@ -1925,10 +1925,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 20:13:57.965045854 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-31 15:07:45.430982442 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 20:13:57.965045854 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-31 15:07:45.430982442 +0000
@@ -636,10 +636,7 @@ @@ -636,10 +636,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -52,8 +52,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 20:13:57.965045854 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-31 15:07:45.430982442 +0000
@@ -582,10 +582,7 @@ @@ -582,10 +582,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -67,8 +67,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 20:13:57.969045903 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-31 15:07:45.430982442 +0000
@@ -1170,10 +1170,6 @@ @@ -1170,10 +1170,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -81,8 +81,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 20:13:57.965045854 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-31 15:07:45.430982442 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -104,8 +104,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 20:13:57.965045854 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-31 15:07:45.430982442 +0000
@@ -561,10 +561,6 @@ @@ -561,10 +561,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -118,8 +118,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/popupNotify.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 20:13:57.965045854 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-31 15:07:45.430982442 +0000
@@ -311,10 +311,6 @@ @@ -311,10 +311,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -132,8 +132,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/popupShutter.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 20:13:57.969045903 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-31 15:07:45.430982442 +0000
@@ -406,10 +406,6 @@ @@ -406,10 +406,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -146,8 +146,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 20:13:57.969045903 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-31 15:07:45.430982442 +0000
@@ -397,9 +397,6 @@ @@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0

2
HMI/US/landscape/n2t-out-visual/cardAlarm.txt
View File

@@ -1261,6 +1261,7 @@ Timer tmSerial
vis b8,1 vis b8,1
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis b11,1
vis tCode,1 vis tCode,1
}else }else
{ {
@@ -1275,6 +1276,7 @@ Timer tmSerial
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
} }
//flashing status //flashing status

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

@@ -38,14 +38,14 @@ popupShutter
20 Component(s) 20 Component(s)
245 Line(s) of event code 245 Line(s) of event code
139 Unique line(s) of event code 139 Unique line(s) of event code
cardAlarm
40 Component(s)
387 Line(s) of event code
237 Unique line(s) of event code
cardThermo cardThermo
56 Component(s) 56 Component(s)
543 Line(s) of event code 543 Line(s) of event code
293 Unique line(s) of event code 293 Unique line(s) of event code
cardAlarm
40 Component(s)
385 Line(s) of event code
235 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1130 Line(s) of event code 1130 Line(s) of event code
@@ -58,5 +58,5 @@ screensaver
Total Total
13 Page(s) 13 Page(s)
406 Component(s) 406 Component(s)
4479 Line(s) of event code 4481 Line(s) of event code
1185 Unique line(s) of event code 1187 Unique line(s) of event code

2
HMI/US/landscape/n2t-out/cardAlarm.txt
View File

@@ -679,6 +679,7 @@ Timer tmSerial
vis b8,1 vis b8,1
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis b11,1
vis tCode,1 vis tCode,1
}else }else
{ {
@@ -693,6 +694,7 @@ Timer tmSerial
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
} }
//flashing status //flashing status

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 15:07:44.910974530 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,20 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000
@@ -33,7 +33,6 @@
vis b8,0
vis b9,0
vis b10,0
- vis b11,0
vis tCode,0
vis bPrev,0
vis bNext,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 15:07:44.910974530 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -479,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 15:07:44.910974530 +0000
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -491,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 15:07:44.910974530 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -512,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 15:07:44.910974530 +0000
@@ -474,22 +474,6 @@ @@ -474,22 +474,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,19 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 20:13:57.437039326 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-31 15:07:44.926974773 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 15:07:44.910974530 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 15:07:44.910974530 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000
+@@ -33,7 +33,6 @@
+ vis b8,0
+ vis b9,0
+ vis b10,0
+- vis b11,0
+ vis tCode,0
+ vis bPrev,0
+ vis bNext,0
+--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -23,11 +12,11 @@
+@@ -970,6 +1149,33 @@ +@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 15:07:44.910974530 +0000
+@@ -35,7 +35,7 @@ +@@ -35,7 +35,7 @@
+--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 15:07:44.910974530 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 15:07:44.910974530 +0000
+@@ -474,22 +474,6 @@ +@@ -474,22 +474,6 @@

3
HMI/US/portrait/n2t-out-visual/cardAlarm.txt
View File

@@ -41,6 +41,7 @@ Page cardAlarm
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -1260,6 +1261,7 @@ Timer tmSerial
vis b8,1 vis b8,1
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis b11,1
vis tCode,1 vis tCode,1
}else }else
{ {
@@ -1274,6 +1276,7 @@ Timer tmSerial
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
} }
//flashing status //flashing status

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

@@ -44,8 +44,8 @@ cardMedia
183 Unique line(s) of event code 183 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
384 Line(s) of event code 387 Line(s) of event code
234 Unique line(s) of event code 237 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
157 Line(s) of event code 157 Line(s) of event code
@@ -58,5 +58,5 @@ screensaver
Total Total
13 Page(s) 13 Page(s)
418 Component(s) 418 Component(s)
4720 Line(s) of event code 4723 Line(s) of event code
1241 Unique line(s) of event code 1244 Unique line(s) of event code

3
HMI/US/portrait/n2t-out/cardAlarm.txt
View File

@@ -33,6 +33,7 @@ Page cardAlarm
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -678,6 +679,7 @@ Timer tmSerial
vis b8,1 vis b8,1
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis b11,1
vis tCode,1 vis tCode,1
}else }else
{ {
@@ -692,6 +694,7 @@ Timer tmSerial
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
} }
//flashing status //flashing status

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

@@ -1261,6 +1261,7 @@ Timer tmSerial
vis b8,1 vis b8,1
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis b11,1
vis tCode,1 vis tCode,1
}else }else
{ {
@@ -1275,6 +1276,7 @@ Timer tmSerial
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
} }
//flashing status //flashing status

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

@@ -26,10 +26,6 @@ popupShutter
20 Component(s) 20 Component(s)
248 Line(s) of event code 248 Line(s) of event code
141 Unique line(s) of event code 141 Unique line(s) of event code
cardAlarm
40 Component(s)
385 Line(s) of event code
235 Unique line(s) of event code
cardMedia cardMedia
33 Component(s) 33 Component(s)
349 Line(s) of event code 349 Line(s) of event code
@@ -38,6 +34,10 @@ pageStartup
19 Component(s) 19 Component(s)
157 Line(s) of event code 157 Line(s) of event code
117 Unique line(s) of event code 117 Unique line(s) of event code
cardAlarm
40 Component(s)
387 Line(s) of event code
237 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
406 Component(s) 406 Component(s)
4507 Line(s) of event code 4509 Line(s) of event code
1186 Unique line(s) of event code 1188 Unique line(s) of event code

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

@@ -679,6 +679,7 @@ Timer tmSerial
vis b8,1 vis b8,1
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis b11,1
vis tCode,1 vis tCode,1
}else }else
{ {
@@ -693,6 +694,7 @@ Timer tmSerial
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
} }
//flashing status //flashing status

17
README.md
View File

@@ -380,6 +380,7 @@ key | optional | type | default | description
`sleepBrightness` | True | integer/complex | `20` | Brightness for the screen on the screensaver, see example below for complex/scheduled config. `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen on the screensaver, see example below for complex/scheduled config.
`screenBrightness` | True | integer/complex | `100` | Brightness for the screen during usage, config format is the same as sleepBrightness. `screenBrightness` | True | integer/complex | `100` | Brightness for the screen during usage, config format is the same as sleepBrightness.
`sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity. `sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity.
`sleepOverride` | True | complex | None | Allows overriding of the sleepBrightness if entity state is on, true or home. Overrides sleepBrightness but sleepTracking takes precedence.
`locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization. `locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization.
`dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields `dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields
`timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM <pre>`"%I:%M ?%p"`</pre> `timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM <pre>`"%I:%M ?%p"`</pre>
@@ -537,6 +538,22 @@ It is possible to schedule a brightness change for the screen at specific times.
value: 0 value: 0
``` ```
`sleepTracking` overrides this setting and sets the brightness to 0 if the state of the configured Home Assistant entity is `off` or `not_home`. You may also use a [Home Assistant group](https://www.home-assistant.io/integrations/group) to track multiple entities.
`sleepOverride` overrides sleepBrightness but does not take precedence over sleepTracking. This is useful if, for example, you want your NSPanel to be brighter than usual if your light is on or if you want to override a panel dimming if you are in the room.
The following example configuration does nothing during the day but at night, if the bedroom light is on the NSPanel brightness will be 20 instead of 0.
```yaml
sleepBrightness:
- time: "sunrise"
value: 20
- time: "sunset"
value: 0
sleepOverride:
entity: light.bedroomlight
brightness: 20
```
#### Override Icons or Names #### Override Icons or Names

1
apps/nspanel-lovelace-ui/luibackend/config.py
View File

@@ -69,6 +69,7 @@ class LuiBackendConfig(object):
'sleepBrightness': 20, 'sleepBrightness': 20,
'screenBrightness': 100, 'screenBrightness': 100,
'sleepTracking': None, 'sleepTracking': None,
'sleepOverride': None,
'locale': "en_US", 'locale': "en_US",
'timeFormat': "%H:%M", 'timeFormat': "%H:%M",
'dateFormatBabel': "full", 'dateFormatBabel': "full",

18
apps/nspanel-lovelace-ui/luibackend/controller.py
View File

@@ -44,6 +44,12 @@ class LuiController(object):
if bst is not None and self._ha_api.entity_exists(bst): if bst is not None and self._ha_api.entity_exists(bst):
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst) self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst)
# call update_screensaver_brightness on entity configured in sleepOverride
sleepOverride = self._config.get("sleepOverride")
if sleepOverride is not None and type(sleepOverride) is dict and sleepOverride["entity"] is not None and sleepOverride["brightness"] is not None and self._ha_api.entity_exists(sleepOverride["entity"]):
self._ha_api.log(f"Configuring Sleep Override. Config is {sleepOverride}")
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleepOverride["entity"])
# register callback for state changes on tracked value (for input_number) - sleepBrightness # register callback for state changes on tracked value (for input_number) - sleepBrightness
sleep_brightness_config = self._config.get("sleepBrightness") sleep_brightness_config = self._config.get("sleepBrightness")
if type(sleep_brightness_config) == str and self._ha_api.entity_exists(sleep_brightness_config): if type(sleep_brightness_config) == str and self._ha_api.entity_exists(sleep_brightness_config):
@@ -78,9 +84,21 @@ class LuiController(object):
def update_screensaver_brightness(self, kwargs): def update_screensaver_brightness(self, kwargs):
bst = self._config.get("sleepTracking") bst = self._config.get("sleepTracking")
sleepOverride = self._config.get("sleepOverride")
if sleepOverride is not None and type(sleepOverride) is dict:
sOEntity = sleepOverride["entity"]
sOBrightness = sleepOverride["brightness"]
sleepBrightness = 0 sleepBrightness = 0
if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]: if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]:
self._ha_api.log(f"sleepTracking setting brightness to 0")
sleepBrightness = 0 sleepBrightness = 0
elif sOEntity is not None and sOBrightness is not None and self._ha_api.entity_exists(sOEntity) and self._ha_api.get_entity(sOEntity).state in ["on", "true", "home"]:
self._ha_api.log(f"sleepOverride setting brightness to {sOBrightness}")
sleepBrightness = sOBrightness
else: else:
self.current_screensaver_brightness = kwargs['ssbr'] self.current_screensaver_brightness = kwargs['ssbr']
sleepBrightness = self.current_screensaver_brightness sleepBrightness = self.current_screensaver_brightness