diff --git a/devices/__init__.py b/devices/__init__.py index 6b3a64b..d5b5a40 100644 --- a/devices/__init__.py +++ b/devices/__init__.py @@ -809,7 +809,7 @@ class brennenstuhl_heatingvalve(base): def __init__(self, mqtt_client, topic): super().__init__(mqtt_client, topic) self.mqtt_client.send(self.topic + '/' + self.TX_TOPIC, json.dumps({self.KEY_WINDOW_DETECTION: "ON", - self.KEY_CHILD_LOCK: "UNLOCK", self.KEY_VALVE_DETECTION: "ON", self.KEY_SYSTEM_MODE: "heat"})) + self.KEY_CHILD_LOCK: "UNLOCK", self.KEY_VALVE_DETECTION: "ON", self.KEY_SYSTEM_MODE: "heat", self.KEY_PRESET: "manual"})) def warning_call_condition(self): return self.get(self.KEY_BATTERY, 100) <= BATTERY_WARN_LEVEL diff --git a/function/first_floor_west.py b/function/first_floor_west.py index c88d744..d2591ef 100644 --- a/function/first_floor_west.py +++ b/function/first_floor_west.py @@ -4,8 +4,10 @@ import config import logging +from function.modules import radiator_function from function.rooms import room_shelly, room_shelly_tradfri_light + try: from config import APP_NAME as ROOT_LOGGER_NAME except ImportError: @@ -23,3 +25,10 @@ class first_floor_west_living(room_shelly): # http://shelly1l-84CCA8ACE6A1 def __init__(self, mqtt_client): super().__init__(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_GUI) + + +class first_floor_west_bath(object): + def __init__(self, mqtt_client): + # radiator valve + self.radiator_function = radiator_function(mqtt_client, config.TOPIC_FFW_BATH_RADIATOR_VALVE_ZIGBEE, + config.TOPIC_FFW_BATH_RADIATOR_VALVE_GUI, config.DEFAULT_TEMPERATURE_FFW_BATH)