From 1b1e761fdd8b5617d60034666feeead5b2ccefd7 Mon Sep 17 00:00:00 2001
From: jkerdreu <jkerdreu@b32b6428-25c9-4566-ad07-03861ab6144f>
Date: Thu, 24 Nov 2022 11:40:55 +0000
Subject: [PATCH] - Switch to new units - Fix the space issue on ha_name
git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@3054 b32b6428-25c9-4566-ad07-03861ab6144f
---
apps/homeassistant/xaal/bridge.py | 4 ++--
apps/homeassistant/xaal/sensor.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/homeassistant/xaal/bridge.py b/apps/homeassistant/xaal/bridge.py
index 1b668c86..084840cc 100644
--- a/apps/homeassistant/xaal/bridge.py
+++ b/apps/homeassistant/xaal/bridge.py
@@ -111,7 +111,7 @@ class XAALEntity(Entity):
db_name = self._dev.db.get('ha_name')
dev_name = self._dev.db.get('ha_dev_name')
if dev_name and db_name:
- db_name = db_name.removeprefix(dev_name)
+ db_name = db_name.removeprefix(f"{dev_name} ")
force_name = getattr(self, '_force_name', None)
name = db_name or force_name or self.device_class or self.short_type()
@@ -396,7 +396,7 @@ class Bridge(object):
entity = self.get_entity_by_id(entity_id)
if entity:
name = entity.registry_entry.name
- if 'name' not in event.data.get('changes',{}).keys():
+ if 'name' not in event.data.get('changes', {}).keys():
return
kv = {'ha_name': name}
body = {'device': entity.address, 'map': kv}
diff --git a/apps/homeassistant/xaal/sensor.py b/apps/homeassistant/xaal/sensor.py
index 9f10b32d..c8521f10 100644
--- a/apps/homeassistant/xaal/sensor.py
+++ b/apps/homeassistant/xaal/sensor.py
@@ -58,7 +58,7 @@ class Hygrometer(XAALSensorEntity):
class Barometer(XAALSensorEntity):
_attr_device_class = SensorDeviceClass.PRESSURE
- _attr_native_unit_of_measurement = const.PRESSURE_HPA
+ _attr_native_unit_of_measurement = const.UnitOfPressure.HPA
_xaal_attribute = 'pressure'
@@ -71,7 +71,7 @@ class Battery(XAALSensorEntity):
class PowerMeter(XAALSensorEntity):
_attr_device_class = SensorDeviceClass.POWER
- _attr_native_unit_of_measurement = const.POWER_WATT
+ _attr_native_unit_of_measurement = const.UnitOfPower.WATT
_xaal_attribute = 'power'
--
GitLab