3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data_store: store fan speed for temperature fans 

Refactor the the temperature store to only store fields available to a sensor.

Signed-off-by: Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-01-31 05:51:07 -05:00
parent 39334d1098
commit 980912270e
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
moonraker/plugins/data_store.py
View File

@ -61,15 +61,18 @@ class DataStore:
logging.info(f"Configuring available sensors: {sensors}") logging.info(f"Configuring available sensors: {sensors}")
new_store = {} new_store = {}
for sensor in sensors: for sensor in sensors:
fields = list(status.get(sensor, {}).keys())
if sensor in self.temperature_store: if sensor in self.temperature_store:
new_store[sensor] = self.temperature_store[sensor] new_store[sensor] = self.temperature_store[sensor]
else: else:
new_store[sensor] = { new_store[sensor] = {
'temperatures': deque(maxlen=TEMPERATURE_STORE_SIZE), 'temperatures': deque(maxlen=TEMPERATURE_STORE_SIZE)}
'targets': deque(maxlen=TEMPERATURE_STORE_SIZE), for item in ["target", "power", "speed"]:
'powers': deque(maxlen=TEMPERATURE_STORE_SIZE)} if item in fields:
new_store[sensor][f"{item}s"] = deque(
maxlen=TEMPERATURE_STORE_SIZE)
if sensor not in self.last_temps: if sensor not in self.last_temps:
self.last_temps[sensor] = (0., 0., 0.) self.last_temps[sensor] = (0., 0., 0., 0.)
self.temperature_store = new_store self.temperature_store = new_store
# Prune unconfigured sensors in self.last_temps # Prune unconfigured sensors in self.last_temps
for sensor in list(self.last_temps.keys()): for sensor in list(self.last_temps.keys()):
@ -87,19 +90,21 @@ class DataStore:
def _set_current_temps(self, data): def _set_current_temps(self, data):
for sensor in self.temperature_store: for sensor in self.temperature_store:
if sensor in data: if sensor in data:
last_temp, last_target, last_power = self.last_temps[sensor] last_val = self.last_temps[sensor]
self.last_temps[sensor] = ( self.last_temps[sensor] = (
round(data[sensor].get('temperature', last_temp), 2), round(data[sensor].get('temperature', last_val[0]), 2),
data[sensor].get('target', last_target), data[sensor].get('target', last_val[1]),
data[sensor].get('power', last_power)) data[sensor].get('power', last_val[2]),
data[sensor].get('speed', last_val[3]))
def _update_temperature_store(self): def _update_temperature_store(self):
# XXX - If klippy is not connected, set values to zero # XXX - If klippy is not connected, set values to zero
# as they are unknown? # as they are unknown?
for sensor, (temp, target, power) in self.last_temps.items(): for sensor, vals in self.last_temps.items():
self.temperature_store[sensor]['temperatures'].append(temp) self.temperature_store[sensor]['temperatures'].append(vals[0])
self.temperature_store[sensor]['targets'].append(target) for val, item in zip(vals[1:], ["targets", "powers", "speeds"]):
self.temperature_store[sensor]['powers'].append(power) if item in self.temperature_store[sensor]:
self.temperature_store[sensor][item].append(val)
async def _handle_temp_store_request(self, web_request): async def _handle_temp_store_request(self, web_request):
store = {} store = {}