From 0dfb4f4dbffc9a996ab9a2b2ba46a8639cfb11cf Mon Sep 17 00:00:00 2001 From: unl0ck Date: Fri, 24 Jan 2025 16:41:09 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20RELEASE:=20=202.11.49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion-edge.toml | 2 +- GridboxConnectorAddon-dev/CHANGELOG.md | 6 +++++ .../GridboxConnector/ha_viessmann_battery.py | 24 +++++++++---------- .../ha_viessmann_gridbox_connector.py | 4 ++-- GridboxConnectorAddon-dev/cloudSettings.json | 2 +- GridboxConnectorAddon-dev/config.yaml | 2 +- .../rootfs/share/cloudSettings.json | 2 +- GridboxConnectorAddon-edge/CHANGELOG.md | 6 +++++ .../GridboxConnector/ha_viessmann_battery.py | 24 +++++++++---------- .../ha_viessmann_gridbox_connector.py | 4 ++-- GridboxConnectorAddon-edge/cloudSettings.json | 2 +- GridboxConnectorAddon-edge/config.yaml | 2 +- .../rootfs/share/cloudSettings.json | 2 +- GridboxConnectorAddon/CHANGELOG.md | 6 +++++ .../GridboxConnector/ha_viessmann_battery.py | 24 +++++++++---------- .../ha_viessmann_gridbox_connector.py | 4 ++-- GridboxConnectorAddon/cloudSettings.json | 2 +- GridboxConnectorAddon/config.yaml | 2 +- .../rootfs/share/cloudSettings.json | 2 +- 19 files changed, 70 insertions(+), 52 deletions(-) diff --git a/.bumpversion-edge.toml b/.bumpversion-edge.toml index 1ed243a..2041239 100644 --- a/.bumpversion-edge.toml +++ b/.bumpversion-edge.toml @@ -1,5 +1,5 @@ [tool.bumpversion] -current_version = "2.11.48" +current_version = "2.11.49" parse = "(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)" serialize = ["{major}.{minor}.{patch}"] search = "{current_version}" diff --git a/GridboxConnectorAddon-dev/CHANGELOG.md b/GridboxConnectorAddon-dev/CHANGELOG.md index d8adfd0..0f5b3be 100644 --- a/GridboxConnectorAddon-dev/CHANGELOG.md +++ b/GridboxConnectorAddon-dev/CHANGELOG.md @@ -1,5 +1,11 @@ +## 2.11.49 + +### 🔨 Fixed + +- fixed battery live data sorry guys + ## 2.11.48 ### 🔨 Fixed diff --git a/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_battery.py b/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_battery.py index e7e8e74..8699bdb 100644 --- a/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_battery.py +++ b/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_battery.py @@ -58,16 +58,16 @@ def set_states(self, level, capacity, power, remaining_charge, charge=None, disc self.battery_capacity.set_state(capacity) self.battery_power.set_state(power) self.battery_remaining_charge.set_state(remaining_charge) - # if charge is not None and self.battery_charge is not None: - # self.battery_sensor_charge = SensorInfo(name=f"Battery {self.name} Charge", device_class="energy", unique_id=f"gridbox_charge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") - # self.battery_settings_charge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_charge) - # self.battery_charge = Sensor(self.battery_settings_charge) - # if charge is not None: - # self.battery_charge.set_state(charge) + if charge is not None and self.battery_charge is not None: + self.battery_sensor_charge = SensorInfo(name=f"Battery {self.name} Charge", device_class="energy", unique_id=f"gridbox_charge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") + self.battery_settings_charge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_charge) + self.battery_charge = Sensor(self.battery_settings_charge) + if charge is not None: + self.battery_charge.set_state(charge) - # if discharge is not None and self.battery_discharge is not None: - # self.battery_sensor_discharge = SensorInfo(name=f"Battery {self.name} Discharge", device_class="energy", unique_id=f"gridbox_discharge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") - # self.battery_settings_discharge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_discharge) - # self.battery_discharge = Sensor(self.battery_settings_discharge) - # if discharge is not None: - # self.battery_discharge.set_state(discharge) + if discharge is not None and self.battery_discharge is not None: + self.battery_sensor_discharge = SensorInfo(name=f"Battery {self.name} Discharge", device_class="energy", unique_id=f"gridbox_discharge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") + self.battery_settings_discharge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_discharge) + self.battery_discharge = Sensor(self.battery_settings_discharge) + if discharge is not None: + self.battery_discharge.set_state(discharge) diff --git a/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_gridbox_connector.py b/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_gridbox_connector.py index f1ed17b..943e913 100644 --- a/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_gridbox_connector.py +++ b/GridboxConnectorAddon-dev/GridboxConnector/ha_viessmann_gridbox_connector.py @@ -144,8 +144,8 @@ def update_sensors(self, measurement: dict, last_reset: str = None): capacity = float(battery.get("capacity", "0")) power = round(float(battery.get("power", "0")),2) remaining_charge = round(float(battery.get("remainingCharge", "0")),2) - charge = round(float(battery.get("charge", None)),2) - discharge = round(float(battery.get("discharge", None)),2) + charge = round(float(battery.get("charge", "0")),2) + discharge = round(float(battery.get("discharge", "0")),2) self.battery_sum.set_states(state_of_charge, capacity, power, remaining_charge, charge, discharge) if "batteries" in measurement: diff --git a/GridboxConnectorAddon-dev/cloudSettings.json b/GridboxConnectorAddon-dev/cloudSettings.json index 6d1097f..afbd87d 100644 --- a/GridboxConnectorAddon-dev/cloudSettings.json +++ b/GridboxConnectorAddon-dev/cloudSettings.json @@ -1,5 +1,5 @@ { - "version": "2.11.48", + "version": "2.11.49", "urls": { "login": "https://gridx.eu.auth0.com/oauth/token", "gateways": "https://api.gridx.de/gateways", diff --git a/GridboxConnectorAddon-dev/config.yaml b/GridboxConnectorAddon-dev/config.yaml index 59aa36d..7b5b72c 100644 --- a/GridboxConnectorAddon-dev/config.yaml +++ b/GridboxConnectorAddon-dev/config.yaml @@ -1,6 +1,6 @@ # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config name: Viessmann Gridbox Connector (dev) -version: "2.11.48" +version: "2.11.49" slug: "gridbox_connector_dev" description: Development version of Viessmann Gridbox Connector url: "https://github.com/unl0ck/homeassistant-addon-viessmann-gridbox/tree/main/GridboxConnectorAddon-dev" diff --git a/GridboxConnectorAddon-dev/rootfs/share/cloudSettings.json b/GridboxConnectorAddon-dev/rootfs/share/cloudSettings.json index 6d1097f..afbd87d 100644 --- a/GridboxConnectorAddon-dev/rootfs/share/cloudSettings.json +++ b/GridboxConnectorAddon-dev/rootfs/share/cloudSettings.json @@ -1,5 +1,5 @@ { - "version": "2.11.48", + "version": "2.11.49", "urls": { "login": "https://gridx.eu.auth0.com/oauth/token", "gateways": "https://api.gridx.de/gateways", diff --git a/GridboxConnectorAddon-edge/CHANGELOG.md b/GridboxConnectorAddon-edge/CHANGELOG.md index d8adfd0..0f5b3be 100644 --- a/GridboxConnectorAddon-edge/CHANGELOG.md +++ b/GridboxConnectorAddon-edge/CHANGELOG.md @@ -1,5 +1,11 @@ +## 2.11.49 + +### 🔨 Fixed + +- fixed battery live data sorry guys + ## 2.11.48 ### 🔨 Fixed diff --git a/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_battery.py b/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_battery.py index e7e8e74..8699bdb 100644 --- a/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_battery.py +++ b/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_battery.py @@ -58,16 +58,16 @@ def set_states(self, level, capacity, power, remaining_charge, charge=None, disc self.battery_capacity.set_state(capacity) self.battery_power.set_state(power) self.battery_remaining_charge.set_state(remaining_charge) - # if charge is not None and self.battery_charge is not None: - # self.battery_sensor_charge = SensorInfo(name=f"Battery {self.name} Charge", device_class="energy", unique_id=f"gridbox_charge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") - # self.battery_settings_charge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_charge) - # self.battery_charge = Sensor(self.battery_settings_charge) - # if charge is not None: - # self.battery_charge.set_state(charge) + if charge is not None and self.battery_charge is not None: + self.battery_sensor_charge = SensorInfo(name=f"Battery {self.name} Charge", device_class="energy", unique_id=f"gridbox_charge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") + self.battery_settings_charge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_charge) + self.battery_charge = Sensor(self.battery_settings_charge) + if charge is not None: + self.battery_charge.set_state(charge) - # if discharge is not None and self.battery_discharge is not None: - # self.battery_sensor_discharge = SensorInfo(name=f"Battery {self.name} Discharge", device_class="energy", unique_id=f"gridbox_discharge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") - # self.battery_settings_discharge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_discharge) - # self.battery_discharge = Sensor(self.battery_settings_discharge) - # if discharge is not None: - # self.battery_discharge.set_state(discharge) + if discharge is not None and self.battery_discharge is not None: + self.battery_sensor_discharge = SensorInfo(name=f"Battery {self.name} Discharge", device_class="energy", unique_id=f"gridbox_discharge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") + self.battery_settings_discharge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_discharge) + self.battery_discharge = Sensor(self.battery_settings_discharge) + if discharge is not None: + self.battery_discharge.set_state(discharge) diff --git a/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_gridbox_connector.py b/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_gridbox_connector.py index f1ed17b..943e913 100644 --- a/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_gridbox_connector.py +++ b/GridboxConnectorAddon-edge/GridboxConnector/ha_viessmann_gridbox_connector.py @@ -144,8 +144,8 @@ def update_sensors(self, measurement: dict, last_reset: str = None): capacity = float(battery.get("capacity", "0")) power = round(float(battery.get("power", "0")),2) remaining_charge = round(float(battery.get("remainingCharge", "0")),2) - charge = round(float(battery.get("charge", None)),2) - discharge = round(float(battery.get("discharge", None)),2) + charge = round(float(battery.get("charge", "0")),2) + discharge = round(float(battery.get("discharge", "0")),2) self.battery_sum.set_states(state_of_charge, capacity, power, remaining_charge, charge, discharge) if "batteries" in measurement: diff --git a/GridboxConnectorAddon-edge/cloudSettings.json b/GridboxConnectorAddon-edge/cloudSettings.json index 6d1097f..afbd87d 100644 --- a/GridboxConnectorAddon-edge/cloudSettings.json +++ b/GridboxConnectorAddon-edge/cloudSettings.json @@ -1,5 +1,5 @@ { - "version": "2.11.48", + "version": "2.11.49", "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 index 2c321ea..0f4b6dd 100644 --- 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.48" +version: "2.11.49" 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 index 6d1097f..afbd87d 100644 --- a/GridboxConnectorAddon-edge/rootfs/share/cloudSettings.json +++ b/GridboxConnectorAddon-edge/rootfs/share/cloudSettings.json @@ -1,5 +1,5 @@ { - "version": "2.11.48", + "version": "2.11.49", "urls": { "login": "https://gridx.eu.auth0.com/oauth/token", "gateways": "https://api.gridx.de/gateways", diff --git a/GridboxConnectorAddon/CHANGELOG.md b/GridboxConnectorAddon/CHANGELOG.md index d8adfd0..0f5b3be 100644 --- a/GridboxConnectorAddon/CHANGELOG.md +++ b/GridboxConnectorAddon/CHANGELOG.md @@ -1,5 +1,11 @@ +## 2.11.49 + +### 🔨 Fixed + +- fixed battery live data sorry guys + ## 2.11.48 ### 🔨 Fixed diff --git a/GridboxConnectorAddon/GridboxConnector/ha_viessmann_battery.py b/GridboxConnectorAddon/GridboxConnector/ha_viessmann_battery.py index e7e8e74..8699bdb 100644 --- a/GridboxConnectorAddon/GridboxConnector/ha_viessmann_battery.py +++ b/GridboxConnectorAddon/GridboxConnector/ha_viessmann_battery.py @@ -58,16 +58,16 @@ def set_states(self, level, capacity, power, remaining_charge, charge=None, disc self.battery_capacity.set_state(capacity) self.battery_power.set_state(power) self.battery_remaining_charge.set_state(remaining_charge) - # if charge is not None and self.battery_charge is not None: - # self.battery_sensor_charge = SensorInfo(name=f"Battery {self.name} Charge", device_class="energy", unique_id=f"gridbox_charge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") - # self.battery_settings_charge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_charge) - # self.battery_charge = Sensor(self.battery_settings_charge) - # if charge is not None: - # self.battery_charge.set_state(charge) + if charge is not None and self.battery_charge is not None: + self.battery_sensor_charge = SensorInfo(name=f"Battery {self.name} Charge", device_class="energy", unique_id=f"gridbox_charge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") + self.battery_settings_charge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_charge) + self.battery_charge = Sensor(self.battery_settings_charge) + if charge is not None: + self.battery_charge.set_state(charge) - # if discharge is not None and self.battery_discharge is not None: - # self.battery_sensor_discharge = SensorInfo(name=f"Battery {self.name} Discharge", device_class="energy", unique_id=f"gridbox_discharge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") - # self.battery_settings_discharge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_discharge) - # self.battery_discharge = Sensor(self.battery_settings_discharge) - # if discharge is not None: - # self.battery_discharge.set_state(discharge) + if discharge is not None and self.battery_discharge is not None: + self.battery_sensor_discharge = SensorInfo(name=f"Battery {self.name} Discharge", device_class="energy", unique_id=f"gridbox_discharge_{self.name}"+self.prefix, device=self.device_info, unit_of_measurement="Wh", state_class=self.state_class, value_template=None if self.state_class is None else "{{ value_json.state }}", last_reset_value_template=None if self.state_class is None else "{{ value_json.last_reset }}") + self.battery_settings_discharge = Settings(mqtt=self.mqtt_settings, entity=self.battery_sensor_discharge) + self.battery_discharge = Sensor(self.battery_settings_discharge) + if discharge is not None: + self.battery_discharge.set_state(discharge) diff --git a/GridboxConnectorAddon/GridboxConnector/ha_viessmann_gridbox_connector.py b/GridboxConnectorAddon/GridboxConnector/ha_viessmann_gridbox_connector.py index f1ed17b..943e913 100644 --- a/GridboxConnectorAddon/GridboxConnector/ha_viessmann_gridbox_connector.py +++ b/GridboxConnectorAddon/GridboxConnector/ha_viessmann_gridbox_connector.py @@ -144,8 +144,8 @@ def update_sensors(self, measurement: dict, last_reset: str = None): capacity = float(battery.get("capacity", "0")) power = round(float(battery.get("power", "0")),2) remaining_charge = round(float(battery.get("remainingCharge", "0")),2) - charge = round(float(battery.get("charge", None)),2) - discharge = round(float(battery.get("discharge", None)),2) + charge = round(float(battery.get("charge", "0")),2) + discharge = round(float(battery.get("discharge", "0")),2) self.battery_sum.set_states(state_of_charge, capacity, power, remaining_charge, charge, discharge) if "batteries" in measurement: diff --git a/GridboxConnectorAddon/cloudSettings.json b/GridboxConnectorAddon/cloudSettings.json index 6d1097f..afbd87d 100644 --- a/GridboxConnectorAddon/cloudSettings.json +++ b/GridboxConnectorAddon/cloudSettings.json @@ -1,5 +1,5 @@ { - "version": "2.11.48", + "version": "2.11.49", "urls": { "login": "https://gridx.eu.auth0.com/oauth/token", "gateways": "https://api.gridx.de/gateways", diff --git a/GridboxConnectorAddon/config.yaml b/GridboxConnectorAddon/config.yaml index ce52b58..a406451 100644 --- a/GridboxConnectorAddon/config.yaml +++ b/GridboxConnectorAddon/config.yaml @@ -1,6 +1,6 @@ # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config name: Viessmann Gridbox Connector -version: "2.11.48" +version: "2.11.49" slug: "gridbox_connector" description: Fetch your live data from your Viessmann Gridbox url: "https://github.com/unl0ck/homeassistant-addon-viessmann-gridbox/tree/main/GridboxConnectorAddon" diff --git a/GridboxConnectorAddon/rootfs/share/cloudSettings.json b/GridboxConnectorAddon/rootfs/share/cloudSettings.json index 6d1097f..afbd87d 100644 --- a/GridboxConnectorAddon/rootfs/share/cloudSettings.json +++ b/GridboxConnectorAddon/rootfs/share/cloudSettings.json @@ -1,5 +1,5 @@ { - "version": "2.11.48", + "version": "2.11.49", "urls": { "login": "https://gridx.eu.auth0.com/oauth/token", "gateways": "https://api.gridx.de/gateways",