diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index b548f13c..e665ff33 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ 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/US/landscape/n2t-out/Program.s.txt 2022-06-17 16:00:09.120777566 +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 21:31:53.966042754 +0000 @@ -11,6 +11,4 @@ // dim value 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 page pageStartup 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/US/landscape/n2t-out/pageStartup.txt 2022-06-17 16:00:09.120777566 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-17 21:31:53.966042754 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 16ea5a4e..0184c79c 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -26,6 +26,10 @@ cardQR 32 Component(s) 374 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 17 Component(s) 204 Line(s) of event code @@ -42,10 +46,6 @@ cardEntities 65 Component(s) 1133 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 53 Component(s) 555 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 02ca272e..a4ee0634 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -64,7 +64,7 @@ Variable (string) strCommand ID : 17 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index 9e004ad8..a295d180 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -54,7 +54,7 @@ Variable (string) strCommand ID : 9 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 731337e4..e0c25405 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -55,7 +55,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 12aac98e..f4bf96d5 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -45,7 +45,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 14ab9c6b..5b274545 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ 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/US/portrait/n2t-out/Program.s.txt 2022-06-17 16:00:08.736781742 +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 21:31:53.382043060 +0000 @@ -11,6 +11,6 @@ // dim value 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 page pageStartup 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/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-17 21:31:52.838043344 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 21:31:53.382043060 +0000 @@ -63,6 +63,16 @@ vis bText4,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") { 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/US/portrait/n2t-out/pageStartup.txt 2022-06-17 16:00:08.740781699 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 21:31:53.382043060 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 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 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-06-17 16:00:08.432785049 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-17 21:31:52.834043346 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 21:31:53.382043060 +0000 @@ -151,7 +151,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -501,8 +501,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt Text tInstruction Attributes 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/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-17 21:31:52.834043346 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 21:31:53.382043060 +0000 @@ -69,7 +69,7 @@ Attributes Scope : local diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 2c4e947e..3ca87978 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-17 16:00:08.780781264 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-17 16:00:08.432785049 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 16:00:08.736781742 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-17 16:00:08.432785049 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 16:00:08.740781699 +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 21:31:52.834043346 +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 21:31:52.838043344 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 21:31:53.382043060 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -14,11 +14,11 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-06-17 16:00:08.432785049 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 16:00:08.740781699 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-17 21:31:52.834043346 +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 -+--- HMI/n2t-out/popupLight.txt 2022-06-17 16:00:08.432785049 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 16:00:08.736781742 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-06-17 21:31:52.834043346 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 21:31:53.382043060 +0000 +@@ -151,7 +151,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -29,8 +29,8 @@ + Text tInstruction + Attributes +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/US/portrait/n2t-out/popupShutter.txt 2022-06-17 16:00:08.740781699 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-06-17 21:31:52.834043346 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 21:31:53.382043060 +0000 +@@ -69,7 +69,7 @@ + Attributes + Scope : local diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index b416ad95..d504f983 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -2,10 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -popupLight - 27 Component(s) - 353 Line(s) of event code - 193 Unique line(s) of event code +popupShutter + 25 Component(s) + 331 Line(s) of event code + 163 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -18,10 +18,6 @@ cardQR 32 Component(s) 374 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 17 Component(s) 204 Line(s) of event code @@ -42,6 +38,10 @@ screensaver 38 Component(s) 319 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 77 Component(s) 1363 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 43b8dee6..05aac277 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -64,7 +64,7 @@ Variable (string) strCommand ID : 17 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 5e2ecb4c..b3fedb66 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -54,7 +54,7 @@ Variable (string) strCommand ID : 9 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index a694c93f..a8018887 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -55,7 +55,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 57139591..e70908fe 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -45,7 +45,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index ddf949da..a66aa8c9 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,10 +18,6 @@ popupNotify 17 Component(s) 204 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 25 Component(s) 331 Line(s) of event code @@ -34,6 +30,10 @@ pageStartup 19 Component(s) 157 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 42 Component(s) 439 Line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index ff01ff27..01f415b8 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -64,7 +64,7 @@ Variable (string) strCommand ID : 17 Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 4ff4127d..14f806c3 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -54,7 +54,7 @@ Variable (string) strCommand ID : 9 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 731337e4..e0c25405 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -55,7 +55,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 100 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 12aac98e..f4bf96d5 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -45,7 +45,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 500 Variable (string) entn Attributes diff --git a/docs/config-overview.md b/docs/config-overview.md index 662d83c5..e2632188 100644 --- a/docs/config-overview.md +++ b/docs/config-overview.md @@ -122,50 +122,47 @@ The following example configuration is turning off the screen after sunset, but -
-Supported keys for locale config -

+## Supported keys for locale config - - `af_xx` - Afrikaans - - `ar_xx` - Arabic - - `bg_xx` - Bulgarian - - `ca_xx` - Catalan - - `cs_xx` - Czech - - `da_xx` - Danish - - `de_xx` - German - - `el_xx` - Greek - - `en_xx` - English - - `es_xx` - Spanish - - `et_xx` - Estonian - - `fa_xx` - Persian - - `fi_xx` - Finnish - - `fr_xx` - French - - `he_xx` - Hebrew - - `hr_xx` - Croatian - - `hu_xx` - Hungarian - - `hy_xx` - Armenian - - `id_xx` - Indonesian - - `is_xx` - Icelandic - - `it_xx` - Italian - - `lb_xx` - Luxembourgish - - `lt_xx` - Lithuanian - - `lv_xx` - Latvian - - `nb_xx` - Norwegian - - `nl_xx` - Dutch - - `nn_xx` - Norwegian - - `pl_xx` - Polish - - `pt_xx` - Portuguese - - `ro_xx` - Romanian - - `ru_xx` - Russian - - `sk_xx` - Slovak - - `sl_xx` - Slovenian - - `sv_xx` - Swedish - - `th_xx` - Thai - - `tr_xx` - Turkish - - `uk_xx` - Ukrainian - - `vi_xx` - Vietnamese - - `zh_CN` - Simplified Chinese - - `zh_TW` - Traditional Chinese - -

-
+| Language Code | Language | +|---------------|---------------------| +| `af_ZA` | Afrikaans | +| `ar_SY` | Arabic | +| `bg_BG` | Bulgarian | +| `ca_ES` | Catalan | +| `cs_CZ` | Czech | +| `da_DK` | Danish | +| `de_DE` | German | +| `el_GR` | Greek | +| `en_US` | English | +| `es_ES` | Spanish | +| `et_EE` | Estonian | +| `fa_IR` | Persian | +| `fi_FI` | Finnish | +| `fr_FR` | French | +| `he_IL` | Hebrew | +| `hr_xx` | Croatian | +| `hu_HU` | Hungarian | +| `hy_AM` | Armenian | +| `id_ID` | Indonesian | +| `is_IS` | Icelandic | +| `it_IT` | Italian | +| `lb_xx` | Luxembourgish | +| `lt_LT` | Lithuanian | +| `lv_LV` | Latvian | +| `nb_NO` | Norwegian | +| `nl_NL` | Dutch | +| `nn_NO` | Norwegian | +| `pl_PL` | Polish | +| `pt_PT` | Portuguese | +| `ro_RO` | Romanian | +| `ru_RU` | Russian | +| `sk_SK` | Slovak | +| `sl_SI` | Slovenian | +| `sv_SE` | Swedish | +| `th_TH` | Thai | +| `tr_TR` | Turkish | +| `uk_UA` | Ukrainian | +| `vi_VN` | Vietnamese | +| `zh_CN` | Simplified Chinese | +| `zh_TW` | Traditional Chinese | diff --git a/docs/faq.md b/docs/faq.md index a1bf4645..bc9a3133 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -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. 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: - a screenshot of your tasmota mqtt configration (please censor your mqtt password) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index be4883fe..0fe94669 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -1,23 +1,28 @@ /*----------------------------------------------------------------------- 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 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) ioBroker-Unterstützung: https://forum.iobroker.net/topic/50888/sonoff-nspanel ReleaseNotes: - Bugfixes und Erweiterungen seit letzter Version: + Bugfixes und Erweiterungen: - cardQR (für Gäste WLAN) - 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 - 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 - - 14.06.2022 - 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) - - 15.06.2022 - 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 - Bugfix by Grrzzz - Subpages + - 08.05.2022 - V2.9.0 - Menüpfeile bei HardwareButtons (button1Page; button2Page) mit Navigation auf Page 0 + - 08.05.2022 - V2.9.0 - Standard-Brightness über neuen Parameter active einstellbar (Test mit 2.9.3) + - 08.05.2022 - V2.9.0 - Schalter (Licht, Dimmer, Hue, etc) in cardGrid lassen sich wieder schalten + - 14.06.2022 - V2.9.0 - Aktion auf Submenüs schaltet unmittelbar auf vorheriges Mainmenu (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 - V3.0.0 - Date/Time im Screensaver auf Basis localString (de-DE/en-EN/nl-NL/etc.) + - 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 - 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 Tasmota Konsole: @@ -82,7 +87,7 @@ Erforderliche Adapter: JavaScript-Adapter Upgrades in Konsole: 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(); @@ -446,7 +451,7 @@ export const config: Config = { dimmode: 8, active: 100, //Standard-Brightness TFT 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 dateFormat: "%A, %d. %B %Y", //currently not used weatherEntity: "alias.0.Wetter", @@ -565,7 +570,7 @@ function get_locales() { function check_updates() { - const desired_display_firmware_version = 37; + const desired_display_firmware_version = 38; const berry_driver_version = 4; if (Debug) console.log("Check-Updates"); @@ -799,7 +804,7 @@ function update_berry_driver_version() { } 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" 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"); @@ -982,11 +987,12 @@ function SendTime(): void { var month = d.getMonth(); var day = d.getDate(); var hr = d.getHours(); + var min = d.getMinutes(); const date = new Date(year, month, day, hr, min, 1); var _SendTime = date.toLocaleTimeString(config.locale, { hour: '2-digit', minute: '2-digit', hour12: false}); - + SendToPanel({ payload: "time~" + _SendTime }); } @@ -1414,10 +1420,12 @@ function GetIconColor(pageItem: PageItem, value: (boolean | number), useColors: } function RegisterEntityWatcher(id: string): void { + if (subscriptions.hasOwnProperty(id)) { 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) SendToPanel({ payload: GeneratePageElements(config.button1Page) }); if(pageId == -2 && config.button2Page != undefined) @@ -1682,6 +1690,8 @@ function GenerateThermoPage(page: PageThermo): Payload[] { function GenerateMediaPage(page: PageMedia): Payload[] { var id = page.items[0].id + + //RegisterEntityWatcher(id + ".TITLE"); var out_msgs: Array = []; out_msgs.push({ payload: "pageType~cardMedia" }); if (existsObject(id)) { @@ -1844,7 +1854,6 @@ function GenerateQRPage(page: PageQR): Payload[] { let o = getObject(id) 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;" const tempstr = textQR.split(";"); @@ -1967,7 +1976,9 @@ function HandleButtonEvent(words): void { } } else { if (Debug) console.log("bExit: " + words[4] + " - "+ pageId) - GeneratePage(activePage); + //Known Bug GitHub Issue #286 + //GeneratePage(activePage); + GeneratePage(config.pages[pageId]); } break; case "notifyAction": @@ -2305,16 +2316,17 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] { iconColor = GetIconColor(pageItem, false, true); } - out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail - + icon + "~" //iconId - + iconColor + "~" //iconColor - + switchVal + "~" //buttonState - + "disable" + "~" //sliderBrightnessPos - + "disable" + "~" //sliderColorTempPos - + "disable" + "~" //colorMode - + findLocale("lights","Color") + "~" //Color-Bezeichnung - + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung - + findLocale("lights","Brightness")}); //Brightness-Bezeichnung + out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail + + id + "~" + + icon + "~" //iconId + + iconColor + "~" //iconColor + + switchVal + "~" //buttonState + + "disable" + "~" //sliderBrightnessPos + + "disable" + "~" //sliderColorTempPos + + "disable" + "~" //colorMode + + findLocale("lights","Color") + "~" //Color-Bezeichnung + + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + + findLocale("lights","Brightness")}); //Brightness-Bezeichnung } //Dimmer @@ -2352,16 +2364,19 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] { RegisterDetailEntityWatcher(id + ".ACTUAL", pageItem, type); - out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail - + icon + "~" //iconId - + iconColor + "~" //iconColor - + switchVal + "~" //buttonState - + brightness + "~" //sliderBrightnessPos - + "disable" + "~" //sliderColorTempPos - + "disable" + "~" //colorMod - + findLocale("lights","Color") + "~" //Color-Bezeichnung - + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung - + findLocale("lights","Brightness")}); //Brightness-Bezeichnung + out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail + + id + "~" + + icon + "~" //iconId + + iconColor + "~" //iconColor + + switchVal + "~" //buttonState + + brightness + "~" //sliderBrightnessPos + + "disable" + "~" //sliderColorTempPos + + "disable" + "~" //colorMod + + findLocale("lights","Color") + "~" //Color-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"); } - out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail - + icon + "~" //iconId - + iconColor + "~" //iconColor - + switchVal + "~" //buttonState - + brightness + "~" //sliderBrightnessPos - + colorTemp + "~" //sliderColorTempPos - + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) - + findLocale("lights","Color") + "~" //Color-Bezeichnung - + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung - + findLocale("lights","Brightness")}); //Brightness-Bezeichnung + out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail + + id + "~" + + icon + "~" //iconId + + iconColor + "~" //iconColor + + switchVal + "~" //buttonState + + brightness + "~" //sliderBrightnessPos + + colorTemp + "~" //sliderColorTempPos + + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + + findLocale("lights","Color") + "~" //Color-Bezeichnung + + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + + findLocale("lights","Brightness")}); //Brightness-Bezeichnung } //RGB-Licht @@ -2478,16 +2494,17 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] { console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); } - out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail - + icon + "~" //iconId - + iconColor + "~" //iconColor - + switchVal + "~" //buttonState - + brightness + "~" //sliderBrightnessPos - + colorTemp + "~" //sliderColorTempPos - + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) - + findLocale("lights","Color") + "~" //Color-Bezeichnung - + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung - + findLocale("lights","Brightness")}); //Brightness-Bezeichnung + out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail + + id + "~" + + icon + "~" //iconId + + iconColor + "~" //iconColor + + switchVal + "~" //buttonState + + brightness + "~" //sliderBrightnessPos + + colorTemp + "~" //sliderColorTempPos + + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + + findLocale("lights","Color") + "~" //Color-Bezeichnung + + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + + findLocale("lights","Brightness")}); //Brightness-Bezeichnung } //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"); } - out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail - + icon + "~" //iconId - + iconColor + "~" //iconColor - + switchVal + "~" //buttonState - + brightness + "~" //sliderBrightnessPos - + colorTemp + "~" //sliderColorTempPos - + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) - + findLocale("lights","Color") + "~" //Color-Bezeichnung - + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung - + findLocale("lights","Brightness")}); //Brightness-Bezeichnung + out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail + + id + "~" + + icon + "~" //iconId + + iconColor + "~" //iconColor + + switchVal + "~" //buttonState + + brightness + "~" //sliderBrightnessPos + + colorTemp + "~" //sliderColorTempPos + + colorMode + "~" //colorMode (if hue-alias without hue-datapoint, then disable) + + findLocale("lights","Color") + "~" //Color-Bezeichnung + + findLocale("lights","Temperature") + "~" //Temperature-Bezeichnung + + findLocale("lights","Brightness")}); //Brightness-Bezeichnung } //Farbtemperatur @@ -2622,6 +2640,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] { RegisterDetailEntityWatcher(id + ".SET", pageItem, type); } out_msgs.push({ payload: "entityUpdateDetail" + "~" //entityUpdateDetail + + id + "~" + val + "~" //Shutterposition + "" + "~" + findLocale("blinds","Position")}); //Position-Bezeichnung