diff --git a/changelog.txt b/changelog.txt index 37ffbe1b4..478922d77 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +Version 0.1.76 (2021-10-20) +- Add HmIP-WHS2 @wutr +- Add HmIP-eTRV-E @emufan + Version 0.1.75 (2021-10-03) - Reduce some log levels - Add RSSI for HmIP-DRSI1 (Issue #428) @emufan diff --git a/pyhomematic/devicetypes/actors.py b/pyhomematic/devicetypes/actors.py index aff63e6e0..b09310ff8 100644 --- a/pyhomematic/devicetypes/actors.py +++ b/pyhomematic/devicetypes/actors.py @@ -897,7 +897,6 @@ def __init__(self, device_description, proxy, resolveparamsets=False): def ELEMENT(self): return [2, 3, 4, 6, 7, 8] - class ColorEffectLight(Dimmer): """ Color light with dimmer function and color effects. @@ -1065,6 +1064,20 @@ def get_voltage(self, channel=None): def ELEMENT(self): return self._doc +class IPWHS2(GenericSwitch, HelperActionOnTime, HelperRssiDevice): + """ + HmIP-WHS2 Central Heating and Hot Water actuator + """ + def __init__(self, device_description, proxy, resolveparamsets=False): + super().__init__(device_description, proxy, resolveparamsets) + + # Channels 1 and 5 show the state of physical output 1 and 2 respectively. + self.BINARYNODE.update({"STATE": [1, 5]}) + + @property + def ELEMENT(self): + return [2, 6] + DEVICETYPES = { "HM-LC-Bl1-SM": Blind, "HM-LC-Bl1-SM-2": Blind, @@ -1235,4 +1248,5 @@ def ELEMENT(self): "HM-LC-DW-WM": ColdWarmDimmer, "HB-UNI-RGB-LED-CTRL": ColorEffectLight, "HmIP-MIO16-PCB": IPMultiIOPCB, + "HmIP-WHS2": IPWHS2, } diff --git a/pyhomematic/devicetypes/thermostats.py b/pyhomematic/devicetypes/thermostats.py index adbe9eba7..92da326c0 100644 --- a/pyhomematic/devicetypes/thermostats.py +++ b/pyhomematic/devicetypes/thermostats.py @@ -470,6 +470,7 @@ def turnoff(self): "HmIP-eTRV-B1": IPThermostat, "HmIP-eTRV-C": IPThermostat, "HmIP-eTRV-C-2": IPThermostat, + "HmIP-eTRV-E": IPThermostat, "Thermostat AA": IPThermostat, "Thermostat AA GB": IPThermostat, "HmIP-STHD": IPThermostatWall2, diff --git a/setup.py b/setup.py index b39f8ef01..6f2080bcf 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def readme(): PACKAGE_NAME = 'pyhomematic' HERE = os.path.abspath(os.path.dirname(__file__)) -VERSION = '0.1.75' +VERSION = '0.1.76' PACKAGES = find_packages(exclude=['dist', 'build', 'tests'])