smarthome/smart_brain
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

first testable db implementation for storing radiator gui values

Browse Source
This commit is contained in:
Dirk Alders 2023-01-12 12:54:31 +01:00
parent 95a9010240
commit a3e4b8839c
3 changed files with 85 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
config.py
database.db
# ---> Linux
*~

51
function/db.py Normal file
View File

@ -0,0 +1,51 @@
import sqlite3
def get_gui_radiator_data(topic):
return __storage__().get_gui_radiator_data(topic)
def set_gui_radiator_data(topic, away_mode, summer_mode, user_temperatur_setpoint):
return __storage__().store_gui_radiator_data(topic, away_mode, summer_mode, user_temperatur_setpoint)
class __storage__(object):
def __init__(self):
self.conn = sqlite3.connect("database.db")
self.c = self.conn.cursor()
with self.conn:
self.c.execute("""CREATE TABLE IF NOT EXISTS gui_radiator (
topic text PRIMARY KEY,
away_mode integer,
summer_mode integer,
user_temperatur_setpoint real
)""")
def store_gui_radiator_data(self, topic, away_mode, summer_mode, user_temperatur_setpoint):
data = [topic, away_mode, summer_mode, user_temperatur_setpoint]
try:
with self.conn:
self.c.execute(
'INSERT INTO gui_radiator VALUES (?, ?, ?, ?)', data)
except sqlite3.IntegrityError:
data = [away_mode, summer_mode, user_temperatur_setpoint]
db_data = self.get_gui_radiator_data(topic)
if db_data != data:
with self.conn:
self.c.execute(
'UPDATE gui_radiator SET away_mode = ?, summer_mode = ?, user_temperatur_setpoint = ? WHERE topic = ?', data + [topic])
def get_gui_radiator_data(self, topic):
""" returns a list [away_mode, summer_mode, user_temperatur_setpoint] or [None, None, None]"""
self.c.execute("SELECT * FROM gui_radiator WHERE topic=?", (topic, ))
data = self.c.fetchone()
if data is not None:
data = list(data)
data[1] = data[1] == 1
data[2] = data[2] == 1
return data[1:]
else:
return [None, None, None]
def __del__(self):
self.conn.close()

55
function/modules.py
View File

@ -4,6 +4,7 @@
import config
import devices
from function.db import get_gui_radiator_data, set_gui_radiator_data
from function.rooms import room_shelly
import logging
import task
@ -140,16 +141,22 @@ class radiator_function(object):
def __init__(self, mqtt_client, topic_valve, topic_gui, default_temperature):
self.default_temperature = default_temperature
self.regular_temp_setpoint = self.default_temperature
self.__away_mode__ = False
self.__summer_mode__ = False
#
self.ct = task.periodic(1, self.cyclic_task)
#
self.boost_timer = None
# device initialisation
self.heating_valve = devices.brennenstuhl_heatingvalve(mqtt_client, topic_valve)
self.gui_heating = devices.nodered_gui_radiator(mqtt_client, topic_gui)
#
self.heating_valve.set_heating_setpoint(self.default_temperature)
# db-stored data initialisation
db_data = get_gui_radiator_data(topic_gui)
self.__away_mode__ = db_data[0] or False
self.__summer_mode__ = db_data[1] or False
self.__user_temperature_setpoint__ = db_data[2] or default_temperature
if self.__away_mode__:
self.away_mode(None, None, True)
elif self.__summer_mode__:
self.summer_mode(None, None, True)
else:
self.set_heating_setpoint(None, None, self.__user_temperature_setpoint__)
# callback initialisation
self.heating_valve.add_callback(devices.brennenstuhl_heatingvalve.KEY_TEMPERATURE, None, self.gui_heating.set_temperature_mcb)
self.heating_valve.add_callback(devices.brennenstuhl_heatingvalve.KEY_HEATING_SETPOINT, None, self.get_radiator_setpoint)
#
@ -158,9 +165,8 @@ class radiator_function(object):
self.gui_heating.add_callback(devices.nodered_gui_radiator.KEY_SETPOINT_TO_DEFAULT, None, self.setpoint_to_default)
self.gui_heating.add_callback(devices.nodered_gui_radiator.KEY_AWAY, None, self.away_mode)
self.gui_heating.add_callback(devices.nodered_gui_radiator.KEY_SUMMER, None, self.summer_mode)
#
self.boost_timer = None
#
# cyclic task initialisation
self.ct = task.periodic(1, self.cyclic_task)
self.ct.run()
def cyclic_task(self, rt):
@ -170,19 +176,23 @@ class radiator_function(object):
self.boost_timer -= self.ct.cycle_time
if self.boost_timer <= 0:
self.cancel_boost()
self.heating_valve.set_heating_setpoint(self.regular_temp_setpoint)
self.heating_valve.set_heating_setpoint(self.__user_temperature_setpoint__)
self.heating_valve.logger.info('Timer expired. returning to regular temperature setpoint %.1f°C.', self.__user_temperature_setpoint__)
def cancel_boost(self, device=None, key=None, data=None):
if self.boost_timer is not None:
self.heating_valve.logger.info('Timer expired. returning to regular temperature setpoint %.1f°C.', self.regular_temp_setpoint)
self.boost_timer = None
self.gui_heating.set_timer('-')
def update_states(self, away_mode=None, summer_mode=None):
def update_states(self, away_mode=None, summer_mode=None, user_temperature_setpoint=None):
if away_mode is not None:
self.__away_mode__ = away_mode
if summer_mode is not None:
self.__summer_mode__ = summer_mode
if user_temperature_setpoint is not None:
self.__user_temperature_setpoint__ = user_temperature_setpoint
set_gui_radiator_data(self.gui_heating.topic, self.__away_mode__, self.__summer_mode__, self.__user_temperature_setpoint__)
#
self.gui_heating.set_away(self.__away_mode__)
self.gui_heating.set_summer(self.__summer_mode__)
self.gui_heating.set_enable(not self.__away_mode__ and not self.__summer_mode__)
@ -191,10 +201,10 @@ class radiator_function(object):
if value is True:
self.cancel_boost()
self.update_states(away_mode=value, summer_mode=False)
self.heating_valve.set_heating_setpoint(self.default_temperature - self.AWAY_REDUCTION)
self.heating_valve.set_heating_setpoint(self.__user_temperature_setpoint__ - self.AWAY_REDUCTION)
else:
self.update_states(away_mode=value)
self.heating_valve.set_heating_setpoint(self.default_temperature)
self.heating_valve.set_heating_setpoint(self.__user_temperature_setpoint__)
def summer_mode(self, device, key, value):
if value is True:
@ -203,7 +213,7 @@ class radiator_function(object):
self.heating_valve.set_heating_setpoint(self.SUMMER_TEMPERATURE)
else:
self.update_states(summer_mode=value)
self.heating_valve.set_heating_setpoint(self.default_temperature)
self.heating_valve.set_heating_setpoint(self.__user_temperature_setpoint__)
def boost(self, device, key, data):
if self.boost_timer is None:
@ -220,12 +230,13 @@ class radiator_function(object):
self.set_heating_setpoint(device, key, self.default_temperature)
def set_heating_setpoint(self, device, key, data):
self.heating_valve.set_heating_setpoint(data)
self.cancel_boost()
self.update_states(away_mode=False, summer_mode=False)
self.update_states(away_mode=False, summer_mode=False, user_temperature_setpoint=data)
self.heating_valve.set_heating_setpoint(data)
def get_radiator_setpoint(self, device, key, data):
self.gui_heating.set_setpoint_temperature(data)
self.update_states()
if self.boost_timer is None and not self.__away_mode__ and not self.__summer_mode__:
self.regular_temp_setpoint = data
self.update_states(user_temperature_setpoint=data)
else:
self.update_states()
self.gui_heating.set_setpoint_temperature(data)