This commit is contained in:
joBr99
2022-06-18 15:41:52 +02:00
21 changed files with 185 additions and 168 deletions

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-17 16:00:08.432785049 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-17 21:31:52.834043346 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-17 16:00:09.120777566 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-17 21:31:53.966042754 +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-17 16:00:08.432785049 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 16:00:09.120777566 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 21:31:53.966042754 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

View File

@@ -26,6 +26,10 @@ cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
popupLight
27 Component(s)
353 Line(s) of event code
193 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code
@@ -42,10 +46,6 @@ cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code
496 Unique line(s) of event code 496 Unique line(s) of event code
popupLight
27 Component(s)
353 Line(s) of event code
193 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
555 Line(s) of event code 555 Line(s) of event code

View File

@@ -64,7 +64,7 @@ Variable (string) strCommand
ID : 17 ID : 17
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -54,7 +54,7 @@ Variable (string) strCommand
ID : 9 ID : 9
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -55,7 +55,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -45,7 +45,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

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-17 16:00:08.432785049 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-17 21:31:52.834043346 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 16:00:08.736781742 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 21:31:53.382043060 +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-17 16:00:08.432785049 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-17 21:31:52.838043344 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 21:31:53.382043060 +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/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-17 16:00:08.432785049 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 16:00:08.740781699 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 21:31:53.382043060 +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
@@ -489,8 +489,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-17 16:00:08.432785049 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-17 21:31:52.834043346 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 21:31:53.382043060 +0000
@@ -151,7 +151,7 @@ @@ -151,7 +151,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -501,8 +501,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Text tInstruction Text tInstruction
Attributes Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-17 16:00:08.432785049 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-17 21:31:52.834043346 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 21:31:53.382043060 +0000
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
Attributes Attributes
Scope : local Scope : local

View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 16:00:08.780781264 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 21:31:53.398043051 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-17 16:00:08.432785049 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-17 21:31:52.834043346 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 16:00:08.736781742 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 21:31:53.382043060 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-17 16:00:08.432785049 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-17 21:31:52.838043344 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 21:31:53.382043060 +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 @@
@@ -14,11 +14,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/pageStartup.txt 2022-06-17 16:00:08.432785049 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 16:00:08.740781699 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 21:31:53.382043060 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-06-17 16:00:08.432785049 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-17 21:31:52.834043346 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 21:31:53.382043060 +0000
+@@ -151,7 +151,7 @@ +@@ -151,7 +151,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
@@ -29,8 +29,8 @@
+ Text tInstruction + Text tInstruction
+ Attributes + Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-06-17 16:00:08.432785049 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-17 21:31:52.834043346 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 21:31:53.382043060 +0000
+@@ -69,7 +69,7 @@ +@@ -69,7 +69,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local

View File

@@ -2,10 +2,10 @@ Program.s
0 Component(s) 0 Component(s)
10 Line(s) of event code 10 Line(s) of event code
10 Unique line(s) of event code 10 Unique line(s) of event code
popupLight popupShutter
27 Component(s) 25 Component(s)
353 Line(s) of event code 331 Line(s) of event code
193 Unique line(s) of event code 163 Unique line(s) of event code
pageIcons pageIcons
6 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
@@ -18,10 +18,6 @@ cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
popupShutter
25 Component(s)
331 Line(s) of event code
163 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code
@@ -42,6 +38,10 @@ screensaver
38 Component(s) 38 Component(s)
319 Line(s) of event code 319 Line(s) of event code
253 Unique line(s) of event code 253 Unique line(s) of event code
popupLight
27 Component(s)
353 Line(s) of event code
193 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

View File

@@ -64,7 +64,7 @@ Variable (string) strCommand
ID : 17 ID : 17
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -54,7 +54,7 @@ Variable (string) strCommand
ID : 9 ID : 9
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -55,7 +55,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -45,7 +45,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -18,10 +18,6 @@ popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code
128 Unique line(s) of event code 128 Unique line(s) of event code
popupLight
27 Component(s)
353 Line(s) of event code
193 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
331 Line(s) of event code 331 Line(s) of event code
@@ -34,6 +30,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
popupLight
27 Component(s)
353 Line(s) of event code
193 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

View File

@@ -64,7 +64,7 @@ Variable (string) strCommand
ID : 17 ID : 17
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -54,7 +54,7 @@ Variable (string) strCommand
ID : 9 ID : 9
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -55,7 +55,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 100 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -45,7 +45,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 500
Variable (string) entn Variable (string) entn
Attributes Attributes

View File

@@ -122,50 +122,47 @@ The following example configuration is turning off the screen after sunset, but
</details> </details>
<details> ## Supported keys for locale config
<summary>Supported keys for locale config</summary>
<p>
- `af_xx` - Afrikaans | Language Code | Language |
- `ar_xx` - Arabic |---------------|---------------------|
- `bg_xx` - Bulgarian | `af_ZA` | Afrikaans |
- `ca_xx` - Catalan | `ar_SY` | Arabic |
- `cs_xx` - Czech | `bg_BG` | Bulgarian |
- `da_xx` - Danish | `ca_ES` | Catalan |
- `de_xx` - German | `cs_CZ` | Czech |
- `el_xx` - Greek | `da_DK` | Danish |
- `en_xx` - English | `de_DE` | German |
- `es_xx` - Spanish | `el_GR` | Greek |
- `et_xx` - Estonian | `en_US` | English |
- `fa_xx` - Persian | `es_ES` | Spanish |
- `fi_xx` - Finnish | `et_EE` | Estonian |
- `fr_xx` - French | `fa_IR` | Persian |
- `he_xx` - Hebrew | `fi_FI` | Finnish |
- `hr_xx` - Croatian | `fr_FR` | French |
- `hu_xx` - Hungarian | `he_IL` | Hebrew |
- `hy_xx` - Armenian | `hr_xx` | Croatian |
- `id_xx` - Indonesian | `hu_HU` | Hungarian |
- `is_xx` - Icelandic | `hy_AM` | Armenian |
- `it_xx` - Italian | `id_ID` | Indonesian |
- `lb_xx` - Luxembourgish | `is_IS` | Icelandic |
- `lt_xx` - Lithuanian | `it_IT` | Italian |
- `lv_xx` - Latvian | `lb_xx` | Luxembourgish |
- `nb_xx` - Norwegian | `lt_LT` | Lithuanian |
- `nl_xx` - Dutch | `lv_LV` | Latvian |
- `nn_xx` - Norwegian | `nb_NO` | Norwegian |
- `pl_xx` - Polish | `nl_NL` | Dutch |
- `pt_xx` - Portuguese | `nn_NO` | Norwegian |
- `ro_xx` - Romanian | `pl_PL` | Polish |
- `ru_xx` - Russian | `pt_PT` | Portuguese |
- `sk_xx` - Slovak | `ro_RO` | Romanian |
- `sl_xx` - Slovenian | `ru_RU` | Russian |
- `sv_xx` - Swedish | `sk_SK` | Slovak |
- `th_xx` - Thai | `sl_SI` | Slovenian |
- `tr_xx` - Turkish | `sv_SE` | Swedish |
- `uk_xx` - Ukrainian | `th_TH` | Thai |
- `vi_xx` - Vietnamese | `tr_TR` | Turkish |
- `zh_CN` - Simplified Chinese | `uk_UA` | Ukrainian |
- `zh_TW` - Traditional Chinese | `vi_VN` | Vietnamese |
| `zh_CN` | Simplified Chinese |
</p> | `zh_TW` | Traditional Chinese |
</details>

View File

@@ -16,7 +16,8 @@ The log of your mqtt broker might give you additional information.
Your Tasmota device needs to connect sucessfully to your MQTT Broker, if you are in the waiting for content screen, the panel will send periodic messages to it's mqtt topic. Your Tasmota device needs to connect sucessfully to your MQTT Broker, if you are in the waiting for content screen, the panel will send periodic messages to it's mqtt topic.
3. Make sure that you are using the same topic in apps.yaml and in your tasmota configuration. 3. Make sure that you are using the same topic in apps.yaml and in your tasmota configuration.
The example values are an working example. Please don't modify the Full Topic. [MQTT Config](https://docs.nspanel.pky.eu/configure_mqtt/) The examples in the docs ([MQTT Config](https://docs.nspanel.pky.eu/configure_mqtt/)) are an valid (tasmota<>apps.yaml).
Please don't modify the Full Topic in your Tasmota Config, unless you know the implications, changing the Full Topic will result in diffent Send and Receive Channels, that have to be correct in your apps.yaml.
4. If you are still in the waiting for content screen please share the following items: 4. If you are still in the waiting for content screen please share the following items:
- a screenshot of your tasmota mqtt configration (please censor your mqtt password) - a screenshot of your tasmota mqtt configration (please censor your mqtt password)

View File

@@ -1,23 +1,28 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript zur Steuerung des SONOFF NSPanel mit dem ioBroker TypeScript zur Steuerung des SONOFF NSPanel mit dem ioBroker
- abgestimmt auf TFT 37 / v3.0.0 / BerryDriver 4 / Tasmota 11.1.0 - abgestimmt auf TFT 38 / v3.1.0 / BerryDriver 4 / Tasmota 12.0.0
joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen) icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
ioBroker-Unterstützung: https://forum.iobroker.net/topic/50888/sonoff-nspanel ioBroker-Unterstützung: https://forum.iobroker.net/topic/50888/sonoff-nspanel
ReleaseNotes: ReleaseNotes:
Bugfixes und Erweiterungen seit letzter Version: Bugfixes und Erweiterungen:
- cardQR (für Gäste WLAN) - cardQR (für Gäste WLAN)
- cardThermo (Neues Design für Alias Thermostat und zusätzlich für Alias Klimaanlage) - cardThermo (Neues Design für Alias Thermostat und zusätzlich für Alias Klimaanlage)
- 08.05.2022 - Menüpfeile bei HardwareButtons (button1Page; button2Page) mit Navigation auf Page 0 - 08.05.2022 - V2.9.0 - Menüpfeile bei HardwareButtons (button1Page; button2Page) mit Navigation auf Page 0
- 08.05.2022 - Standard-Brightness über neuen Parameter active einstellbar (Test mit 2.9.3) - 08.05.2022 - V2.9.0 - Standard-Brightness über neuen Parameter active einstellbar (Test mit 2.9.3)
- 08.05.2022 - Schalter (Licht, Dimmer, Hue, etc) in cardGrid lassen sich wieder schalten - 08.05.2022 - V2.9.0 - Schalter (Licht, Dimmer, Hue, etc) in cardGrid lassen sich wieder schalten
- 14.06.2022 - Aktion auf Submenüs schaltet unmittelbar auf vorheriges Mainmenu (Many thanks to Grrzzz) - 14.06.2022 - V2.9.0 - Aktion auf Submenüs schaltet unmittelbar auf vorheriges Mainmenu (Many thanks to Grrzzz)
- 14.06.2022 - Menü-Pfeile in Subpages (z.B. card QR, cardMedia, etc) (Many thanks to Grrzzz) - 14.06.2022 - V2.9.0 - Menü-Pfeile in Subpages (z.B. card QR, cardMedia, etc) (Many thanks to Grrzzz)
- 15.06.2022 - Date/Time im Screensaver auf Basis localString (de-DE/en-EN/nl-NL/etc.) - 15.06.2022 - V3.0.0 - Date/Time im Screensaver auf Basis localString (de-DE/en-EN/nl-NL/etc.)
- 16.06.2022 - Multilingual - config.locale (en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU) - 16.06.2022 - V3.0.0 - Multilingual - config.locale (en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU)
- 16.06.2022 - Bugfix by Grrzzz - Subpages - 16.06.2022 - V3.0.0 - Bugfix by Grrzzz - Subpages
- 18.06.2022 - V3.1.0 - Längere Textfelder in cardEntities
- 18.06.2022 - V3.1.0 - Detail-Page Lights/Shutter hat neuen Parameter "id"
Known Bug
- Github Issue #286
Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Releais) genutzt werden Wenn Rule definiert, dann können die Hardware-Tasten ebenfalls für Seitensteuerung (dann nicht mehr als Releais) genutzt werden
Tasmota Konsole: Tasmota Konsole:
@@ -82,7 +87,7 @@ Erforderliche Adapter:
JavaScript-Adapter JavaScript-Adapter
Upgrades in Konsole: Upgrades in Konsole:
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1 Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v3.0.0.tft TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v3.1.0.tft
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
*/ */
var Icons = new IconsSelector(); var Icons = new IconsSelector();
@@ -446,7 +451,7 @@ export const config: Config = {
dimmode: 8, dimmode: 8,
active: 100, //Standard-Brightness TFT active: 100, //Standard-Brightness TFT
screenSaverDoubleClick: false, screenSaverDoubleClick: false,
locale: "en-EN", //en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU locale: "de-DE", //en-EN, de-DE, nl-NL, da-DK, es-ES, fr-FR, it-IT, ru-RU
timeFormat: "%H:%M", //currently not used timeFormat: "%H:%M", //currently not used
dateFormat: "%A, %d. %B %Y", //currently not used dateFormat: "%A, %d. %B %Y", //currently not used
weatherEntity: "alias.0.Wetter", weatherEntity: "alias.0.Wetter",
@@ -565,7 +570,7 @@ function get_locales() {
function check_updates() { function check_updates() {
const desired_display_firmware_version = 37; const desired_display_firmware_version = 38;
const berry_driver_version = 4; const berry_driver_version = 4;
if (Debug) console.log("Check-Updates"); if (Debug) console.log("Check-Updates");
@@ -799,7 +804,7 @@ function update_berry_driver_version() {
} }
function update_tft_firmware() { function update_tft_firmware() {
const tft_version : string = "v3.0.0"; const tft_version : string = "v3.1.0";
var desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-" + tft_version + ".tft" var desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-" + tft_version + ".tft"
require("request")((['http://',get_current_tasmota_ip_address(),'/cm?cmnd=FlashNextion ', desired_display_firmware_url].join('')), async function (error, response, result) { require("request")((['http://',get_current_tasmota_ip_address(),'/cm?cmnd=FlashNextion ', desired_display_firmware_url].join('')), async function (error, response, result) {
createState(NSPanel_Path + "TFT_Firmware.onlineVersion"); createState(NSPanel_Path + "TFT_Firmware.onlineVersion");
@@ -982,6 +987,7 @@ function SendTime(): void {
var month = d.getMonth(); var month = d.getMonth();
var day = d.getDate(); var day = d.getDate();
var hr = d.getHours(); var hr = d.getHours();
var min = d.getMinutes(); var min = d.getMinutes();
const date = new Date(year, month, day, hr, min, 1); const date = new Date(year, month, day, hr, min, 1);
@@ -1414,9 +1420,11 @@ function GetIconColor(pageItem: PageItem, value: (boolean | number), useColors:
} }
function RegisterEntityWatcher(id: string): void { function RegisterEntityWatcher(id: string): void {
if (subscriptions.hasOwnProperty(id)) { if (subscriptions.hasOwnProperty(id)) {
return; return;
} }
subscriptions[id] = (on({ id: id, change: 'any' }, function (data) { subscriptions[id] = (on({ id: id, change: 'any' }, function (data) {
if(pageId == -1 && config.button1Page != undefined) if(pageId == -1 && config.button1Page != undefined)
SendToPanel({ payload: GeneratePageElements(config.button1Page) }); SendToPanel({ payload: GeneratePageElements(config.button1Page) });
@@ -1682,6 +1690,8 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
function GenerateMediaPage(page: PageMedia): Payload[] { function GenerateMediaPage(page: PageMedia): Payload[] {
var id = page.items[0].id var id = page.items[0].id
//RegisterEntityWatcher(id + ".TITLE");
var out_msgs: Array<Payload> = []; var out_msgs: Array<Payload> = [];
out_msgs.push({ payload: "pageType~cardMedia" }); out_msgs.push({ payload: "pageType~cardMedia" });
if (existsObject(id)) { if (existsObject(id)) {
@@ -1844,7 +1854,6 @@ function GenerateQRPage(page: PageQR): Payload[] {
let o = getObject(id) let o = getObject(id)
var heading = page.heading !== undefined ? page.heading : o.common.name.de var heading = page.heading !== undefined ? page.heading : o.common.name.de
let minTemp = page.items[0].minValue !== undefined ? page.items[0].minValue : 50;
var textQR = page.items[0].id + ".ACTUAL" !== undefined ? getState(page.items[0].id + ".ACTUAL").val : "WIFI:T:undefined;S:undefined;P:undefined;H:undefined;" var textQR = page.items[0].id + ".ACTUAL" !== undefined ? getState(page.items[0].id + ".ACTUAL").val : "WIFI:T:undefined;S:undefined;P:undefined;H:undefined;"
const tempstr = textQR.split(";"); const tempstr = textQR.split(";");
@@ -1967,7 +1976,9 @@ function HandleButtonEvent(words): void {
} }
} else { } else {
if (Debug) console.log("bExit: " + words[4] + " - "+ pageId) if (Debug) console.log("bExit: " + words[4] + " - "+ pageId)
GeneratePage(activePage); //Known Bug GitHub Issue #286
//GeneratePage(activePage);
GeneratePage(config.pages[pageId]);
} }
break; break;
case "notifyAction": case "notifyAction":
@@ -2305,16 +2316,17 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
iconColor = GetIconColor(pageItem, false, true); iconColor = GetIconColor(pageItem, false, true);
} }
out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail
+ icon + "~" //iconId + id + "~"
+ iconColor + "~" //iconColor + icon + "~" //iconId
+ switchVal + "~" //buttonState + iconColor + "~" //iconColor
+ "disable" + "~" //sliderBrightnessPos + switchVal + "~" //buttonState
+ "disable" + "~" //sliderColorTempPos + "disable" + "~" //sliderBrightnessPos
+ "disable" + "~" //colorMode + "disable" + "~" //sliderColorTempPos
+ findLocale("lights","Color") + "~" //Color-Bezeichnung + "disable" + "~" //colorMode
+ findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//Dimmer //Dimmer
@@ -2352,16 +2364,19 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
RegisterDetailEntityWatcher(id + ".ACTUAL", pageItem, type); RegisterDetailEntityWatcher(id + ".ACTUAL", pageItem, type);
out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail
+ icon + "~" //iconId + id + "~"
+ iconColor + "~" //iconColor + icon + "~" //iconId
+ switchVal + "~" //buttonState + iconColor + "~" //iconColor
+ brightness + "~" //sliderBrightnessPos + switchVal + "~" //buttonState
+ "disable" + "~" //sliderColorTempPos + brightness + "~" //sliderBrightnessPos
+ "disable" + "~" //colorMod + "disable" + "~" //sliderColorTempPos
+ findLocale("lights","Color") + "~" //Color-Bezeichnung + "disable" + "~" //colorMod
+ findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung
console.log("light." + id)
} }
@@ -2416,16 +2431,17 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
} }
out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail
+ icon + "~" //iconId + id + "~"
+ iconColor + "~" //iconColor + icon + "~" //iconId
+ switchVal + "~" //buttonState + iconColor + "~" //iconColor
+ brightness + "~" //sliderBrightnessPos + switchVal + "~" //buttonState
+ colorTemp + "~" //sliderColorTempPos + brightness + "~" //sliderBrightnessPos
+ colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + colorTemp + "~" //sliderColorTempPos
+ findLocale("lights","Color") + "~" //Color-Bezeichnung + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable)
+ findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//RGB-Licht //RGB-Licht
@@ -2478,16 +2494,17 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
} }
out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail
+ icon + "~" //iconId + id + "~"
+ iconColor + "~" //iconColor + icon + "~" //iconId
+ switchVal + "~" //buttonState + iconColor + "~" //iconColor
+ brightness + "~" //sliderBrightnessPos + switchVal + "~" //buttonState
+ colorTemp + "~" //sliderColorTempPos + brightness + "~" //sliderBrightnessPos
+ colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + colorTemp + "~" //sliderColorTempPos
+ findLocale("lights","Color") + "~" //Color-Bezeichnung + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable)
+ findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//RGB-Licht-einzeln (HEX) //RGB-Licht-einzeln (HEX)
@@ -2544,16 +2561,17 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
} }
out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail
+ icon + "~" //iconId + id + "~"
+ iconColor + "~" //iconColor + icon + "~" //iconId
+ switchVal + "~" //buttonState + iconColor + "~" //iconColor
+ brightness + "~" //sliderBrightnessPos + switchVal + "~" //buttonState
+ colorTemp + "~" //sliderColorTempPos + brightness + "~" //sliderBrightnessPos
+ colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + colorTemp + "~" //sliderColorTempPos
+ findLocale("lights","Color") + "~" //Color-Bezeichnung + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable)
+ findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + findLocale("lights","Color") + "~" //Color-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung
+ findLocale("lights","Brightness")}); //Brightness-Bezeichnung
} }
//Farbtemperatur //Farbtemperatur
@@ -2622,6 +2640,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
RegisterDetailEntityWatcher(id + ".SET", pageItem, type); RegisterDetailEntityWatcher(id + ".SET", pageItem, type);
} }
out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail
+ id + "~"
+ val + "~" //Shutterposition + val + "~" //Shutterposition
+ "" + "~" + "" + "~"
+ findLocale("blinds","Position")}); //Position-Bezeichnung + findLocale("blinds","Position")}); //Position-Bezeichnung