🐛 FIX: call methods correctly

unl0ck · Nov 29, 2024 · 64f47ac · 64f47ac
1 parent f146af4
commit 64f47ac
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.bumpversion-edge.toml b/.bumpversion-edge.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.11.2"
+current_version = "2.11.3"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

diff --git a/GridboxConnectorAddon-edge/CHANGELOG.md b/GridboxConnectorAddon-edge/CHANGELOG.md
@@ -1,6 +1,6 @@
 <!-- https://developers.home-assistant.io/docs/add-ons/presentation#keeping-a-changelog -->
 
-## 2.11.0
+## 2.11.3
 
 ### 🚀 Added
 

diff --git a/GridboxConnectorAddon-edge/GridboxConnector/__main__.py b/GridboxConnectorAddon-edge/GridboxConnector/__main__.py
@@ -38,7 +38,7 @@ def run_telemetry():
         logger.error(f"Error while setting up telemetry: {e}")
     return telemetry
 
-def live_data_task(viessmann_gridbox_connector, gridboxConnector, WAIT):
+def live_data_task(gridboxConnector, viessmann_gridbox_connector, WAIT):
     one_time_print = True
     while True:
         measurement = gridboxConnector.retrieve_live_data()
@@ -54,7 +54,7 @@ def live_data_task(viessmann_gridbox_connector, gridboxConnector, WAIT):
             gridboxConnector.init_auth()
         time.sleep(WAIT)
 
-def historical_data_task(viessmann_gridbox_connector:HAViessmannGridboxConnector, gridboxConnector:GridboxConnector, WAIT):
+def historical_data_task(gridboxConnector:GridboxConnector, viessmann_gridbox_connector:HAViessmannGridboxConnector, WAIT):
     one_time_print = True
 
     while True:
@@ -79,20 +79,20 @@ def historical_data_task(viessmann_gridbox_connector:HAViessmannGridboxConnector
             gridboxConnector.init_auth()
         time.sleep(WAIT)
 
-def start_live_thread(viessmann_gridbox_connector, gridboxConnector, WAIT):
+def start_live_thread(gridboxConnector, ha_device, WAIT):
     while True:
         try:
-            thread = threading.Thread(target=live_data_task, args=(viessmann_gridbox_connector, gridboxConnector, WAIT))
+            thread = threading.Thread(target=live_data_task, args=(gridboxConnector, ha_device, WAIT))
             thread.start()
             thread.join()
         except Exception as e:
             logger.error(f"Thread konnte nicht gestartet werden: {e}")
             time.sleep(5)  # Warte 5 Sekunden bevor der Thread neu gestartet wird
 
-def start_historical_thread(viessmann_gridbox_connector, gridboxConnector, WAIT):
+def start_historical_thread(gridboxConnector, ha_device,  WAIT):
     while True:
         try:
-            thread = threading.Thread(target=historical_data_task, args=(viessmann_gridbox_connector, gridboxConnector, WAIT))
+            thread = threading.Thread(target=historical_data_task, args=(gridboxConnector, ha_device, WAIT))
             thread.start()
             thread.join()
         except Exception as e:
@@ -127,12 +127,12 @@ def run_addon():
     gridbox_config["login"]["password"] = PASSWORD
     logger.debug(gridbox_config["login"])
     mqtt_settings = Settings.MQTT(host=mqtt_server, username=mqtt_user, password=mqtt_pw, port=mqtt_port)
-    viessmann_gridbox_connector = HAViessmannGridboxConnector(mqtt_settings)
-    viessmann_gridbox_connector_historical = HAViessmannGridboxConnector(mqtt_settings, device_name="Viessmann Gridbox Historical",device_identifiers="viessmann_gridbox_historical")
+    viessmann_gridbox_device = HAViessmannGridboxConnector(mqtt_settings)
+    viessmann_gridbox_historical_device = HAViessmannGridboxConnector(mqtt_settings, device_name="Viessmann Gridbox Historical",device_identifiers="viessmann_gridbox_historical")
     gridboxConnector = GridboxConnector(gridbox_config)
 
-    start_live_thread(gridboxConnector, viessmann_gridbox_connector, WAIT)
-    start_historical_thread(gridboxConnector, viessmann_gridbox_connector_historical, WAIT)
+    start_live_thread(gridboxConnector, viessmann_gridbox_device, WAIT)
+    start_historical_thread(gridboxConnector, viessmann_gridbox_historical_device, WAIT)
 
 
 

diff --git a/GridboxConnectorAddon-edge/cloudSettings.json b/GridboxConnectorAddon-edge/cloudSettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.2",
+  "version": "2.11.3",
   "urls": {
     "login": "https://gridx.eu.auth0.com/oauth/token",
     "gateways": "https://api.gridx.de/gateways",

diff --git a/GridboxConnectorAddon-edge/config.yaml b/GridboxConnectorAddon-edge/config.yaml
@@ -1,7 +1,7 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 ---
 name: Viessmann Gridbox Connector (edge)
-version: "2.11.2"
+version: "2.11.3"
 slug: "gridbox_connector_edge"
 description: "Viessmann Gridbox Connector (edge)"
 url: "https://github.com/unl0ck/homeassistant-addon-viessmann-gridbox/tree/main/GridboxConnectorAddon-edge"

diff --git a/GridboxConnectorAddon-edge/rootfs/share/cloudSettings.json b/GridboxConnectorAddon-edge/rootfs/share/cloudSettings.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.2",
+  "version": "2.11.3",
   "urls": {
     "login": "https://gridx.eu.auth0.com/oauth/token",
     "gateways": "https://api.gridx.de/gateways",