Merge pull request #249 from tijsverkoyen/cleanup

Cleanup

Author: tijsverkoyen

custom_components/nhc2/climate.py

@@ -34,7 +34,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     hub = (DOMAIN, config_entry.data[CONF_USERNAME])
 
     device_instances = gateway.get_device_instances(CocoThermostatHvac)
-    device_instances += gateway.get_device_instances(CocoTouchswitchHvac)
     _LOGGER.info('→ Found %s NHC Thermostat (thermostat, touchswitch)', len(device_instances))
     if len(device_instances) > 0:
         entities = []

custom_components/nhc2/nhccoco/coco.py

@@ -348,6 +348,7 @@ def _process_devices_list(self, response):
                     'CocoDimmerSmartdimmer',
                     'CocoDoorlockLock',
                     'CocoElectricalheatingHvac',
+                    'CocoElectricityPulseCentralmeter',
                     'CocoEnergydisplayPanel',
                     'CocoExtensionbuttonx1Smartextensionpanel',
                     'CocoExternalsystemDigitalsensor',

custom_components/nhc2/sensor.py

@@ -177,7 +177,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         async_add_entities(entities)
 
     device_instances = gateway.get_device_instances(CocoThermostatHvac)
-    _LOGGER.info('→ Found %s NHC Thermostat (thermostat)', len(device_instances))
+    _LOGGER.info('→ Found %s NHC Thermostat (thermostat/touchswitch)', len(device_instances))
     if len(device_instances) > 0:
         entities = []
         for device_instance in device_instances:
@@ -191,17 +191,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
         async_add_entities(entities)
 
-    device_instances = gateway.get_device_instances(CocoTouchswitchHvac)
-    _LOGGER.info('→ Found %s NHC Thermostat (touchswitch)', len(device_instances))
-    if len(device_instances) > 0:
-        entities = []
-        for device_instance in device_instances:
-            entities.append(Nhc2ThermostatHvacSetpointTemperatureEntity(device_instance, hub, gateway))
-            entities.append(Nhc2ThermostatHvacOverruleTimeEntity(device_instance, hub, gateway))
-            entities.append(Nhc2ThermostatHvacOverruleSetpointEntity(device_instance, hub, gateway))
-
-        async_add_entities(entities)
-
     device_instances = gateway.get_device_instances(CocoThermostatThermostat)
     _LOGGER.info('→ Found %s NHC Touch Switch', len(device_instances))
     if len(device_instances) > 0:

custom_components/nhc2/switch.py

@@ -138,7 +138,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         async_add_entities(entities)
 
     device_instances = gateway.get_device_instances(CocoThermostatHvac)
-    _LOGGER.info('→ Found %s NHC Thermostat (thermostat)', len(device_instances))
+    _LOGGER.info('→ Found %s NHC Thermostat (thermostat, touchswitch)', len(device_instances))
     if len(device_instances) > 0:
         entities = []
         for device_instance in device_instances:
@@ -149,16 +149,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
         async_add_entities(entities)
 
-    device_instances = gateway.get_device_instances(CocoTouchswitchHvac)
-    _LOGGER.info('→ Found %s NHC Thermostat (touchswitch)', len(device_instances))
-    if len(device_instances) > 0:
-        entities = []
-        for device_instance in device_instances:
-            entities.append(Nhc2ThermostatHvacOverruleActiveEntity(device_instance, hub, gateway))
-            entities.append(Nhc2ThermostatHvacEcoSaveEntity(device_instance, hub, gateway))
-
-        async_add_entities(entities)
-
     device_instances = gateway.get_device_instances(CocoThermostatThermostat)
     _LOGGER.info('→ Found %s NHC Touch Switch', len(device_instances))
     if len(device_instances) > 0: