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

Merge remote-tracking branch 'origin/main' into docs

Browse Source
This commit is contained in:
Johannes
2022-06-11 18:19:30 +02:00
parent e3c23d4e9b 39c94690f3
commit bba33bec9d
13 changed files with 1556 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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-06-06 20:43:14.701325786 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:43:15.757379552 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-08 20:00:08.089056883 +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/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-06-06 20:43:14.705325989 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:43:15.757379552 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-08 20:00:08.089056883 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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

@@ -1041,7 +1041,7 @@ Timer tmSerial
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tMRIcon.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
if(tMRIcon.txt!="") if(tMRIcon.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0

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

@@ -476,7 +476,7 @@ Timer tmSerial
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tMRIcon.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
if(tMRIcon.txt!="") if(tMRIcon.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0

16
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-06-06 20:43:14.701325786 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +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-06-06 20:43:14.705325989 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-08 20:00:07.004980492 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:43:14.705325989 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
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-06-06 20:43:14.705325989 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +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

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:43:15.233352872 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-08 20:00:07.557019374 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:43:14.701325786 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-08 20:00:07.004980492 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:43:15.217352058 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-08 20:00:07.521016838 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:43:14.705325989 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-08 20:00:07.004980492 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:43:15.217352058 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-08 20:00:07.521016838 +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 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:43:14.705325989 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-08 20:00:07.004980492 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:43:15.217352058 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-08 20:00:07.521016838 +0000
+@@ -45,12 +45,6 @@ +@@ -45,12 +45,6 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -59,5 +59,5 @@
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:43:14.705325989 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-08 20:00:07.004980492 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:43:15.217352058 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-08 20:00:07.525017120 +0000

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

@@ -901,9 +901,9 @@ Picture p0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 1 y coordinate : 0
Width : 319 Width : 320
Height : 479 Height : 480
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1041,7 +1041,7 @@ Timer tmSerial
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tMRIcon.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
if(tMRIcon.txt!="") if(tMRIcon.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0

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

@@ -476,7 +476,7 @@ Timer tmSerial
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tMRIcon.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
if(tMRIcon.txt!="") if(tMRIcon.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0

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

@@ -22,10 +22,6 @@ popupLight
27 Component(s) 27 Component(s)
352 Line(s) of event code 352 Line(s) of event code
191 Unique line(s) of event code 191 Unique line(s) of event code
screensaver
38 Component(s)
319 Line(s) of event code
253 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -50,6 +46,10 @@ cardThermo
53 Component(s) 53 Component(s)
555 Line(s) of event code 555 Line(s) of event code
292 Unique line(s) of event code 292 Unique line(s) of event code
screensaver
38 Component(s)
319 Line(s) of event code
253 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code

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

@@ -1041,7 +1041,7 @@ Timer tmSerial
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tMRIcon.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
if(tMRIcon.txt!="") if(tMRIcon.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0

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

@@ -476,7 +476,7 @@ Timer tmSerial
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tMRIcon.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
if(tMRIcon.txt!="") if(tMRIcon.txt!=""&&p0.w!=320)
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0

17
README.md
View File

@@ -176,7 +176,7 @@ You only need to do one **Tasmota** OR **ESPHome**
### Flash Tasmota to your NSPanel ### Flash Tasmota to your NSPanel
You need to connect to your nspanel via serial and flash the [tasmota32-nspanel.bin](https://github.com/tasmota/install/raw/main/firmware/unofficial/tasmota32-nspanel.bin) to your NSPanel. You need to connect to your nspanel via serial and flash tasmtoa [tasmota32-nspanel.factory.bin](https://tasmota.github.io/install/firmware/development/tasmota32-nspanel.factory.bin) to your NSPanel. You can use the Tasmota Web Installer to do so. [Tasmota Web Installer](https://tasmota.github.io/install/)
Make sure to come back to this guide, before uploading the nspanel.be/autoexec.be files. Make sure to come back to this guide, before uploading the nspanel.be/autoexec.be files.
For more deatils see the [NSPanel Page of the Tasmota Template Repository](https://templates.blakadder.com/sonoff_NSPanel.html). For more deatils see the [NSPanel Page of the Tasmota Template Repository](https://templates.blakadder.com/sonoff_NSPanel.html).
@@ -246,6 +246,10 @@ Support for ESPHome is WIP, see this third-party [ESPHome component](https://git
## Configuration ## Configuration
Note this is the documentation of the current development version and might have changed since latest release, so see the documentation of the current release visit:
https://github.com/joBr99/nspanel-lovelace-ui/tree/v2.9.3
### Configuring the MQTT integration in AppDaemon ### Configuring the MQTT integration in AppDaemon
For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml` For the app to work you need a working MQTT Configuration in AppDaemon. Please add the configuration of your mqtt server, user and password to your existing `appdaemon.yaml`
@@ -354,9 +358,11 @@ nspanel-1:
title: Guest Wifi title: Guest Wifi
qrCode: "WIFI:S:test_ssid;T:WPA;P:test_pw;;" qrCode: "WIFI:S:test_ssid;T:WPA;P:test_pw;;"
entities: entities:
- entity: iText.Name.test_ssid - entity: iText.test_ssid
name: Name
icon: mdi:wifi icon: mdi:wifi
- entity: iText.Password.test_pw - entity: iText.test_pw
name: Password
icon: mdi:key icon: mdi:key
``` ```
@@ -768,11 +774,6 @@ Since release 1.1 you can update the berry driver directly from the Tasmota Cons
## FAQ - Frequently Asked Questions ## FAQ - Frequently Asked Questions
### Flashing of the Display Firmware with FlashNextion doesn't work
1. Make sure to use the [tasmota32-nspanel.bin](https://github.com/tasmota/install/raw/main/firmware/unofficial/tasmota32-nspanel.bin) Tasmota build.
2. Make sure to use HTTP and **not HTTPS**
### Waiting for content - This is taking longer than usual on the screen ### Waiting for content - This is taking longer than usual on the screen
Please check your MQTT Topics in your apps.yaml and your mqtt configuration on tasmota. Please check your MQTT Topics in your apps.yaml and your mqtt configuration on tasmota.

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

@@ -179,10 +179,10 @@ class LuiPagesGen(object):
else: else:
return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~page not found~" return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~page not found~"
if entityType == "iText": if entityType == "iText":
key = entityId.split(".")[1] value = entityId.split(".", 2)[1]
value = entityId.split(".")[2] name = name if name is not None else "conf name missing"
icon_id = get_icon_id(icon) if icon is not None else get_icon_id("alert-circle-outline") icon_id = get_icon_id(icon) if icon is not None else get_icon_id("alert-circle-outline")
return f"~text~{entityId}~{icon_id}~17299~{key}~{value}" return f"~text~{entityId}~{icon_id}~17299~{name}~{value}"
if not self._ha_api.entity_exists(entityId): if not self._ha_api.entity_exists(entityId):
return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~Not found check~ apps.yaml" return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~Not found check~ apps.yaml"

1757
ioBroker/NsPanelTs.ts
View File

File diff suppressed because it is too large Load Diff