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

temperature_store: correctly handle subscribed diffs 

When processing a status update, default the temperature and target to the last received value.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-08-29 14:12:23 -04:00
parent 9613bb01de
commit 16269c1a49
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moonraker/plugins/temperature_store.py
View File

@ -58,6 +58,8 @@ class TemperatureStore:
new_store[sensor] = { new_store[sensor] = {
'temperatures': deque(maxlen=TEMPERATURE_STORE_SIZE), 'temperatures': deque(maxlen=TEMPERATURE_STORE_SIZE),
'targets': deque(maxlen=TEMPERATURE_STORE_SIZE)} 'targets': deque(maxlen=TEMPERATURE_STORE_SIZE)}
if sensor not in self.last_temps:
self.last_temps[sensor] = (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()):
@ -75,10 +77,10 @@ class TemperatureStore:
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 = self.last_temps[sensor]
self.last_temps[sensor] = ( self.last_temps[sensor] = (
round(data[sensor].get('temperature', 0.), 2), round(data[sensor].get('temperature', last_temp), 2),
data[sensor].get('target', 0.)) data[sensor].get('target', last_target))
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