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

Compare commits

base: h3n3:v2.9.1
Branches Tags
h3n3:main h3n3:gh-pages h3n3:dependabot/github_actions/stefanzweifel/git-auto-commit-action-7 h3n3:dependabot/github_actions/docker/login-action-3.6.0 h3n3:dependabot/github_actions/home-assistant/builder-2025.09.0 h3n3:dependabot/github_actions/actions/setup-python-6 h3n3:dependabot/github_actions/actions/checkout-5 h3n3:Armilar-patch-4 h3n3:Armilar-patch-3 h3n3:Armilar-patch-2 h3n3:Armilar-patch-1 h3n3:dev h3n3:thermobtns
h3n3:v4.7.4 h3n3:v4.7.3 h3n3:v4.7.2 h3n3:v4.7.1 h3n3:v4.7.0 h3n3:v4.4.0 h3n3:v4.3.3 h3n3:v4.3.2 h3n3:v4.3.1 h3n3:v4.3.0 h3n3:v4.2.1 h3n3:v4.2.0 h3n3:v4.1.4 h3n3:v4.1.3 h3n3:v4.1.2 h3n3:v4.1.1 h3n3:v4.1.0 h3n3:v4.0.5 h3n3:v4.0.4 h3n3:v4.0.3 h3n3:v4.0.2 h3n3:v4.0.1 h3n3:v4.0.0 h3n3:v3.9.4 h3n3:v3.9.3 h3n3:v3.9.2 h3n3:v3.9.1 h3n3:v3.9.0 h3n3:v3.8.3 h3n3:v3.8.2 h3n3:v3.8.1 h3n3:v3.8.0 h3n3:v3.7.3 h3n3:v3.7.2 h3n3:v3.7.1 h3n3:v3.7.0 h3n3:v3.6.0 h3n3:v3.5.0 h3n3:v3.4.0 h3n3:v3.3.1 h3n3:3.3.0 h3n3:v3.3.0 h3n3:v3.2.3 h3n3:v3.2.2 h3n3:v3.2.1 h3n3:v3.2.0 h3n3:v3.1.1 h3n3:v3.1.0 h3n3:v3.0.8 h3n3:v3.0.7 h3n3:v3.0.6 h3n3:v3.0.5 h3n3:v3.0.4 h3n3:v3.0.3 h3n3:v3.0.2 h3n3:v3.0.1 h3n3:v3.0.0 h3n3:v2.9.3 h3n3:v2.9.2 h3n3:v2.9.1 h3n3:v2.9.0 h3n3:v2.8.3 h3n3:v2.8.2 h3n3:v2.8.1 h3n3:v2.8.0 h3n3:v2.7.3 h3n3:v2.7.2 h3n3:v2.6.0 h3n3:v2.5.5 h3n3:v2.5.3 h3n3:v2.5.2 h3n3:v2.5.1 h3n3:v2.5.0 h3n3:v2.4.12 h3n3:v2.3.0 h3n3:v2.1.0 h3n3:v2.0.1 h3n3:v1.9.1 h3n3:v1.8.4 h3n3:v1.7.3 h3n3:v1.7.2 h3n3:v1.6.2 h3n3:v1.5.0 h3n3:v1.3.0 h3n3:v1.2.2 h3n3:v1.2.1 h3n3:v1.2.0 h3n3:v1.1.4 h3n3:v1.1.3 h3n3:v1.1.2 h3n3:v1.1.1 h3n3:v1.1.0 h3n3:v1.0.0
..
compare: h3n3:v2.9.3
Branches Tags
h3n3:gh-pages h3n3:main h3n3:dependabot/github_actions/stefanzweifel/git-auto-commit-action-7 h3n3:dependabot/github_actions/docker/login-action-3.6.0 h3n3:dependabot/github_actions/home-assistant/builder-2025.09.0 h3n3:dependabot/github_actions/actions/setup-python-6 h3n3:dependabot/github_actions/actions/checkout-5 h3n3:Armilar-patch-4 h3n3:Armilar-patch-3 h3n3:Armilar-patch-2 h3n3:Armilar-patch-1 h3n3:dev h3n3:thermobtns
h3n3:v4.7.4 h3n3:v4.7.3 h3n3:v4.7.2 h3n3:v4.7.1 h3n3:v4.7.0 h3n3:v4.4.0 h3n3:v4.3.3 h3n3:v4.3.2 h3n3:v4.3.1 h3n3:v4.3.0 h3n3:v4.2.1 h3n3:v4.2.0 h3n3:v4.1.4 h3n3:v4.1.3 h3n3:v4.1.2 h3n3:v4.1.1 h3n3:v4.1.0 h3n3:v4.0.5 h3n3:v4.0.4 h3n3:v4.0.3 h3n3:v4.0.2 h3n3:v4.0.1 h3n3:v4.0.0 h3n3:v3.9.4 h3n3:v3.9.3 h3n3:v3.9.2 h3n3:v3.9.1 h3n3:v3.9.0 h3n3:v3.8.3 h3n3:v3.8.2 h3n3:v3.8.1 h3n3:v3.8.0 h3n3:v3.7.3 h3n3:v3.7.2 h3n3:v3.7.1 h3n3:v3.7.0 h3n3:v3.6.0 h3n3:v3.5.0 h3n3:v3.4.0 h3n3:v3.3.1 h3n3:3.3.0 h3n3:v3.3.0 h3n3:v3.2.3 h3n3:v3.2.2 h3n3:v3.2.1 h3n3:v3.2.0 h3n3:v3.1.1 h3n3:v3.1.0 h3n3:v3.0.8 h3n3:v3.0.7 h3n3:v3.0.6 h3n3:v3.0.5 h3n3:v3.0.4 h3n3:v3.0.3 h3n3:v3.0.2 h3n3:v3.0.1 h3n3:v3.0.0 h3n3:v2.9.3 h3n3:v2.9.2 h3n3:v2.9.1 h3n3:v2.9.0 h3n3:v2.8.3 h3n3:v2.8.2 h3n3:v2.8.1 h3n3:v2.8.0 h3n3:v2.7.3 h3n3:v2.7.2 h3n3:v2.6.0 h3n3:v2.5.5 h3n3:v2.5.3 h3n3:v2.5.2 h3n3:v2.5.1 h3n3:v2.5.0 h3n3:v2.4.12 h3n3:v2.3.0 h3n3:v2.1.0 h3n3:v2.0.1 h3n3:v1.9.1 h3n3:v1.8.4 h3n3:v1.7.3 h3n3:v1.7.2 h3n3:v1.6.2 h3n3:v1.5.0 h3n3:v1.3.0 h3n3:v1.2.2 h3n3:v1.2.1 h3n3:v1.2.0 h3n3:v1.1.4 h3n3:v1.1.3 h3n3:v1.1.2 h3n3:v1.1.1 h3n3:v1.1.0 h3n3:v1.0.0

20 Commits
v2.9.1 ... v2.9.3

Author SHA1 Message Date
Johannes
eed2210b86 Update pages.py 2022-05-28 07:09:25 +02:00
joBr99
2e28bf5765 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-28 05:04:52 +00:00
Johannes
ca8ecb09bb Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-28 07:04:24 +02:00
Johannes
ce17f510db fix title on cardMedia and cardThermo 2022-05-28 07:04:16 +02:00
joBr99
7223d5095d Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-27 20:18:10 +00:00
Johannes
3262e8c3a5 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-27 22:17:41 +02:00
Johannes
7ef676a7d1 sync 2022-05-27 22:17:34 +02:00
Johannes
7295b43e57 Update issue templates 2022-05-27 22:10:41 +02:00
Johannes
0662671ee2 Update README.md 2022-05-27 22:06:07 +02:00
Johannes
cb3d59a202 Update README.md 2022-05-27 22:05:28 +02:00
Johannes
182b6bd023 Update README.md 2022-05-27 22:04:26 +02:00
Johannes
b075029d47 Update README.md 2022-05-27 21:53:43 +02:00
Johannes
cab139684e Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-27 21:44:50 +02:00
Johannes
ac101b8243 remove default icon text 2022-05-27 21:44:37 +02:00
joBr99
258aa082d0 move icons (add nextion2text) 2022-05-27 19:42:40 +00:00
Johannes
3f633222c4 move icons 2022-05-27 21:42:17 +02:00
Johannes
44d78fbb7b Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-27 21:22:32 +02:00
Johannes
2e762223e8 fix 2022-05-27 21:22:27 +02:00
joBr99
1abe6eed6b add status icons (add nextion2text) 2022-05-27 19:16:50 +00:00
Johannes
8940b7969f add status icons 2022-05-27 21:16:20 +02:00
28 changed files with 563 additions and 231 deletions
Expand all files Collapse all files

23
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,23 @@
---
name: Bug report
about: "[Bug] Create a report to help us improve"
title: "[BUG] "
labels: bug
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior
**Screenshots**
If applicable, add a picture to help explain your problem.
**AppDaemon Logs**
Please check the appdaemon log for any errors add the log to this issue. (Settings > Add-ons > AppDaemon > Log)
**Additional context**
Add any other context about the problem here.

17
.github/ISSUE_TEMPLATE/feature-request.md vendored Normal file
View File

@@ -0,0 +1,17 @@
---
name: Feature request
about: "[Feature Request] Suggest an idea for this project"
title: "[Feature Request] "
labels: enhancement
assignees: ''
---
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Additional context**
Add any other context or screenshots about the feature request here.
**Panel / Firmware Version**
Please add the Panel/Firmware Version you are using (EU, US-L or US-P)

109
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-27 14:55:07.299628243 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 14:55:08.183641171 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:04:51.228984325 +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/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-27 14:55:07.299628243 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 14:55:08.183641171 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:04:51.232984331 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-27 14:55:07.299628243 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 14:55:08.183641171 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:04:51.228984325 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -32,3 +32,100 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:04:51.228984325 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
- tSend.txt+="|"
- covx pColorWheel.h,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:04:51.232984331 +0000
@@ -62,12 +62,6 @@
Text :
Max. Text Size: 50
-Variable (string) tSend
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tTime
Attributes
Scope : local
@@ -88,6 +82,16 @@
Text : Tuesday, 08. March 2022
Max. Text Size : 35
+Text tSend
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
Text tMainIcon
Attributes
Scope : local
@@ -308,26 +312,6 @@
Text :
Max. Text Size : 35
-Text tIcon1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 5
-
-Text tIcon2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 5
-
Picture p0
Attributes
Scope : local
@@ -490,14 +474,6 @@
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
- //statusIcon1
- 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
}
if(tInstruction.txt=="color")
{
@@ -513,8 +489,6 @@
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
- tIcon1.bco=tTime.bco
- tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco

35
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-27 14:55:07.299628243 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/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/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-27 14:55:07.303628300 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,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-27 14:55:07.299628243 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -480,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-27 14:55:07.299628243 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +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
@@ -500,10 +500,23 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
- tSend.txt+="|"
- covx pColorWheel.h,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
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-27 14:55:07.299628243 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000
@@ -455,22 +455,6 @@ @@ -471,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1
vis tMR,1 vis tMR,1

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

@@ -1,11 +1,25 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 14:55:07.791635235 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 05:04:50.800983931 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:55:07.303628300 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-27 14:55:07.299628243 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000
+@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
+- tSend.txt+="|"
+- covx pColorWheel.h,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000
+@@ -471,22 +471,6 @@

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

@@ -38,10 +38,6 @@ cardMedia
33 Component(s) 33 Component(s)
350 Line(s) of event code 350 Line(s) of event code
179 Unique line(s) of event code 179 Unique line(s) of event code
screensaver
35 Component(s)
282 Line(s) of event code
223 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
@@ -50,6 +46,10 @@ popupShutter
20 Component(s) 20 Component(s)
244 Line(s) of event code 244 Line(s) of event code
138 Unique line(s) of event code 138 Unique line(s) of event code
screensaver
37 Component(s)
290 Line(s) of event code
229 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1363 Line(s) of event code 1363 Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
414 Component(s) 416 Component(s)
4674 Line(s) of event code 4682 Line(s) of event code
1225 Unique line(s) of event code 1231 Unique line(s) of event code

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

@@ -50,27 +50,34 @@ Variable (string) strCommand
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 17 ID : 16
Scope : local Scope : local
Text : Text :
Max. Text Size: 25 Max. Text Size: 25
Variable (int32) vaTap Variable (int32) vaTap
Attributes Attributes
ID : 25 ID : 24
Scope: local Scope: local
Value: 0 Value: 0
Variable (string) tInstruction Variable (string) tInstruction
Attributes Attributes
ID : 31 ID : 30
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (string) tTmp Variable (string) tTmp
Attributes Attributes
ID : 32 ID : 31
Scope : local
Text :
Max. Text Size: 50
Variable (string) tSend
Attributes
ID : 34
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
@@ -135,7 +142,7 @@ Text tDate
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tSend Text tMainIcon
Attributes Attributes
ID : 7 ID : 7
Scope : local Scope : local
@@ -143,38 +150,8 @@ Text tSend
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 19
y coordinate : 450
Width : 27
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tMainIcon
Attributes
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 125 x coordinate : 125
y coordinate : 241 y coordinate : 254
Width : 70 Width : 70
Height : 65 Height : 65
Effect : load Effect : load
@@ -197,14 +174,14 @@ Text tMainIcon
Text tMainText Text tMainText
Attributes Attributes
ID : 9 ID : 8
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 111 x coordinate : 111
y coordinate : 305 y coordinate : 318
Width : 110 Width : 110
Height : 42 Height : 42
Effect : load Effect : load
@@ -227,14 +204,14 @@ Text tMainText
Text tForecast1 Text tForecast1
Attributes Attributes
ID : 10 ID : 9
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 5 x coordinate : 5
y coordinate : 368 y coordinate : 377
Width : 71 Width : 71
Height : 25 Height : 25
Effect : load Effect : load
@@ -257,14 +234,14 @@ Text tForecast1
Text tForecast1Val Text tForecast1Val
Attributes Attributes
ID : 11 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 2 x coordinate : 2
y coordinate : 434 y coordinate : 443
Width : 70 Width : 70
Height : 24 Height : 24
Effect : load Effect : load
@@ -287,14 +264,14 @@ Text tForecast1Val
Text tF1Icon Text tF1Icon
Attributes Attributes
ID : 12 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 23 x coordinate : 23
y coordinate : 397 y coordinate : 406
Width : 40 Width : 40
Height : 34 Height : 34
Effect : load Effect : load
@@ -317,14 +294,14 @@ Text tF1Icon
Text tForecast2 Text tForecast2
Attributes Attributes
ID : 13 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 86 x coordinate : 86
y coordinate : 369 y coordinate : 378
Width : 71 Width : 71
Height : 24 Height : 24
Effect : load Effect : load
@@ -347,14 +324,14 @@ Text tForecast2
Text tF2Icon Text tF2Icon
Attributes Attributes
ID : 14 ID : 13
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 103 x coordinate : 103
y coordinate : 397 y coordinate : 406
Width : 40 Width : 40
Height : 34 Height : 34
Effect : load Effect : load
@@ -377,14 +354,14 @@ Text tF2Icon
Text tForecast2Val Text tForecast2Val
Attributes Attributes
ID : 15 ID : 14
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 83 x coordinate : 83
y coordinate : 434 y coordinate : 443
Width : 71 Width : 71
Height : 24 Height : 24
Effect : load Effect : load
@@ -407,14 +384,14 @@ Text tForecast2Val
Text t10 Text t10
Attributes Attributes
ID : 16 ID : 15
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 49 x coordinate : 49
y coordinate : 225 y coordinate : 233
Width : 225 Width : 225
Height : 2 Height : 2
Effect : load Effect : load
@@ -437,7 +414,7 @@ Text t10
Text tAMPM Text tAMPM
Attributes Attributes
ID : 18 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -467,14 +444,14 @@ Text tAMPM
Text tForecast3Val Text tForecast3Val
Attributes Attributes
ID : 19 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 165 x coordinate : 165
y coordinate : 435 y coordinate : 444
Width : 70 Width : 70
Height : 23 Height : 23
Effect : load Effect : load
@@ -497,14 +474,14 @@ Text tForecast3Val
Text tF3Icon Text tF3Icon
Attributes Attributes
ID : 20 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 183 x coordinate : 183
y coordinate : 398 y coordinate : 407
Width : 40 Width : 40
Height : 33 Height : 33
Effect : load Effect : load
@@ -527,14 +504,14 @@ Text tF3Icon
Text tForecast3 Text tForecast3
Attributes Attributes
ID : 21 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 167 x coordinate : 167
y coordinate : 370 y coordinate : 379
Width : 70 Width : 70
Height : 23 Height : 23
Effect : load Effect : load
@@ -557,14 +534,14 @@ Text tForecast3
Text tForecast4 Text tForecast4
Attributes Attributes
ID : 22 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 247 x coordinate : 247
y coordinate : 370 y coordinate : 379
Width : 70 Width : 70
Height : 23 Height : 23
Effect : load Effect : load
@@ -587,14 +564,14 @@ Text tForecast4
Text tF4Icon Text tF4Icon
Attributes Attributes
ID : 23 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 263 x coordinate : 263
y coordinate : 398 y coordinate : 407
Width : 40 Width : 40
Height : 33 Height : 33
Effect : load Effect : load
@@ -617,14 +594,14 @@ Text tF4Icon
Text tForecast4Val Text tForecast4Val
Attributes Attributes
ID : 24 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 246 x coordinate : 246
y coordinate : 435 y coordinate : 444
Width : 70 Width : 70
Height : 23 Height : 23
Effect : load Effect : load
@@ -647,14 +624,14 @@ Text tForecast4Val
Text tMainTextAlt Text tMainTextAlt
Attributes Attributes
ID : 27 ID : 26
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 184 x coordinate : 184
y coordinate : 249 y coordinate : 262
Width : 105 Width : 105
Height : 41 Height : 41
Effect : load Effect : load
@@ -677,14 +654,14 @@ Text tMainTextAlt
Text tMainIconAlt Text tMainIconAlt
Attributes Attributes
ID : 28 ID : 27
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 44 x coordinate : 44
y coordinate : 260 y coordinate : 273
Width : 100 Width : 100
Height : 65 Height : 65
Effect : load Effect : load
@@ -707,14 +684,14 @@ Text tMainIconAlt
Text tMRIcon Text tMRIcon
Attributes Attributes
ID : 29 ID : 28
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 182 x coordinate : 182
y coordinate : 304 y coordinate : 317
Width : 40 Width : 40
Height : 34 Height : 34
Effect : load Effect : load
@@ -737,14 +714,14 @@ Text tMRIcon
Text tMR Text tMR
Attributes Attributes
ID : 30 ID : 29
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 224 x coordinate : 224
y coordinate : 309 y coordinate : 322
Width : 61 Width : 61
Height : 20 Height : 20
Effect : load Effect : load
@@ -767,14 +744,14 @@ Text tMR
Text tNotifyHead Text tNotifyHead
Attributes Attributes
ID : 33 ID : 32
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 236 y coordinate : 253
Width : 320 Width : 320
Height : 58 Height : 58
Effect : load Effect : load
@@ -797,14 +774,14 @@ Text tNotifyHead
Text tNotifyText Text tNotifyText
Attributes Attributes
ID : 34 ID : 33
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 294 y coordinate : 311
Width : 320 Width : 320
Height : 58 Height : 58
Effect : load Effect : load
@@ -825,6 +802,66 @@ Text tNotifyText
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tIcon1
Attributes
ID : 35
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 8
y coordinate : 220
Width : 33
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tIcon2
Attributes
ID : 36
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 282
y coordinate : 220
Width : 33
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -982,6 +1019,14 @@ Timer tmSerial
} }
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
//statusIcon1
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
} }
if(tInstruction.txt=="color") if(tInstruction.txt=="color")
{ {
@@ -997,6 +1042,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco
@@ -1135,7 +1182,7 @@ Timer tmSerial
Timer tmSleep Timer tmSleep
Attributes Attributes
ID : 26 ID : 25
Scope : local Scope : local
Period (ms): 1000 Period (ms): 1000
Enabled : yes Enabled : yes

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

@@ -62,6 +62,12 @@ Variable (string) tTmp
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 50
Text tTime Text tTime
Attributes Attributes
Scope : local Scope : local
@@ -82,16 +88,6 @@ Text tDate
Text : Tuesday, 08. March 2022 Text : Tuesday, 08. March 2022
Max. Text Size : 35 Max. Text Size : 35
Text tSend
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Text tMainIcon Text tMainIcon
Attributes Attributes
Scope : local Scope : local
@@ -312,6 +308,26 @@ Text tNotifyText
Text : Text :
Max. Text Size : 35 Max. Text Size : 35
Text tIcon1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 5
Text tIcon2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 5
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -458,6 +474,14 @@ Timer tmSerial
} }
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
//statusIcon1
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
} }
if(tInstruction.txt=="color") if(tInstruction.txt=="color")
{ {
@@ -473,6 +497,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco

BIN
HMI/US/portrait/nspanel_US_P.HMI
View File

Binary file not shown.

BIN
HMI/US/portrait/nspanel_US_P.tft
View File

Binary file not shown.

BIN
HMI/fonts - Kopie/(C) HMI NotoSans-Regular 24 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts - Kopie/(C) HMI NotoSans-Regular 32 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts - Kopie/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 24 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts - Kopie/ALL CHARS (non CJK) HMI NotoSans-Regular 32 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi Normal file
View File

Binary file not shown.

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

@@ -22,14 +22,14 @@ popupNotify
17 Component(s) 17 Component(s)
200 Line(s) of event code 200 Line(s) of event code
125 Unique line(s) of event code 125 Unique line(s) of event code
screensaver
35 Component(s)
297 Line(s) of event code
238 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
345 Line(s) of event code 348 Line(s) of event code
187 Unique line(s) of event code 188 Unique line(s) of event code
screensaver
37 Component(s)
305 Line(s) of event code
244 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
402 Component(s) 404 Component(s)
4460 Line(s) of event code 4471 Line(s) of event code
1169 Unique line(s) of event code 1176 Unique line(s) of event code

3
HMI/n2t-out-visual/popupLight.txt
View File

@@ -461,6 +461,9 @@ Picture pColorWheel
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

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

@@ -50,27 +50,34 @@ Variable (string) strCommand
Variable (string) tId Variable (string) tId
Attributes Attributes
ID : 17 ID : 16
Scope : local Scope : local
Text : Text :
Max. Text Size: 25 Max. Text Size: 25
Variable (int32) vaTap Variable (int32) vaTap
Attributes Attributes
ID : 25 ID : 24
Scope: local Scope: local
Value: 0 Value: 0
Variable (string) tInstruction Variable (string) tInstruction
Attributes Attributes
ID : 31 ID : 30
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (string) tTmp Variable (string) tTmp
Attributes Attributes
ID : 32 ID : 31
Scope : local
Text :
Max. Text Size: 50
Variable (string) tSend
Attributes
ID : 34
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
@@ -84,7 +91,7 @@ Text tTime
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 0 y coordinate : 4
Width : 451 Width : 451
Height : 150 Height : 150
Effect : load Effect : load
@@ -113,9 +120,9 @@ Text tDate
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 38
y coordinate : 150 y coordinate : 154
Width : 451 Width : 375
Height : 38 Height : 38
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -135,7 +142,7 @@ Text tDate
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tSend Text tMainIcon
Attributes Attributes
ID : 7 ID : 7
Scope : local Scope : local
@@ -143,38 +150,8 @@ Text tSend
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 405
y coordinate : 2
Width : 29
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tMainIcon
Attributes
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 26 x coordinate : 26
y coordinate : 202 y coordinate : 206
Width : 70 Width : 70
Height : 66 Height : 66
Effect : load Effect : load
@@ -197,14 +174,14 @@ Text tMainIcon
Text tMainText Text tMainText
Attributes Attributes
ID : 9 ID : 8
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 7 x coordinate : 7
y coordinate : 267 y coordinate : 271
Width : 110 Width : 110
Height : 43 Height : 43
Effect : load Effect : load
@@ -227,14 +204,14 @@ Text tMainText
Text tForecast1 Text tForecast1
Attributes Attributes
ID : 10 ID : 9
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 128 x coordinate : 128
y coordinate : 210 y coordinate : 214
Width : 72 Width : 72
Height : 26 Height : 26
Effect : load Effect : load
@@ -257,14 +234,14 @@ Text tForecast1
Text tForecast1Val Text tForecast1Val
Attributes Attributes
ID : 11 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 125 x coordinate : 125
y coordinate : 276 y coordinate : 280
Width : 71 Width : 71
Height : 25 Height : 25
Effect : load Effect : load
@@ -287,14 +264,14 @@ Text tForecast1Val
Text tF1Icon Text tF1Icon
Attributes Attributes
ID : 12 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 146 x coordinate : 146
y coordinate : 239 y coordinate : 243
Width : 40 Width : 40
Height : 35 Height : 35
Effect : load Effect : load
@@ -317,14 +294,14 @@ Text tF1Icon
Text tForecast2 Text tForecast2
Attributes Attributes
ID : 13 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 212 x coordinate : 212
y coordinate : 210 y coordinate : 214
Width : 72 Width : 72
Height : 25 Height : 25
Effect : load Effect : load
@@ -347,14 +324,14 @@ Text tForecast2
Text tF2Icon Text tF2Icon
Attributes Attributes
ID : 14 ID : 13
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 228 x coordinate : 228
y coordinate : 239 y coordinate : 243
Width : 40 Width : 40
Height : 35 Height : 35
Effect : load Effect : load
@@ -377,14 +354,14 @@ Text tF2Icon
Text tForecast2Val Text tForecast2Val
Attributes Attributes
ID : 15 ID : 14
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 212 x coordinate : 212
y coordinate : 277 y coordinate : 281
Width : 72 Width : 72
Height : 25 Height : 25
Effect : load Effect : load
@@ -407,14 +384,14 @@ Text tForecast2Val
Text t10 Text t10
Attributes Attributes
ID : 16 ID : 15
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 46 x coordinate : 46
y coordinate : 195 y coordinate : 199
Width : 360 Width : 360
Height : 2 Height : 2
Effect : load Effect : load
@@ -437,14 +414,14 @@ Text t10
Text tAMPM Text tAMPM
Attributes Attributes
ID : 18 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 343 x coordinate : 343
y coordinate : 48 y coordinate : 52
Width : 104 Width : 104
Height : 57 Height : 57
Effect : load Effect : load
@@ -467,14 +444,14 @@ Text tAMPM
Text tForecast3Val Text tForecast3Val
Attributes Attributes
ID : 19 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 292 x coordinate : 292
y coordinate : 277 y coordinate : 281
Width : 71 Width : 71
Height : 25 Height : 25
Effect : load Effect : load
@@ -497,14 +474,14 @@ Text tForecast3Val
Text tF3Icon Text tF3Icon
Attributes Attributes
ID : 20 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 309 x coordinate : 309
y coordinate : 239 y coordinate : 243
Width : 40 Width : 40
Height : 35 Height : 35
Effect : load Effect : load
@@ -527,14 +504,14 @@ Text tF3Icon
Text tForecast3 Text tForecast3
Attributes Attributes
ID : 21 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 293 x coordinate : 293
y coordinate : 210 y coordinate : 214
Width : 72 Width : 72
Height : 25 Height : 25
Effect : load Effect : load
@@ -557,14 +534,14 @@ Text tForecast3
Text tForecast4 Text tForecast4
Attributes Attributes
ID : 22 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 374 x coordinate : 374
y coordinate : 210 y coordinate : 214
Width : 72 Width : 72
Height : 25 Height : 25
Effect : load Effect : load
@@ -587,14 +564,14 @@ Text tForecast4
Text tF4Icon Text tF4Icon
Attributes Attributes
ID : 23 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 390 x coordinate : 390
y coordinate : 239 y coordinate : 243
Width : 40 Width : 40
Height : 35 Height : 35
Effect : load Effect : load
@@ -617,14 +594,14 @@ Text tF4Icon
Text tForecast4Val Text tForecast4Val
Attributes Attributes
ID : 24 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 374 x coordinate : 374
y coordinate : 277 y coordinate : 281
Width : 72 Width : 72
Height : 25 Height : 25
Effect : load Effect : load
@@ -647,14 +624,14 @@ Text tForecast4Val
Text tMainTextAlt Text tMainTextAlt
Attributes Attributes
ID : 27 ID : 26
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 104 x coordinate : 104
y coordinate : 210 y coordinate : 214
Width : 106 Width : 106
Height : 42 Height : 42
Effect : load Effect : load
@@ -677,14 +654,14 @@ Text tMainTextAlt
Text tMainIconAlt Text tMainIconAlt
Attributes Attributes
ID : 28 ID : 27
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 221 y coordinate : 225
Width : 100 Width : 100
Height : 66 Height : 66
Effect : load Effect : load
@@ -707,14 +684,14 @@ Text tMainIconAlt
Text tMRIcon Text tMRIcon
Attributes Attributes
ID : 29 ID : 28
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 101 x coordinate : 101
y coordinate : 266 y coordinate : 270
Width : 40 Width : 40
Height : 35 Height : 35
Effect : load Effect : load
@@ -737,14 +714,14 @@ Text tMRIcon
Text tMR Text tMR
Attributes Attributes
ID : 30 ID : 29
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 144 x coordinate : 144
y coordinate : 270 y coordinate : 274
Width : 62 Width : 62
Height : 21 Height : 21
Effect : load Effect : load
@@ -767,14 +744,14 @@ Text tMR
Text tNotifyHead Text tNotifyHead
Attributes Attributes
ID : 33 ID : 32
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 201 y coordinate : 205
Width : 450 Width : 450
Height : 58 Height : 58
Effect : load Effect : load
@@ -797,14 +774,14 @@ Text tNotifyHead
Text tNotifyText Text tNotifyText
Attributes Attributes
ID : 34 ID : 33
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 258 y coordinate : 262
Width : 450 Width : 450
Height : 47 Height : 47
Effect : load Effect : load
@@ -825,6 +802,66 @@ Text tNotifyText
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tIcon1
Attributes
ID : 35
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 154
Width : 38
Height : 38
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 0
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tIcon2
Attributes
ID : 36
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 413
y coordinate : 154
Width : 38
Height : 38
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 0
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0 Picture p0
Attributes Attributes
ID : 1 ID : 1
@@ -998,6 +1035,14 @@ Timer tmSerial
} }
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
//statusIcon1
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
} }
if(tInstruction.txt=="color") if(tInstruction.txt=="color")
{ {
@@ -1013,6 +1058,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco
@@ -1151,7 +1198,7 @@ Timer tmSerial
Timer tmSleep Timer tmSleep
Attributes Attributes
ID : 26 ID : 25
Scope : local Scope : local
Period (ms): 1000 Period (ms): 1000
Enabled : yes Enabled : yes

3
HMI/n2t-out/popupLight.txt
View File

@@ -209,6 +209,9 @@ Picture pColorWheel
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt tSend.txt+=tTmp.txt
tSend.txt+="|"
covx pColorWheel.h,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

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

@@ -62,6 +62,12 @@ Variable (string) tTmp
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 50
Text tTime Text tTime
Attributes Attributes
Scope : local Scope : local
@@ -82,16 +88,6 @@ Text tDate
Text : Tuesday, 08. March 2022 Text : Tuesday, 08. March 2022
Max. Text Size : 35 Max. Text Size : 35
Text tSend
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Text tMainIcon Text tMainIcon
Attributes Attributes
Scope : local Scope : local
@@ -312,6 +308,26 @@ Text tNotifyText
Text : Text :
Max. Text Size : 35 Max. Text Size : 35
Text tIcon1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 5
Text tIcon2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 5
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -474,6 +490,14 @@ Timer tmSerial
} }
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
//statusIcon1
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
} }
if(tInstruction.txt=="color") if(tInstruction.txt=="color")
{ {
@@ -489,6 +513,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco

BIN
HMI/nspanel.HMI
View File

Binary file not shown.

BIN
HMI/nspanel.tft
View File

Binary file not shown.

6
README.md
View File

@@ -457,6 +457,8 @@ key | optional | type | default | description
`weatherOverrideForecast2` | True | complex | `None` | sensor entity from home assistant here to override the second weather forecast item on the screensaver `weatherOverrideForecast2` | True | complex | `None` | sensor entity from home assistant here to override the second weather forecast item on the screensaver
`weatherOverrideForecast3` | True | complex | `None` | sensor entity from home assistant here to override the third weather forecast item on the screensaver `weatherOverrideForecast3` | True | complex | `None` | sensor entity from home assistant here to override the third weather forecast item on the screensaver
`weatherOverrideForecast4` | True | complex | `None` | sensor entity from home assistant here to override the forth weather forecast item on the screensaver `weatherOverrideForecast4` | True | complex | `None` | sensor entity from home assistant here to override the forth weather forecast item on the screensaver
`statusIcon1` | True | complex | `None` | status icon left to the date string, config similar to weatherOverride
`statusIcon2` | True | complex | `None` | status icon right to the date string, config similar to weatherOverride
`doubleTapToUnlock` | True | boolean | `False` | requires to tap screensaver two times `doubleTapToUnlock` | True | boolean | `False` | requires to tap screensaver two times
`alternativeLayout` | True | boolean | `False` | alternative layout with humidity `alternativeLayout` | True | boolean | `False` | alternative layout with humidity
`theme` | True | complex | | configuration for theme `theme` | True | complex | | configuration for theme
@@ -738,9 +740,11 @@ Click redownload in the menu of the app in HACS.
Select main version. Select main version.
**!!! Wait for it to load, dropdown needs to be selectable again, otherwise it will download the latest release !!!**
![hacs-main](doc-pics/hacs-main.png) ![hacs-main](doc-pics/hacs-main.png)
**Wait for it to load, dropdown needs to be selectable again** **!!! Wait for it to load, dropdown needs to be selectable again, otherwise it will download the latest release !!!**
Click download. Click download.

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

@@ -36,7 +36,7 @@ class Card(object):
for e in self.entities: for e in self.entities:
entityIds.append(e.entityId) entityIds.append(e.entityId)
# additional keys to check # additional keys to check
add_ent_keys = ['weatherOverrideForecast1', 'weatherOverrideForecast2', 'weatherOverrideForecast3', 'weatherOverrideForecast4'] add_ent_keys = ['weatherOverrideForecast1', 'weatherOverrideForecast2', 'weatherOverrideForecast3', 'weatherOverrideForecast4', 'statusIcon1', 'statusIcon2']
for ent_key in add_ent_keys: for ent_key in add_ent_keys:
val = self.raw_config.get(ent_key) val = self.raw_config.get(ent_key)
if val is not None: if val is not None:

20
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -122,11 +122,23 @@ class LuiPagesGen(object):
down = f"{entity.state} {unit_of_measurement}" down = f"{entity.state} {unit_of_measurement}"
weather_res+=f"~{up}~{icon}~{down}" weather_res+=f"~{up}~{icon}~{down}"
altLayout = "" altLayout = "~~"
if self._config._config_screensaver.raw_config.get("alternativeLayout", False): if self._config._config_screensaver.raw_config.get("alternativeLayout", False):
altLayout = f"~{get_icon_id('water-percent')}~{we.attributes.humidity} %" altLayout = f"~{get_icon_id('water-percent')}~{we.attributes.humidity} %"
self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}{altLayout}") # status icons
status_res = ""
for i in range(1,3):
statusIcon = self._config._config_screensaver.raw_config.get(f"statusIcon{i}")
if statusIcon is not None:
icon = statusIcon.get("icon")
entity = self._ha_api.get_entity(statusIcon.get("entity"))
entityType = statusIcon.get("entity").split(".")[0]
icon = get_icon_id_ha(entityType, state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon)
color = self.get_entity_color(entity)
status_res += f"~{icon}~{color}"
self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}{altLayout}{status_res}")
# send color if configured in screensaver # send color if configured in screensaver
if theme is not None: if theme is not None:
@@ -265,7 +277,7 @@ class LuiPagesGen(object):
command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~" command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~"
else: else:
entity = self._ha_api.get_entity(item) entity = self._ha_api.get_entity(item)
heading = title if title is not None else entity.attributes.friendly_name heading = title if title != "unknown" else entity.attributes.friendly_name
current_temp = get_attr_safe(entity, "current_temperature", "") current_temp = get_attr_safe(entity, "current_temperature", "")
dest_temp = int(get_attr_safe(entity, "temperature", 0)*10) dest_temp = int(get_attr_safe(entity, "temperature", 0)*10)
status = get_attr_safe(entity, "hvac_action", "") status = get_attr_safe(entity, "hvac_action", "")
@@ -318,7 +330,7 @@ class LuiPagesGen(object):
command = f"entityUpd~Not found~{navigation}~{item}~{get_icon_id('alert-circle-outline')}~Please check your~apps.yaml in AppDaemon~~0~{get_icon_id('alert-circle-outline')}~~~disable" command = f"entityUpd~Not found~{navigation}~{item}~{get_icon_id('alert-circle-outline')}~Please check your~apps.yaml in AppDaemon~~0~{get_icon_id('alert-circle-outline')}~~~disable"
else: else:
entity = self._ha_api.get_entity(item) entity = self._ha_api.get_entity(item)
heading = title if title is not None else entity.attributes.friendly_name heading = title if title != "unknown" else entity.attributes.friendly_name
icon = get_icon_id('speaker-off') icon = get_icon_id('speaker-off')
title = get_attr_safe(entity, "media_title", "") title = get_attr_safe(entity, "media_title", "")
author = get_attr_safe(entity, "media_artist", "") author = get_attr_safe(entity, "media_artist", "")