yohan/docker-thermostat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continue Flask migration.

Browse Source
This commit is contained in:
yohan 2024-06-02 15:40:23 +02:00
parent 90d8f45b77
commit 846d1b31b5
1 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
thermostat.py
View File

@ -254,87 +254,87 @@ def thermostat_loop():
today_awake_time = current_date.replace(hour=int(awake_hour.split(':')[0]), minute=int(awake_hour.split(':')[1]), second=0, microsecond=0) today_awake_time = current_date.replace(hour=int(awake_hour.split(':')[0]), minute=int(awake_hour.split(':')[1]), second=0, microsecond=0)
today_sleep_time = current_date.replace(hour=int(sleep_hour.split(':')[0]), minute=int(sleep_hour.split(':')[1]), second=0, microsecond=0) today_sleep_time = current_date.replace(hour=int(sleep_hour.split(':')[0]), minute=int(sleep_hour.split(':')[1]), second=0, microsecond=0)
forced_mode = get_forced_mode() forced_mode = get_forced_mode()
# if forced_mode is not None and forced_mode in targets: if forced_mode is not None and forced_mode in targets:
# if target_name != forced_mode: if target_name != forced_mode:
# target_name = forced_mode target_name = forced_mode
# logging.info("Switch to "+forced_mode) logging.info("Switch to "+forced_mode)
# else: else:
# if forced_mode == "long_absence": if forced_mode == "long_absence":
# if target_name != "target_frost_protection" or first_loop: if target_name != "target_frost_protection" or first_loop:
# target_name = "target_frost_protection" target_name = "target_frost_protection"
# logging.info("Switch to "+target_name) logging.info("Switch to "+target_name)
# elif forced_mode == "short_absence" or first_loop: elif forced_mode == "short_absence" or first_loop:
# if target_name != "target_sleep_temperature": if target_name != "target_sleep_temperature":
# target_name = "target_sleep_temperature" target_name = "target_sleep_temperature"
# logging.info("Switch to "+target_name) logging.info("Switch to "+target_name)
# elif current_date > today_awake_time and current_date < today_sleep_time: elif current_date > today_awake_time and current_date < today_sleep_time:
# if target_name != "target_unconfirmed_awake_temperature" and target_name != "target_awake_temperature": if target_name != "target_unconfirmed_awake_temperature" and target_name != "target_awake_temperature":
# target_name = "target_unconfirmed_awake_temperature" target_name = "target_unconfirmed_awake_temperature"
# logging.info("Switch to unconfirmed awake mode.") logging.info("Switch to unconfirmed awake mode.")
# elif current_date < today_awake_time or current_date > today_sleep_time: elif current_date < today_awake_time or current_date > today_sleep_time:
# if target_name != "target_unconfirmed_sleep_temperature" and target_name != "target_sleep_temperature": if target_name != "target_unconfirmed_sleep_temperature" and target_name != "target_sleep_temperature":
# target_name = "target_unconfirmed_sleep_temperature" target_name = "target_unconfirmed_sleep_temperature"
# logging.info("Switch to unconfirmed sleep mode.") logging.info("Switch to unconfirmed sleep mode.")
#
# first_loop = False first_loop = False
#
# # Load shedder # Load shedder
# current_load = get_metric("Modane_elec_main_power", current_time, load_shedder_interval) current_load = get_metric("Modane_elec_main_power", current_time, load_shedder_interval)
# if current_load is None: if current_load is None:
# time.sleep(load_shedder_interval) time.sleep(load_shedder_interval)
# continue continue
# elif max_load - current_load < load_margin: elif max_load - current_load < load_margin:
# logging.warning("Load too high: "+str(current_load)+"VA") logging.warning("Load too high: "+str(current_load)+"VA")
# total_shedded = 0 total_shedded = 0
# for room in shedding_order: for room in shedding_order:
# current_state = relay_state(rooms_settings[room]["relays"]) current_state = relay_state(rooms_settings[room]["relays"])
# if current_state != "Failed": if current_state != "Failed":
# logging.debug("Got relay_state: '"+current_state+"'") logging.debug("Got relay_state: '"+current_state+"'")
# if current_state == "1": if current_state == "1":
# result = set_relay(rooms_settings[room]["relays"], "off") result = set_relay(rooms_settings[room]["relays"], "off")
# if result == "OK": if result == "OK":
# total_shedded += relays_load[rooms_settings[room]["relays"]] total_shedded += relays_load[rooms_settings[room]["relays"]]
# if max_load - current_load - total_shedded < load_margin: if max_load - current_load - total_shedded < load_margin:
# logging.info("Load should be back to normal.") logging.info("Load should be back to normal.")
# break break
#
# # Thermostat # Thermostat
# if last_control_time is None or current_time - last_control_time > relay_control_interval: if last_control_time is None or current_time - last_control_time > relay_control_interval:
# last_control_time = current_time last_control_time = current_time
# for room in rooms_settings: for room in rooms_settings:
# if not rooms_settings[room]["enabled"]: if not rooms_settings[room]["enabled"]:
# continue continue
# target = rooms_settings[room][target_name] target = rooms_settings[room][target_name]
# logging.debug("Target: "+str(target)) logging.debug("Target: "+str(target))
# temperature = get_metric(rooms_settings[room]["metric"], current_time, relay_control_interval) temperature = get_metric(rooms_settings[room]["metric"], current_time, relay_control_interval)
# if temperature is None: if temperature is None:
# continue continue
# logging.debug(room+": "+str(temperature)) logging.debug(room+": "+str(temperature))
# current_state = relay_state(rooms_settings[room]["relays"]) current_state = relay_state(rooms_settings[room]["relays"])
# if current_state != "Failed": if current_state != "Failed":
# logging.debug("Got relay_state: '"+current_state+"'") logging.debug("Got relay_state: '"+current_state+"'")
# if temperature < target - hysteresis: if temperature < target - hysteresis:
# if current_state == "0": if current_state == "0":
# logging.info(room+": Target temperature is "+str(target)) logging.info(room+": Target temperature is "+str(target))
# logging.info(room+": Current temperature is "+str(temperature)) logging.info(room+": Current temperature is "+str(temperature))
# if current_load + relays_load[rooms_settings[room]["relays"]] + load_margin > max_load: if current_load + relays_load[rooms_settings[room]["relays"]] + load_margin > max_load:
# logging.warning(room+": Load too high cannot start heaters.") logging.warning(room+": Load too high cannot start heaters.")
# else: else:
# logging.info(room+": Starting heaters.") logging.info(room+": Starting heaters.")
# set_relay(rooms_settings[room]["relays"], "on") # set_relay(rooms_settings[room]["relays"], "on")
# sys.stdout.flush() sys.stdout.flush()
# else: else:
# logging.debug("Relay already on.") logging.debug("Relay already on.")
#
# elif temperature > target + hysteresis: elif temperature > target + hysteresis:
# if current_state == "1": if current_state == "1":
# logging.info(room+": Target temperature is "+str(target)) logging.info(room+": Target temperature is "+str(target))
# logging.info(room+": Current temperature is "+str(temperature)) logging.info(room+": Current temperature is "+str(temperature))
# logging.info(room+": Stopping heaters.") logging.info(room+": Stopping heaters.")
# sys.stdout.flush() sys.stdout.flush()
# set_relay(rooms_settings[room]["relays"], "off") # set_relay(rooms_settings[room]["relays"], "off")
# else: else:
# logging.debug("Relay already off.") logging.debug("Relay already off.")
time.sleep(load_shedder_interval) time.sleep(load_shedder_interval)
t1 = Thread(target=thermostat_loop) t1 = Thread(target=thermostat_loop)