added

- HMIP-FAL230-C10 (Floor Heating Actuator – 10x channels, 230V) - HMIP-FAL24-C6 (Floor Heating Actuator – 6x channels, 24V) - HMIP-FAL24-C10 (Floor Heating Actuator – 10x channels, 24V) closes #210
hahn-th · May 23, 2019 · e8429c5 · e8429c5
1 parent 4500204
commit e8429c5
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Devices
   - HMIP-PCBS2 (Switch Circuit Board - 2x channels) 
   - HMIP-BBL (Blind Actuator for brand switches)
+  - HMIP-FAL230-C10 (Floor Heating Actuator – 10x channels, 230V)
+  - HMIP-FAL24-C6   (Floor Heating Actuator – 6x channels, 24V)
+  - HMIP-FAL24-C10  (Floor Heating Actuator – 10x channels, 24V)
   - Async implementation of HmIP-PCBS-BAT (Printed Curcuit Board Switch Battery)
+
 ## [0.10.7] - 2019-04-09
 ### Added
 - Devices

diff --git a/README.rst b/README.rst
@@ -85,9 +85,9 @@ Homematic IP Devices:
 -  [ ] HMIP-eTRV-B     (Heating-Thermostat with Display not tested, but it should work)
 -  [X] HMIP-eTRV-C     (Heating-thermostat compact without display)
 -  [X] HMIP-FAL230-C6  (Floor Heating Actuator – 6x channels, 230V)
--  [ ] HMIP-FAL230-C10 (Floor Heating Actuator – 10x channels, 230V)
--  [ ] HMIP-FAL24-C6   (Floor Heating Actuator – 6x channels, 24V)
--  [ ] HMIP-FAL24-C10  (Floor Heating Actuator – 10x channels, 24V)
+-  [X] HMIP-FAL230-C10 (Floor Heating Actuator – 10x channels, 230V)
+-  [X] HMIP-FAL24-C6   (Floor Heating Actuator – 6x channels, 24V)
+-  [X] HMIP-FAL24-C10  (Floor Heating Actuator – 10x channels, 24V)
 -  [X] HMIP-FBL        (Blind Actuator - flush-mount)
 -  [X] HMIP-FCI1       (Contact Interface flush-mount – 1x channel)
 -  [ ] HMIP-FCI6       (Contact Interface flush-mount – 6x channels)

diff --git a/homematicip/aio/class_maps.py b/homematicip/aio/class_maps.py
@@ -15,6 +15,7 @@
     DeviceType.BRAND_SWITCH_NOTIFICATION_LIGHT: AsyncBrandSwitchNotificationLight,
     DeviceType.BRAND_WALL_MOUNTED_THERMOSTAT: AsyncWallMountedThermostatPro,
     DeviceType.FLOOR_TERMINAL_BLOCK_6: AsyncFloorTerminalBlock6,
+    DeviceType.FLOOR_TERMINAL_BLOCK_10: AsyncFloorTerminalBlock10,
     DeviceType.FULL_FLUSH_BLIND: AsyncFullFlushBlind,
     DeviceType.FULL_FLUSH_CONTACT_INTERFACE: AsyncFullFlushContactInterface,
     DeviceType.FULL_FLUSH_DIMMER: AsyncFullFlushDimmer,

diff --git a/homematicip/aio/device.py b/homematicip/aio/device.py
@@ -185,6 +185,8 @@ class AsyncFloorTerminalBlock6(FloorTerminalBlock6, AsyncDevice):
 
     pass
 
+class AsyncFloorTerminalBlock10(FloorTerminalBlock10,AsyncFloorTerminalBlock6):
+    """ HMIP-FAL24-C10  (Floor Heating Actuator – 10x channels, 24V) """
 
 class AsyncPushButton(PushButton, AsyncDevice):
     """ HMIP-WRC2 (Wall-mount Remote Control - 2-button) """

diff --git a/homematicip/base/enums.py b/homematicip/base/enums.py
@@ -190,6 +190,7 @@ class DeviceType(AutoNameEnum):
     BRAND_SWITCH_NOTIFICATION_LIGHT = auto()
     BRAND_WALL_MOUNTED_THERMOSTAT = auto()
     FLOOR_TERMINAL_BLOCK_6 = auto()
+    FLOOR_TERMINAL_BLOCK_10 = auto()
     FULL_FLUSH_BLIND = auto()
     FULL_FLUSH_CONTACT_INTERFACE = auto()
     FULL_FLUSH_DIMMER = auto()

diff --git a/homematicip/class_maps.py b/homematicip/class_maps.py
@@ -21,6 +21,7 @@
     DeviceType.BRAND_SWITCH_NOTIFICATION_LIGHT: BrandSwitchNotificationLight,
     DeviceType.BRAND_WALL_MOUNTED_THERMOSTAT: WallMountedThermostatPro,
     DeviceType.FLOOR_TERMINAL_BLOCK_6: FloorTerminalBlock6,
+    DeviceType.FLOOR_TERMINAL_BLOCK_10: FloorTerminalBlock10,
     DeviceType.FULL_FLUSH_BLIND: FullFlushBlind,
     DeviceType.FULL_FLUSH_CONTACT_INTERFACE: FullFlushContactInterface,
     DeviceType.FULL_FLUSH_DIMMER: FullFlushDimmer,

diff --git a/homematicip/device.py b/homematicip/device.py
@@ -503,6 +503,8 @@ def __str__(self):
             self.pumpProtectionSwitchingInterval,
         )
 
+class FloorTerminalBlock10(FloorTerminalBlock6):
+    """ HMIP-FAL24-C10  (Floor Heating Actuator – 10x channels, 24V) """
 
 class Switch(Device):
     """ Generic Switch class """

diff --git a/homematicip_demo/json_data/home.json b/homematicip_demo/json_data/home.json
@@ -8,6 +8,162 @@
         }
     },
     "devices": {
+        "3014F71100000000FAL24C10": {
+            "availableFirmwareVersion": "1.6.2",
+            "firmwareVersion": "1.6.2",
+            "firmwareVersionInteger": 67074,
+            "functionalChannels": {
+                "0": {
+                    "configPending": false,
+                    "coolingEmergencyValue": 0.0,
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "dutyCycle": false,
+                    "frostProtectionTemperature": 8.0,
+                    "functionalChannelType": "DEVICE_GLOBAL_PUMP_CONTROL",
+                    "globalPumpControl": true,
+                    "groupIndex": 0,
+                    "groups": [
+                    ],
+                    "heatingEmergencyValue": 0.25,
+                    "heatingLoadType": "LOAD_BALANCING",
+                    "heatingValveType": "NORMALLY_CLOSE",
+                    "index": 0,
+                    "label": "",
+                    "lowBat": null,
+                    "routerModuleEnabled": false,
+                    "routerModuleSupported": false,
+                    "rssiDeviceValue": -73,
+                    "rssiPeerValue": -74,
+                    "unreach": false,
+                    "valveProtectionDuration": 5,
+                    "valveProtectionSwitchingInterval": 14
+                },
+                "1": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_LOCAL_PUMP_CHANNEL",
+                    "groupIndex": 1,
+                    "groups": [],
+                    "index": 1,
+                    "label": "",
+                    "pumpFollowUpTime": 2,
+                    "pumpLeadTime": 2,
+                    "pumpProtectionDuration": 1,
+                    "pumpProtectionSwitchingInterval": 14
+                },
+                "10": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 10,
+                    "groups": [
+                    ],
+                    "index": 10,
+                    "label": ""
+                },
+                "11": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "HEAT_DEMAND_CHANNEL",
+                    "groupIndex": 0,
+                    "groups": [
+                    ],
+                    "index": 11,
+                    "label": ""
+                },
+                "12": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "DEHUMIDIFIER_DEMAND_CHANNEL",
+                    "groupIndex": 0,
+                    "groups": [
+                    ],
+                    "index": 12,
+                    "label": ""
+                },
+                "2": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 2,
+                    "groups": [
+                    ],
+                    "index": 2,
+                    "label": ""
+                },
+                "3": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 3,
+                    "groups": [
+                    ],
+                    "index": 3,
+                    "label": ""
+                },
+                "4": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 4,
+                    "groups": [
+                    ],
+                    "index": 4,
+                    "label": ""
+                },
+                "5": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 5,
+                    "groups": [
+                    ],
+                    "index": 5,
+                    "label": ""
+                },
+                "6": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 6,
+                    "groups": [
+                    ],
+                    "index": 6,
+                    "label": ""
+                },
+                "7": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 7,
+                    "groups": [
+                    ],
+                    "index": 7,
+                    "label": ""
+                },
+                "8": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 8,
+                    "groups": [
+                    ],
+                    "index": 8,
+                    "label": ""
+                },
+                "9": {
+                    "deviceId": "3014F71100000000FAL24C10",
+                    "functionalChannelType": "FLOOR_TERMINAL_BLOCK_CHANNEL",
+                    "groupIndex": 9,
+                    "groups": [
+                    ],
+                    "index": 9,
+                    "label": ""
+                }
+            },
+            "homeId": "00000000-0000-0000-0000-000000000001",
+            "id": "3014F71100000000FAL24C10",
+            "label": "Fu\u00dfbodenheizungsaktor",
+            "lastStatusUpdate": 1558461135830,
+            "liveUpdateState": "LIVE_UPDATE_NOT_SUPPORTED",
+            "manufacturerCode": 1,
+            "modelId": 280,
+            "modelType": "HmIP-FAL24-C10",
+            "oem": "eQ-3",
+            "permanentlyReachable": true,
+            "serializedGlobalTradeItemNumber": "3014F71100000000FAL24C10",
+            "type": "FLOOR_TERMINAL_BLOCK_10",
+            "updateState": "UP_TO_DATE"
+        },
         "3014F71100000000000BBL24": {
             "availableFirmwareVersion": "1.6.2",
             "firmwareVersion": "1.6.2",
@@ -69,7 +225,7 @@
             "modelType": "HmIP-BBL",
             "oem": "eQ-3",
             "permanentlyReachable": true,
-            "serializedGlobalTradeItemNumber": "3014F7110000000000000024",
+            "serializedGlobalTradeItemNumber": "3014F71100000000000BBL24",
             "type": "BRAND_BLIND",
             "updateState": "UP_TO_DATE"
         },

diff --git a/tests/test_devices.py b/tests/test_devices.py
@@ -931,6 +931,21 @@ def test_floor_terminal_block(fake_home: Home):
             "pumpProtectionDuration(1) pumpProtectionSwitchingInterval(14)"
         )
 
+        d = FloorTerminalBlock10(fake_home._connection)
+        d = fake_home.search_device_by_id("3014F71100000000FAL24C10")
+
+        assert str(d) == (
+            "HmIP-FAL24-C10 Fußbodenheizungsaktor lowbat(None) unreach(False) "
+            "rssiDeviceValue(-73) rssiPeerValue(-74) configPending(False) "
+            "dutyCycle(False) globalPumpControl(True) heatingValveType(NORMALLY_CLOSE) "
+            "heatingLoadType(LOAD_BALANCING) coolingEmergencyValue(0.0) "
+            "frostProtectionTemperature(8.0) heatingEmergencyValue(0.25) "
+            "valveProtectionDuration(5) valveProtectionSwitchingInterval(14) "
+            "pumpFollowUpTime(2) pumpLeadTime(2) pumpProtectionDuration(1) "
+            "pumpProtectionSwitchingInterval(14)"
+        )
+
+
 
 def test_key_remote_control(fake_home: Home):
     with no_ssl_verification():