From a4627e85897bb9d2b5f03c1339ecc9111ebd8d13 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 27 Nov 2023 23:29:02 +0000 Subject: [PATCH 1/4] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 5 +++-- HMI/US/landscape/n2t-out-visual/cardThermo.txt | 1 + HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt | 8 ++++---- HMI/US/landscape/n2t-out/cardThermo.txt | 1 + HMI/US/portrait/diff-filtered.txt | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index f7227f0d..deeba627 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -46,7 +46,7 @@ │ vis tTmp,0 │ --- HMI/n2t-out/cardThermo.txt ├── +++ HMI/US/landscape/n2t-out/cardThermo.txt -│ @@ -28,14 +28,18 @@ +│ @@ -28,14 +28,19 @@ │ vis tSend,0 │ vis tInstruction,0 │ vis tTmp,0 @@ -58,6 +58,7 @@ │ + vis btUp,0 │ + vis btDown,0 │ + vis tCF,0 +│ + vis btDetail,0 │ //tEntity.txt=tHeading.txt │ // disable all buttons │ vis bt0,0 @@ -65,7 +66,7 @@ │ vis bt2,0 │ vis bt3,0 │ vis bt4,0 -│ @@ -1014,14 +1018,28 @@ +│ @@ -1014,14 +1019,28 @@ │ vis xTempDest1,1 │ vis btDown1,1 │ vis tCF1,1 diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 39063a42..13059ed2 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -44,6 +44,7 @@ Page cardThermo vis btUp,0 vis btDown,0 vis tCF,0 + vis btDetail,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 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 6cb9eabd..330c5784 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 @@ -60,8 +60,8 @@ screensaver2 248 Unique line(s) of event code cardThermo 57 Component(s) - 568 Line(s) of event code - 336 Unique line(s) of event code + 569 Line(s) of event code + 337 Unique line(s) of event code cardAlarm 43 Component(s) 510 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 875 Component(s) - 10706 Line(s) of event code - 2465 Unique line(s) of event code + 10707 Line(s) of event code + 2466 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index ec22afbd..d68de4b5 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -36,6 +36,7 @@ Page cardThermo vis btUp,0 vis btDown,0 vis tCF,0 + vis btDetail,0 //tEntity.txt=tHeading.txt // disable all buttons vis bt0,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 0d71363d..c8ecae73 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-11-27 23:21:36.547446219 +0000 ++++ /dev/fd/62 2023-11-27 23:28:52.512823638 +0000 +le list + +1,9 @@ +.s.txt From fd7d4bca2443118331dd646125d96a1434b6941f Mon Sep 17 00:00:00 2001 From: Johannes <29555657+joBr99@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:49:57 +0100 Subject: [PATCH 2/4] Update faq.md --- docs/faq.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index 46ae16bd..edca769c 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -4,7 +4,14 @@ You have most likely an error in your MQTT configuration somewhere. To find the error follow theese steps: -1. Check your appdaemon log. (Settings > Add-ons > AppDaemon > Log) +1. Check the location of your apps.yaml + +With the AppDaemon Addon >= 15 the config dir has been moved. +It's required to configure the location back to the old one, this is done by the `app_dir` line in your `appdaemon.yaml`. + +This also requires you to move your apps.yaml to this location. Please make sure your apps.yaml is at `/config/appdaemon/apps/apps.yaml` and move it otherwise. + +2. Check your appdaemon log. (Settings > Add-ons > AppDaemon > Log) You should see something like this: `INFO MQTT: MQTT Plugin initialization complete` If you are seeing Messages like this: @@ -12,14 +19,14 @@ If you are seeing Messages like this: Your appdaemon mqtt config is wrong, check your appdaemon.yaml. The log of your mqtt broker might give you additional information. -2. Check MQTT Configuration of Tasmota. +3. Check MQTT Configuration of Tasmota. 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. Note that there is a minimum password length of 5 chars for the MQTT Connection in Tasmota. -3. Make sure that you are using the same topic in apps.yaml and in your tasmota configuration. +4. Make sure that you are using the same topic in apps.yaml and in your tasmota configuration. The examples in the docs ([MQTT Config](https://docs.nspanel.pky.eu/configure_mqtt/)) are an valid example (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, with the Waiting for Content Issue type on the [Github Issues Page](https://github.com/joBr99/nspanel-lovelace-ui/issues/new/choose) +5. If you are still in the waiting for content screen please share the following items, with the Waiting for Content Issue type on the [Github Issues Page](https://github.com/joBr99/nspanel-lovelace-ui/issues/new/choose) - a screenshot of your tasmota mqtt configration (please censor your mqtt password) - your appdaemon.yaml (please censor your mqtt password) From 16ee1fb1c2d99ab6e74ba267df9b83ad44d83101 Mon Sep 17 00:00:00 2001 From: Johannes <29555657+joBr99@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:51:19 +0100 Subject: [PATCH 3/4] Update configure_mqtt.md --- docs/configure_mqtt.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/configure_mqtt.md b/docs/configure_mqtt.md index 58d8ebc5..eff6e414 100644 --- a/docs/configure_mqtt.md +++ b/docs/configure_mqtt.md @@ -57,6 +57,8 @@ hadashboard: Please add the following minimal configuration to your apps.yaml, which is located in `config/appdaemon/apps/apps.yaml` +Note: You need to move your `apps.yaml` to this location if it isn't there. + ```yaml --- nspanel-1: From 9622c65eb5b199bf42002f2c88a6e2443d701e56 Mon Sep 17 00:00:00 2001 From: Johannes <29555657+joBr99@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:56:32 +0100 Subject: [PATCH 4/4] Update faq.md --- docs/faq.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index edca769c..1556709e 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -5,10 +5,8 @@ You have most likely an error in your MQTT configuration somewhere. To find the error follow theese steps: 1. Check the location of your apps.yaml - With the AppDaemon Addon >= 15 the config dir has been moved. It's required to configure the location back to the old one, this is done by the `app_dir` line in your `appdaemon.yaml`. - This also requires you to move your apps.yaml to this location. Please make sure your apps.yaml is at `/config/appdaemon/apps/apps.yaml` and move it otherwise. 2. Check your appdaemon log. (Settings > Add-ons > AppDaemon > Log)