Revert "Boiler and pump relays are inverted"
This reverts commit 875fad565e.
This commit is contained in:
+7
-11
@@ -117,9 +117,8 @@ def check_temperatures():
|
|||||||
# and turn off the boiler of course
|
# and turn off the boiler of course
|
||||||
for c in contours:
|
for c in contours:
|
||||||
mqtt_client.publish(c.out_topic, "1", retain=True)
|
mqtt_client.publish(c.out_topic, "1", retain=True)
|
||||||
# boiler and pump relays are inverted in fact
|
mqtt_client.publish(boiler_control, "0", retain=True)
|
||||||
mqtt_client.publish(boiler_control, "1", retain=True)
|
mqtt_client.publish(pump_control, "1", retain=True)
|
||||||
mqtt_client.publish(pump_control, "0", retain=True)
|
|
||||||
return
|
return
|
||||||
#
|
#
|
||||||
sum_t = 0
|
sum_t = 0
|
||||||
@@ -134,10 +133,8 @@ def check_temperatures():
|
|||||||
logger.error("No temperatures available, switch to full-on mode")
|
logger.error("No temperatures available, switch to full-on mode")
|
||||||
for c in contours:
|
for c in contours:
|
||||||
mqtt_client.publish(c.out_topic, "1", retain=True)
|
mqtt_client.publish(c.out_topic, "1", retain=True)
|
||||||
# boiler and pump relays are inverted in fact
|
# turn on boiler
|
||||||
# turn on boiler and pump
|
mqtt_client.publish(boiler_control, "1", retain=True)
|
||||||
mqtt_client.publish(boiler_control, "0", retain=True)
|
|
||||||
mqtt_client.publish(pump_control, "0", retain=True)
|
|
||||||
return
|
return
|
||||||
|
|
||||||
for c in contours:
|
for c in contours:
|
||||||
@@ -173,13 +170,12 @@ def check_temperatures():
|
|||||||
any_opened_start = time.time()
|
any_opened_start = time.time()
|
||||||
|
|
||||||
logger.debug("Any opened: " + str(any_opened) + " aos " + str(any_opened_start) + " time " + str(time.time()))
|
logger.debug("Any opened: " + str(any_opened) + " aos " + str(any_opened_start) + " time " + str(time.time()))
|
||||||
# boiler and pump relays are inverted in fact
|
|
||||||
if any_opened and time.time() - any_opened_start > BOILER_TURN_ON_AFTER:
|
if any_opened and time.time() - any_opened_start > BOILER_TURN_ON_AFTER:
|
||||||
mqtt_client.publish(boiler_control, "0", retain=True)
|
|
||||||
mqtt_client.publish(pump_control, "0", retain=True)
|
|
||||||
else:
|
|
||||||
mqtt_client.publish(boiler_control, "1", retain=True)
|
mqtt_client.publish(boiler_control, "1", retain=True)
|
||||||
mqtt_client.publish(pump_control, "1", retain=True)
|
mqtt_client.publish(pump_control, "1", retain=True)
|
||||||
|
else:
|
||||||
|
mqtt_client.publish(boiler_control, "0", retain=True)
|
||||||
|
mqtt_client.publish(pump_control, "0", retain=True)
|
||||||
|
|
||||||
def main_cycle():
|
def main_cycle():
|
||||||
"""Main 5-second cycle"""
|
"""Main 5-second cycle"""
|
||||||
|
|||||||
Reference in New Issue
Block a user