diff --git a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py index 9006acc3..86d34724 100644 --- a/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py +++ b/apps/nspanel-lovelance-ui/nspanel-lovelance-ui.py @@ -2,7 +2,7 @@ import os import json import datetime import time -import appdaemon.plugins.hass.hassapi as hass +import hassapi as hass class NsPanelLovelanceUIManager(hass.Hass): def initialize(self): @@ -42,11 +42,11 @@ class NsPanelLovelanceUI: found_current_dim_value = False for index, timeset in enumerate(sorted_timesets): self.api.run_daily(self.update_screensaver_brightness, timeset["time"], value=timeset["value"]) - self.api.log("current time %s", self.api.get_now().time()) + self.api.log("Current time %s", self.api.get_now().time()) if self.api.parse_time(timeset["time"]) > self.api.get_now().time() and not found_current_dim_value: # first time after current time, set dim value self.current_screensaver_brightness = sorted_timesets[index-1]["value"] - self.api.log("setting dim value to %s", sorted_timesets[index-1]) + self.api.log("Setting dim value to %s", sorted_timesets[index-1]) found_current_dim_value = True # send screensaver brightness in case config has changed self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness}) @@ -62,10 +62,10 @@ class NsPanelLovelanceUI: # Parse Json Message from Tasmota and strip out message from nextion display data = json.loads(data["payload"]) if("CustomRecv" not in data): - self.api.log("Recived Message from Tasmota: %s", data, level="DEBUG") + self.api.log("Received Message from Tasmota: %s", data, level="DEBUG") return msg = data["CustomRecv"] - self.api.log("Recived Message from Tasmota: %s", msg, level="DEBUG") + self.api.log("Received Message from Tasmota: %s", msg, level="DEBUG") # Split message into parts seperated by "," msg = msg.split(",") @@ -75,7 +75,7 @@ class NsPanelLovelanceUI: if msg[0] == "event": if msg[1] == "startup": - self.api.log("handling startup event", level="DEBUG") + self.api.log("Handling startup event", level="DEBUG") # send date and time self.update_time("") @@ -101,7 +101,7 @@ class NsPanelLovelanceUI: # Calculate current page recv_page = int(msg[2]) self.current_page_nr = recv_page % len(self.config["pages"]) - self.api.log("received pageOpen command, raw page: %i, calc page: %i", recv_page, self.current_page_nr, level="DEBUG") + self.api.log("Received pageOpen command, raw page: %i, calc page: %i", recv_page, self.current_page_nr, level="DEBUG") # get type of current page page_type = self.config["pages"][self.current_page_nr]["type"] # generate commands for current page @@ -117,7 +117,7 @@ class NsPanelLovelanceUI: self.handle_button_press(entity_id, btype, value) if msg[1] == "pageOpenDetail": - self.api.log("received pageOpenDetail command", level="DEBUG") + self.api.log("Received pageOpenDetail command", level="DEBUG") if(msg[2] == "popupLight"): entity = self.api.get_entity(msg[3]) switch_val = 1 if entity.state == "on" else 0 @@ -144,7 +144,7 @@ class NsPanelLovelanceUI: self.send_mqtt_msg("entityUpdateDetail,{0}".format(pos)) if msg[1] == "tempUpd": - self.api.log("received tempUpd command", level="DEBUG") + self.api.log("Received tempUpd command", level="DEBUG") temp = int(msg[4])/10 self.api.get_entity(msg[3]).call_service("set_temperature", temperature=temp) @@ -228,9 +228,9 @@ class NsPanelLovelanceUI: for item in items: if self.api.entity_exists(item) or item == "delete": - self.api.log("found configured item in homeassistant %s", item, level="DEBUG") + self.api.log("Found configured item in Home Assistant %s", item, level="DEBUG") else: - self.api.error("the following item does not exist in homeassistant, configuration error: %s", item) + self.api.error("The following item does not exist in Home Assistant, configuration error: %s", item) raise Exception('Entity not found') def register_callbacks(self): @@ -242,7 +242,7 @@ class NsPanelLovelanceUI: items.extend(page["items"]) for item in items: - self.api.log("enable state callback for %s", item, level="DEBUG") + self.api.log("Enable state callback for %s", item, level="DEBUG") self.api.handle = self.api.listen_state(self.state_change_callback, entity_id=item, attribute="all") def state_change_callback(self, entity, attribute, old, new, kwargs): @@ -250,9 +250,8 @@ class NsPanelLovelanceUI: page_type = current_page_config["type"] - self.api.log("got state_callback from {0}".format(entity), level="DEBUG") - - + self.api.log("Got state_callback from {0}".format(entity), level="DEBUG") + if page_type == "cardEntities": items = current_page_config["items"] if entity in items: @@ -284,7 +283,7 @@ class NsPanelLovelanceUI: # type of item is the string before the "." in the item name item_type = item.split(".")[0] - self.api.log("generating item command for %s with type %s", item, item_type, level="DEBUG") + self.api.log("Generating item command for %s with type %s", item, item_type, level="DEBUG") if item_type == "delete": return "entityUpd,{0},{1}".format(item_nr, item_type) @@ -368,7 +367,7 @@ class NsPanelLovelanceUI: def generate_page(self, page_number, page_type): - self.api.log("generating page commands for page %i with type %s", self.current_page_nr, page_type, level="DEBUG") + self.api.log("Generating page commands for page %i with type %s", self.current_page_nr, page_type, level="DEBUG") if page_type == "cardEntities": # Send page type self.send_mqtt_msg("pageType,{0}".format(page_type))