Auto: Loft temperature threshold

[home-hw.git] / auto / burrow-auto

diff --git a/auto/burrow-auto b/auto/burrow-auto
index ce81f4a8c88262ac48657b1c37787332ec8d9fc2..1f3b1ed04072fa47802fa29ed1ed73d2c0fd99e6 100755 (executable)
--- a/auto/burrow-auto
+++ b/auto/burrow-auto
@@ -132,26 +132,26 @@ st = State()
 
 def auto_loft_fan():
     global st
-    lt = st.get_sensor("temp/loft")
-    lt_high = st.hysteresis('lt_high', lt, 29, 30)
-    lt_mid = st.hysteresis('lt_mid', lt, 24, 25)
-    if lt_high > 0:
+    lt = st.get_sensor_avg("temp/loft")
+    out = st.get_sensor_avg('air/outside-intake')
+
+    if lt is None or out is None:
+        fs = 0
+    elif st.hysteresis('lf_out_cold', out, 5, 6) < 0:
+        fs = 0
+    elif st.hysteresis('lf_out_cool', out, 14, 15) < 0:
+        if st.min in range(10, 15):
+            fs = 2
+        else:
+            fs = 0
+    elif ac_is_on() > 0:
         fs = 3
-    elif lt_mid > 0:
-        if st.hour in range(10, 20):
+    elif st.hysteresis('lf_loft_hot', lt, 25, 26) > 0:
+        if st.hysteresis('lf_loft_hotter_than_out', lt, out - 1, out + 1) > 0:
             fs = 3
         else:
             fs = 1
-    else:
-        if st.hour in range(8, 22):
-            if st.min % 30 in range(0, 5):
-                fs = 3
-            else:
-                fs = 0
-        else:
-            fs = 0
-    # FIXME: Disabled for now
-    fs = 0
+
     st.set("loft/fan", fs)
 
 
@@ -220,7 +220,7 @@ def auto_aircon():
     tii = st.get_sensor_avg('air/inside-intake')
     tie = st.get_sensor_avg('air/inside-exhaust')
     house_hot = st.hysteresis('ac_house_hot', tii, 23.5, 24)
-    outside_hot = st.hysteresis('ac_outside_hot', tie, 20, 21)
+    outside_hot = st.hysteresis('ac_outside_hot', tie, 24, 25)
     ac_on = ac_is_on()
 
     if house_hot > 0 and outside_hot > 0:
@@ -230,9 +230,10 @@ def auto_aircon():
 
     if not hasattr(st, 'last_ac_change'):
         st.last_ac_change = st.now
+    need_wait = st.last_ac_change + 300 - st.now    # FIXME: Increase
 
-    if st.last_ac_change >= st.now - 300:       # FIXME: Increase
-        action = f"wait({st.now - st.last_ac_change})"
+    if need_wait > 0:
+        action = f"wait({need_wait:.0f})"
     elif ac_on == 0:
         action = "need-data"
     elif ac_on != want_ac: