From 46252545a8acd6481996271623edb041dad97697 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 6 Mar 2022 23:10:43 +0100 Subject: [PATCH 1/7] Fix error in update_screensaver_brightness --- .../nspanel-lovelance-ui.py | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py index 4279d762..d155922e 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -41,16 +41,6 @@ class NsPanelLovelanceUI: # register callbacks self.register_callbacks() - def update_screensaver_brightness(self, kwargs): - self.current_screensaver_brightness = kwargs['value'] - self.send_mqtt_msg(f"dimmode,{self.current_screensaver_brightness}") - - def scale(self, val, src, dst): - """ - Scale the given value from the scale of src to the scale of dst. - """ - return ((val - src[0]) / (src[1]-src[0])) * (dst[1]-dst[0]) + dst[0] - def handle_mqtt_incoming_message(self, event_name, data, kwargs): t = time.process_time() # Parse Json Message from Tasmota and strip out message from nextion display @@ -84,7 +74,7 @@ class NsPanelLovelanceUI: self.send_mqtt_msg("timeout,{0}".format(timeout)) # send screensaver brightness - self.update_screensaver_brightness() + self.update_screensaver_brightness(value=self.current_screensaver_brightness) # send messages for current page page_type = self.config["pages"][self.current_page_nr]["type"] @@ -154,6 +144,16 @@ class NsPanelLovelanceUI: date = datetime.datetime.now().strftime(self.config["dateFormat"]) self.send_mqtt_msg("date,?{0}".format(date)) + def update_screensaver_brightness(self, kwargs): + self.current_screensaver_brightness = kwargs['value'] + self.send_mqtt_msg(f"dimmode,{self.current_screensaver_brightness}") + + def scale(self, val, src, dst): + """ + Scale the given value from the scale of src to the scale of dst. + """ + return ((val - src[0]) / (src[1]-src[0])) * (dst[1]-dst[0]) + dst[0] + def handle_button_press(self, entity_id, btype, optVal=None): if(btype == "OnOff"): if(optVal == "1"): @@ -342,4 +342,3 @@ class NsPanelLovelanceUI: self.send_mqtt_msg("pageType,{0}".format(page_type)) command = self.generate_media_page(self.config["pages"][self.current_page_nr]["item"]) self.send_mqtt_msg(command) - From a39fc82eb766ed4e3e8f799f1b5b945796379eb3 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 6 Mar 2022 23:20:10 +0100 Subject: [PATCH 2/7] Delete hassfest.yaml --- .github/workflows/hassfest.yaml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .github/workflows/hassfest.yaml diff --git a/.github/workflows/hassfest.yaml b/.github/workflows/hassfest.yaml deleted file mode 100644 index cfa0f62f..00000000 --- a/.github/workflows/hassfest.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: Validate with hassfest - -on: - push: - pull_request: - schedule: - - cron: '0 0 * * *' - -jobs: - validate: - runs-on: "ubuntu-latest" - steps: - - uses: "actions/checkout@v2" - - uses: "home-assistant/actions/hassfest@master" \ No newline at end of file From 74d79b6ac654a33a06055079c02b7fb19e3858ab Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 6 Mar 2022 23:20:33 +0100 Subject: [PATCH 3/7] Fix error in update_screensaver_brightness 2th --- apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py index d155922e..f1b7c7bc 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -74,7 +74,7 @@ class NsPanelLovelanceUI: self.send_mqtt_msg("timeout,{0}".format(timeout)) # send screensaver brightness - self.update_screensaver_brightness(value=self.current_screensaver_brightness) + self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness}) # send messages for current page page_type = self.config["pages"][self.current_page_nr]["type"] @@ -342,3 +342,4 @@ class NsPanelLovelanceUI: self.send_mqtt_msg("pageType,{0}".format(page_type)) command = self.generate_media_page(self.config["pages"][self.current_page_nr]["item"]) self.send_mqtt_msg(command) + From 0e88a27e7c82ffb6b4bccaa7be3719e8afa9a6aa Mon Sep 17 00:00:00 2001 From: Gerard Date: Sun, 6 Mar 2022 23:22:54 +0100 Subject: [PATCH 4/7] Change service to media_play_pause Removed `media_player` in front as that gave an error --- apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py index f1b7c7bc..24bfa510 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -175,7 +175,7 @@ class NsPanelLovelanceUI: if(btype == "media-back"): self.api.get_entity(entity_id).call_service("media_previous_track") if(btype == "media-pause"): - self.api.get_entity(entity_id).call_service("media_player.media_pause") + self.api.get_entity(entity_id).call_service("media_play_pause") if(btype == "brightnessSlider"): From 1ff2a9b2c4f6d4b8049a97c091506a89e5e1dd25 Mon Sep 17 00:00:00 2001 From: Gerard Date: Sun, 6 Mar 2022 23:42:51 +0100 Subject: [PATCH 5/7] Change timeout screensaver to seconds --- apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py index 24bfa510..c73f3e63 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -67,10 +67,11 @@ class NsPanelLovelanceUI: # set screensaver timeout timeout = self.config["timeoutScreensaver"] - if timeout > 65535: - timeout = 65535 - if timeout < 50: - timeout = 50 + if timeout > 60: + timeout = 60 + if timeout < 5: + timeout = 5 + timeout = timeout * 1000 self.send_mqtt_msg("timeout,{0}".format(timeout)) # send screensaver brightness From 48228714e49fe21c16108637593395f801ef7a93 Mon Sep 17 00:00:00 2001 From: Gerard Date: Sun, 6 Mar 2022 23:43:54 +0100 Subject: [PATCH 6/7] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 118a3b5c..14d60a30 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ nspanel-1: config: panelRecvTopic: "tele/tasmota_your_mqtt_topic/RESULT" panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend" - timeoutScreensaver: 15000 + timeoutScreensaver: 15 #in seconds, values between 5 and 60 are allowed #brightnessScreensaver: 10 brightnessScreensaver: - time: "7:00:00" From 5c6ea920b21f3effbcd262c32ceba8bb8edc2619 Mon Sep 17 00:00:00 2001 From: Gerard Date: Sun, 6 Mar 2022 23:44:48 +0100 Subject: [PATCH 7/7] Update apps.yaml --- appdaemon/apps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appdaemon/apps.yaml b/appdaemon/apps.yaml index 93ae5a7e..b823b605 100644 --- a/appdaemon/apps.yaml +++ b/appdaemon/apps.yaml @@ -8,7 +8,7 @@ nspanel: locale: "de_DE" timeFormat: "%H : %M" dateFormat: "%A, %d. %B %Y" - timeoutScreensaver: 15000 # value in ms, must be between 50 and 65535 + timeoutScreensaver: 15 #in seconds, values between 5 and 60 are allowed #brightnessScreensaver: 10 brightnessScreensaver: - time: "7:00:00"