Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
358 changes: 358 additions & 0 deletions homematicip_demo/json_data/home.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/homematicip/base/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ class DeviceType(AutoNameEnum):
DOOR_LOCK_SENSOR = auto()
ENERGY_SENSORS_INTERFACE = auto()
FLOOR_TERMINAL_BLOCK_6 = auto()
FLOOR_TERMINAL_BLOCK_8 = auto()
FLOOR_TERMINAL_BLOCK_10 = auto()
FLOOR_TERMINAL_BLOCK_12 = auto()
FULL_FLUSH_BLIND = auto()
Expand Down
1 change: 1 addition & 0 deletions src/homematicip/class_maps.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
DeviceType.FLOOR_TERMINAL_BLOCK_10: FloorTerminalBlock10,
DeviceType.FLOOR_TERMINAL_BLOCK_12: FloorTerminalBlock12,
DeviceType.FLOOR_TERMINAL_BLOCK_6: FloorTerminalBlock6,
DeviceType.FLOOR_TERMINAL_BLOCK_8: FloorTerminalBlock8,
DeviceType.FULL_FLUSH_BLIND: FullFlushBlind,
DeviceType.FULL_FLUSH_CONTACT_INTERFACE: FullFlushContactInterface,
DeviceType.FULL_FLUSH_CONTACT_INTERFACE_6: FullFlushContactInterface6,
Expand Down
5 changes: 2 additions & 3 deletions src/homematicip/device.py
Original file line number Diff line number Diff line change
Expand Up @@ -799,11 +799,9 @@ def __str__(self):
self.pumpProtectionSwitchingInterval,
)


class FloorTerminalBlock10(FloorTerminalBlock6):
"""HMIP-FAL24-C10 (Floor Heating Actuator – 10x channels, 24V)"""


class FloorTerminalBlock12(Device):
"""HMIP-FALMOT-C12 (Floor Heating Actuator – 12x channels, motorised)"""

Expand Down Expand Up @@ -861,11 +859,12 @@ async def set_minimum_floor_heating_valve_position_async(self, minimumFloorHeati
body=data,
)

class FloorTerminalBlock8(FloorTerminalBlock12):
"""HMIP-FALMOT-C8 (Floor Heating Actuator – 8x channels, 24V)"""

class WiredFloorTerminalBlock12(FloorTerminalBlock12):
"""Implementation of HmIPW-FALMOT-C12"""


class Switch(Device):
"""Generic Switch class"""

Expand Down
4 changes: 2 additions & 2 deletions test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if __name__ == "__main__":
import pytest
from homematicip import __version__
from homematicip import _version

print("HMIP Version ", __version__)
print("HMIP Version ", _version)
pytest.main(["tests", "-vv"])
4 changes: 2 additions & 2 deletions test_aio.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if __name__ == "__main__":
import pytest
from homematicip import __version__
from homematicip import _version

print("HMIP Version ", __version__)
print("HMIP Version ", _version)
pytest.main(["-vv", "tests/aio_tests/"])
16 changes: 16 additions & 0 deletions tests/test_devices.py
Original file line number Diff line number Diff line change
Expand Up @@ -1375,6 +1375,22 @@ def test_floor_terminal_block(fake_home: Home):
"pumpFollowUpTime(2) pumpLeadTime(2) pumpProtectionDuration(1) "
"pumpProtectionSwitchingInterval(14)"
)

d = FloorTerminalBlock8(fake_home._connection)
d = fake_home.search_device_by_id("3014F7110000000000000040")
assert d.minimumFloorHeatingValvePosition == 0.0
d.set_minimum_floor_heating_valve_position(0.2)
fake_home.get_current_state()
d = fake_home.search_device_by_id("3014F7110000000000000040")
assert d.minimumFloorHeatingValvePosition == 0.2
assert str(d) == (
"HmIP-FALMOT-C8 Floor heating controller - 8 channels, motorised lowBat(None) unreach(False) "
"rssiDeviceValue(-73) rssiPeerValue(-61) configPending(False) dutyCycle(False) "
"minimumFloorHeatingValvePosition(0.2) "
"pulseWidthModulationAtLowFloorHeatingValvePositionEnabled(False) coolingEmergencyValue(0.0) "
"frostProtectionTemperature(8.0) valveProtectionDuration(5) valveProtectionSwitchingInterval(14)"
)

d = FloorTerminalBlock12(fake_home._connection)
d = fake_home.search_device_by_id("3014F7110000000000000049")
assert d.minimumFloorHeatingValvePosition == 0.0
Expand Down