Refactor HomeMatic / Fix issue with 0.104/dev (home-assistant#30752)

* Refactor HomeMatic / Fix issue with 0.104/dev * Fix lock
palatozs · Jan 14, 2020 · f530ea1 · f530ea1
1 parent 64224f4
commit f530ea1
Show file tree

Hide file tree

Showing 11 changed files with 595 additions and 521 deletions.
diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
diff --git a/homeassistant/components/homematic/binary_sensor.py b/homeassistant/components/homematic/binary_sensor.py
@@ -9,9 +9,9 @@
     DEVICE_CLASS_SMOKE,
     BinarySensorDevice,
 )
-from homeassistant.components.homematic import ATTR_DISCOVERY_TYPE, DISCOVER_BATTERY
 
-from . import ATTR_DISCOVER_DEVICES, HMDevice
+from .const import ATTR_DISCOVER_DEVICES, ATTR_DISCOVERY_TYPE, DISCOVER_BATTERY
+from .entity import HMDevice
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -45,7 +45,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         else:
             devices.append(HMBinarySensor(conf))
 
-    add_entities(devices)
+    add_entities(devices, True)
 
 
 class HMBinarySensor(HMDevice, BinarySensorDevice):

diff --git a/homeassistant/components/homematic/climate.py b/homeassistant/components/homematic/climate.py
@@ -14,7 +14,8 @@
 )
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
 
-from . import ATTR_DISCOVER_DEVICES, HM_ATTRIBUTE_SUPPORT, HMDevice
+from .const import ATTR_DISCOVER_DEVICES, HM_ATTRIBUTE_SUPPORT
+from .entity import HMDevice
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -44,7 +45,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         new_device = HMThermostat(conf)
         devices.append(new_device)
 
-    add_entities(devices)
+    add_entities(devices, True)
 
 
 class HMThermostat(HMDevice, ClimateDevice):

diff --git a/homeassistant/components/homematic/const.py b/homeassistant/components/homematic/const.py
@@ -0,0 +1,212 @@
+"""Constants for the homematic component."""
+
+DOMAIN = "homematic"
+
+DISCOVER_SWITCHES = "homematic.switch"
+DISCOVER_LIGHTS = "homematic.light"
+DISCOVER_SENSORS = "homematic.sensor"
+DISCOVER_BINARY_SENSORS = "homematic.binary_sensor"
+DISCOVER_COVER = "homematic.cover"
+DISCOVER_CLIMATE = "homematic.climate"
+DISCOVER_LOCKS = "homematic.locks"
+DISCOVER_BATTERY = "homematic.battery"
+
+ATTR_DISCOVER_DEVICES = "devices"
+ATTR_PARAM = "param"
+ATTR_CHANNEL = "channel"
+ATTR_ADDRESS = "address"
+ATTR_VALUE = "value"
+ATTR_VALUE_TYPE = "value_type"
+ATTR_INTERFACE = "interface"
+ATTR_ERRORCODE = "error"
+ATTR_MESSAGE = "message"
+ATTR_TIME = "time"
+ATTR_UNIQUE_ID = "unique_id"
+ATTR_PARAMSET_KEY = "paramset_key"
+ATTR_PARAMSET = "paramset"
+ATTR_DISCOVERY_TYPE = "discovery_type"
+ATTR_LOW_BAT = "LOW_BAT"
+ATTR_LOWBAT = "LOWBAT"
+
+EVENT_KEYPRESS = "homematic.keypress"
+EVENT_IMPULSE = "homematic.impulse"
+EVENT_ERROR = "homematic.error"
+
+SERVICE_VIRTUALKEY = "virtualkey"
+SERVICE_RECONNECT = "reconnect"
+SERVICE_SET_VARIABLE_VALUE = "set_variable_value"
+SERVICE_SET_DEVICE_VALUE = "set_device_value"
+SERVICE_SET_INSTALL_MODE = "set_install_mode"
+SERVICE_PUT_PARAMSET = "put_paramset"
+
+HM_DEVICE_TYPES = {
+    DISCOVER_SWITCHES: [
+        "Switch",
+        "SwitchPowermeter",
+        "IOSwitch",
+        "IPSwitch",
+        "RFSiren",
+        "IPSwitchPowermeter",
+        "HMWIOSwitch",
+        "Rain",
+        "EcoLogic",
+        "IPKeySwitchPowermeter",
+        "IPGarage",
+        "IPKeySwitch",
+        "IPKeySwitchLevel",
+        "IPMultiIO",
+    ],
+    DISCOVER_LIGHTS: [
+        "Dimmer",
+        "KeyDimmer",
+        "IPKeyDimmer",
+        "IPDimmer",
+        "ColorEffectLight",
+        "IPKeySwitchLevel",
+    ],
+    DISCOVER_SENSORS: [
+        "SwitchPowermeter",
+        "Motion",
+        "MotionV2",
+        "RemoteMotion",
+        "MotionIP",
+        "ThermostatWall",
+        "AreaThermostat",
+        "RotaryHandleSensor",
+        "WaterSensor",
+        "PowermeterGas",
+        "LuxSensor",
+        "WeatherSensor",
+        "WeatherStation",
+        "ThermostatWall2",
+        "TemperatureDiffSensor",
+        "TemperatureSensor",
+        "CO2Sensor",
+        "IPSwitchPowermeter",
+        "HMWIOSwitch",
+        "FillingLevel",
+        "ValveDrive",
+        "EcoLogic",
+        "IPThermostatWall",
+        "IPSmoke",
+        "RFSiren",
+        "PresenceIP",
+        "IPAreaThermostat",
+        "IPWeatherSensor",
+        "RotaryHandleSensorIP",
+        "IPPassageSensor",
+        "IPKeySwitchPowermeter",
+        "IPThermostatWall230V",
+        "IPWeatherSensorPlus",
+        "IPWeatherSensorBasic",
+        "IPBrightnessSensor",
+        "IPGarage",
+        "UniversalSensor",
+        "MotionIPV2",
+        "IPMultiIO",
+        "IPThermostatWall2",
+    ],
+    DISCOVER_CLIMATE: [
+        "Thermostat",
+        "ThermostatWall",
+        "MAXThermostat",
+        "ThermostatWall2",
+        "MAXWallThermostat",
+        "IPThermostat",
+        "IPThermostatWall",
+        "ThermostatGroup",
+        "IPThermostatWall230V",
+        "IPThermostatWall2",
+    ],
+    DISCOVER_BINARY_SENSORS: [
+        "ShutterContact",
+        "Smoke",
+        "SmokeV2",
+        "Motion",
+        "MotionV2",
+        "MotionIP",
+        "RemoteMotion",
+        "WeatherSensor",
+        "TiltSensor",
+        "IPShutterContact",
+        "HMWIOSwitch",
+        "MaxShutterContact",
+        "Rain",
+        "WiredSensor",
+        "PresenceIP",
+        "IPWeatherSensor",
+        "IPPassageSensor",
+        "SmartwareMotion",
+        "IPWeatherSensorPlus",
+        "MotionIPV2",
+        "WaterIP",
+        "IPMultiIO",
+        "TiltIP",
+        "IPShutterContactSabotage",
+        "IPContact",
+    ],
+    DISCOVER_COVER: ["Blind", "KeyBlind", "IPKeyBlind", "IPKeyBlindTilt"],
+    DISCOVER_LOCKS: ["KeyMatic"],
+}
+
+HM_IGNORE_DISCOVERY_NODE = ["ACTUAL_TEMPERATURE", "ACTUAL_HUMIDITY"]
+
+HM_IGNORE_DISCOVERY_NODE_EXCEPTIONS = {
+    "ACTUAL_TEMPERATURE": [
+        "IPAreaThermostat",
+        "IPWeatherSensor",
+        "IPWeatherSensorPlus",
+        "IPWeatherSensorBasic",
+        "IPThermostatWall",
+        "IPThermostatWall2",
+    ]
+}
+
+HM_ATTRIBUTE_SUPPORT = {
+    "LOWBAT": ["battery", {0: "High", 1: "Low"}],
+    "LOW_BAT": ["battery", {0: "High", 1: "Low"}],
+    "ERROR": ["error", {0: "No"}],
+    "ERROR_SABOTAGE": ["sabotage", {0: "No", 1: "Yes"}],
+    "SABOTAGE": ["sabotage", {0: "No", 1: "Yes"}],
+    "RSSI_PEER": ["rssi_peer", {}],
+    "RSSI_DEVICE": ["rssi_device", {}],
+    "VALVE_STATE": ["valve", {}],
+    "LEVEL": ["level", {}],
+    "BATTERY_STATE": ["battery", {}],
+    "CONTROL_MODE": [
+        "mode",
+        {0: "Auto", 1: "Manual", 2: "Away", 3: "Boost", 4: "Comfort", 5: "Lowering"},
+    ],
+    "POWER": ["power", {}],
+    "CURRENT": ["current", {}],
+    "VOLTAGE": ["voltage", {}],
+    "OPERATING_VOLTAGE": ["voltage", {}],
+    "WORKING": ["working", {0: "No", 1: "Yes"}],
+    "STATE_UNCERTAIN": ["state_uncertain", {}],
+}
+
+HM_PRESS_EVENTS = [
+    "PRESS_SHORT",
+    "PRESS_LONG",
+    "PRESS_CONT",
+    "PRESS_LONG_RELEASE",
+    "PRESS",
+]
+
+HM_IMPULSE_EVENTS = ["SEQUENCE_OK"]
+
+CONF_RESOLVENAMES_OPTIONS = ["metadata", "json", "xml", False]
+
+DATA_HOMEMATIC = "homematic"
+DATA_STORE = "homematic_store"
+DATA_CONF = "homematic_conf"
+
+CONF_INTERFACES = "interfaces"
+CONF_LOCAL_IP = "local_ip"
+CONF_LOCAL_PORT = "local_port"
+CONF_PORT = "port"
+CONF_PATH = "path"
+CONF_CALLBACK_IP = "callback_ip"
+CONF_CALLBACK_PORT = "callback_port"
+CONF_RESOLVENAMES = "resolvenames"
+CONF_JSONPORT = "jsonport"
diff --git a/homeassistant/components/homematic/cover.py b/homeassistant/components/homematic/cover.py
@@ -6,9 +6,9 @@
     ATTR_TILT_POSITION,
     CoverDevice,
 )
-from homeassistant.const import STATE_UNKNOWN
 
-from . import ATTR_DISCOVER_DEVICES, HMDevice
+from .const import ATTR_DISCOVER_DEVICES
+from .entity import HMDevice
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -23,7 +23,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         new_device = HMCover(conf)
         devices.append(new_device)
 
-    add_entities(devices)
+    add_entities(devices, True)
 
 
 class HMCover(HMDevice, CoverDevice):
@@ -68,9 +68,9 @@ def stop_cover(self, **kwargs):
     def _init_data_struct(self):
         """Generate a data dictionary (self._data) from metadata."""
         self._state = "LEVEL"
-        self._data.update({self._state: STATE_UNKNOWN})
+        self._data.update({self._state: None})
         if "LEVEL_2" in self._hmdevice.WRITENODE:
-            self._data.update({"LEVEL_2": STATE_UNKNOWN})
+            self._data.update({"LEVEL_2": None})
 
     @property
     def current_cover_tilt_position(self):