Browse Source

ffw/bath radiator valve implemented

tags/v1.0.0
Dirk Alders 2 years ago
parent
commit
fd8d008597
2 changed files with 10 additions and 1 deletions
  1. 1
    1
      devices/__init__.py
  2. 9
    0
      function/first_floor_west.py

+ 1
- 1
devices/__init__.py View File

809
     def __init__(self, mqtt_client, topic):
809
     def __init__(self, mqtt_client, topic):
810
         super().__init__(mqtt_client, topic)
810
         super().__init__(mqtt_client, topic)
811
         self.mqtt_client.send(self.topic + '/' + self.TX_TOPIC, json.dumps({self.KEY_WINDOW_DETECTION: "ON",
811
         self.mqtt_client.send(self.topic + '/' + self.TX_TOPIC, json.dumps({self.KEY_WINDOW_DETECTION: "ON",
812
-                              self.KEY_CHILD_LOCK: "UNLOCK", self.KEY_VALVE_DETECTION: "ON", self.KEY_SYSTEM_MODE: "heat"}))
812
+                              self.KEY_CHILD_LOCK: "UNLOCK", self.KEY_VALVE_DETECTION: "ON", self.KEY_SYSTEM_MODE: "heat", self.KEY_PRESET: "manual"}))
813
 
813
 
814
     def warning_call_condition(self):
814
     def warning_call_condition(self):
815
         return self.get(self.KEY_BATTERY, 100) <= BATTERY_WARN_LEVEL
815
         return self.get(self.KEY_BATTERY, 100) <= BATTERY_WARN_LEVEL

+ 9
- 0
function/first_floor_west.py View File

4
 
4
 
5
 import config
5
 import config
6
 import logging
6
 import logging
7
+from function.modules import radiator_function
7
 from function.rooms import room_shelly, room_shelly_tradfri_light
8
 from function.rooms import room_shelly, room_shelly_tradfri_light
8
 
9
 
10
+
9
 try:
11
 try:
10
     from config import APP_NAME as ROOT_LOGGER_NAME
12
     from config import APP_NAME as ROOT_LOGGER_NAME
11
 except ImportError:
13
 except ImportError:
23
     # http://shelly1l-84CCA8ACE6A1
25
     # http://shelly1l-84CCA8ACE6A1
24
     def __init__(self, mqtt_client):
26
     def __init__(self, mqtt_client):
25
         super().__init__(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_GUI)
27
         super().__init__(mqtt_client, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_SHELLY, config.TOPIC_FFW_LIVINGROOM_MAIN_LIGHT_GUI)
28
+
29
+
30
+class first_floor_west_bath(object):
31
+    def __init__(self, mqtt_client):
32
+        # radiator valve
33
+        self.radiator_function = radiator_function(mqtt_client, config.TOPIC_FFW_BATH_RADIATOR_VALVE_ZIGBEE,
34
+                                                   config.TOPIC_FFW_BATH_RADIATOR_VALVE_GUI, config.DEFAULT_TEMPERATURE_FFW_BATH)

Loading…
Cancel
Save