From b22e055c1888aeffd61dffd4e79e58de9edfd59f Mon Sep 17 00:00:00 2001 From: Odianosen25 Date: Sun, 18 Feb 2024 23:13:46 +0000 Subject: [PATCH] Turn app into AD Base app --- apps/nspanel-lovelace-ui/luibackend/apis.py | 3 ++- .../nspanel-lovelace-ui/nspanel-lovelace-ui.py | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/apis.py b/apps/nspanel-lovelace-ui/luibackend/apis.py index 75ddc469..ef2088eb 100644 --- a/apps/nspanel-lovelace-ui/luibackend/apis.py +++ b/apps/nspanel-lovelace-ui/luibackend/apis.py @@ -1,2 +1,3 @@ ha_api = None -mqtt_api = None \ No newline at end of file +mqtt_api = None +ad_api = None \ No newline at end of file diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index bc725282..fe30a70c 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -1,4 +1,4 @@ -import hassapi as hass +import adbase as ad from luibackend.config import LuiBackendConfig from luibackend.controller import LuiController @@ -7,14 +7,16 @@ from luibackend.updater import Updater import apis -class NsPanelLovelaceUIManager(hass.Hass): +class NsPanelLovelaceUIManager(ad.ADBase): def initialize(self): - self.log('Starting') - apis.ha_api = self + self.adapi = self.get_ad_api() + self.adapi.log('Starting') + apis.ad_api = self.adapi + apis.ha_api = self.get_plugin_api("HASS") apis.mqtt_api = self.get_plugin_api("MQTT") - cfg = self._cfg = LuiBackendConfig(self, self.args["config"]) + cfg = self._cfg = LuiBackendConfig(apis.ha_api, self.args["config"]) use_api = cfg.get("use_api") == True @@ -23,7 +25,7 @@ class NsPanelLovelaceUIManager(hass.Hass): api_panel_name = cfg.get("panelName") api_device_id = cfg.get("panelDeviceId") - mqttsend = LuiMqttSender(self, use_api, topic_send, api_panel_name) + mqttsend = LuiMqttSender(apis.ha_api, use_api, topic_send, api_panel_name) controller = LuiController(cfg, mqttsend.send_mqtt_msg) @@ -41,11 +43,11 @@ class NsPanelLovelaceUIManager(hass.Hass): desired_tasmota_driver_url = cfg._config.get("berryURL", "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be") mode = cfg.get("updateMode") - updater = Updater(self.log, mqttsend, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url) + updater = Updater(self.adapi.log, mqttsend, topic_send, mode, desired_display_firmware_version, model, desired_display_firmware_url, desired_tasmota_driver_version, desired_tasmota_driver_url) # Request Tasmota Driver Version updater.request_berry_driver_version() LuiMqttListener(use_api, topic_recv, api_panel_name, api_device_id, controller, updater) - self.log(f'Started ({version})') + self.adapi.log(f'Started ({version})')