Merge branch 'dev' into main

MihVS · Feb 7, 2024 · 7a50084 · 7a50084
2 parents 1141b32 + ee555c3
commit 7a50084
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,6 @@
 * *H2000*
 * *H1000*
 * *H1000+*
-* *T100*
 
 ## Возможности
 В НА из ZONT добавляются следующие объекты каждого устройства:

diff --git a/custom_components/zont_ha/alarm_control_panel.py b/custom_components/zont_ha/alarm_control_panel.py
@@ -32,8 +32,6 @@ async def async_setup_entry(
     for device in zont.data.devices:
         alarms = []
         guard_zones = device.guard_zones
-        if guard_zones in None:
-            guard_zones = []
         for guard_zone in guard_zones:
             unique_id = f'{entry_id}{device.id}{guard_zone.id}'
             alarms.append(ZontAlarm(

diff --git a/custom_components/zont_ha/binary_sensor.py b/custom_components/zont_ha/binary_sensor.py
@@ -30,8 +30,6 @@ async def async_setup_entry(
     for device in zont.data.devices:
         binary_sensors = []
         sensors = device.sensors
-        if sensors in None:
-            sensors = []
         for sensor in sensors:
             unique_id = f'{entry_id}{device.id}{sensor.id}'
             if sensor.type in BINARY_SENSOR_TYPES:

diff --git a/custom_components/zont_ha/button.py b/custom_components/zont_ha/button.py
@@ -24,8 +24,6 @@ async def async_setup_entry(
     for device in zont.data.devices:
         buttons = []
         controls = device.custom_controls
-        if controls in None:
-            controls = []
         for control in controls:
             if control.type == BUTTON_ZONT:
                 unique_id = f'{entry_id}{device.id}{control.id}'

diff --git a/custom_components/zont_ha/core/models_zont.py b/custom_components/zont_ha/core/models_zont.py
@@ -86,12 +86,12 @@ class DeviceZONT(BaseEntityZONT):
     widget_type: str
     heating_circuits: list[HeatingCircuitZONT]
     heating_modes: list[HeatingModeZONT]
-    boiler_modes: list[BoilerModeZONT] | None
-    sensors: list[SensorZONT] | None
-    ot_sensors: list[OTSensorZONT] | None
-    guard_zones: list[GuardZoneZONT] | None
-    custom_controls: list[CustomControlZONT] | None
-    scenarios: list[ScenarioZONT] | None
+    boiler_modes: list[BoilerModeZONT] = []
+    sensors: list[SensorZONT] = []
+    ot_sensors: list[OTSensorZONT] = []
+    guard_zones: list[GuardZoneZONT] = []
+    custom_controls: list[CustomControlZONT] = []
+    scenarios: list[ScenarioZONT] = []
 
 
 class AccountZont(BaseModel):

diff --git a/custom_components/zont_ha/manifest.json b/custom_components/zont_ha/manifest.json
@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "dependencies": ["http", "zeroconf"],
   "requirements": [],
-  "version": "0.2.2"
+  "version": "0.2.3"
 }
diff --git a/custom_components/zont_ha/sensor.py b/custom_components/zont_ha/sensor.py
@@ -29,10 +29,6 @@ async def async_setup_entry(
         sens = []
         sensors = device.sensors
         ot_sensors = device.ot_sensors
-        if sensors is None:
-            sensors = []
-        if ot_sensors is None:
-            ot_sensors = []
         for sensor in sensors:
             unique_id = f'{entry_id}{device.id}{sensor.id}'
             if sensor.type not in BINARY_SENSOR_TYPES:

diff --git a/custom_components/zont_ha/switch.py b/custom_components/zont_ha/switch.py
@@ -26,8 +26,6 @@ async def async_setup_entry(
     for device in zont.data.devices:
         switch = []
         controls = device.custom_controls
-        if controls in None:
-            controls = []
         for control in controls:
             if control.type == SWITCH_ZONT:
                 unique_id = f'{entry_id}{device.id}{control.id}'