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

paneldue: multi-extruder fixes 

Sort heater response so that the bed is displayed first, followed
by extruders in ascending order.  Set inactive extruders to
"standby" if they are on rather than "active".

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-12-08 19:31:41 -05:00
parent f5f87bf08c
commit 54abd27486
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moonraker/components/paneldue.py
View File

@ -306,16 +306,19 @@ class PanelDue:
sub_args = {k: None for k in self.printer_state.keys()} sub_args = {k: None for k in self.printer_state.keys()}
self.extruder_count = 0 self.extruder_count = 0
self.heaters = [] self.heaters = []
extruders = []
for cfg in config: for cfg in config:
if cfg.startswith("extruder"): if cfg.startswith("extruder"):
self.extruder_count += 1 self.extruder_count += 1
self.printer_state[cfg] = {} self.printer_state[cfg] = {}
self.heaters.append(cfg) extruders.append(cfg)
sub_args[cfg] = None sub_args[cfg] = None
elif cfg == "heater_bed": elif cfg == "heater_bed":
self.printer_state[cfg] = {} self.printer_state[cfg] = {}
self.heaters.append(cfg) self.heaters.append(cfg)
sub_args[cfg] = None sub_args[cfg] = None
extruders.sort()
self.heaters.extend(extruders)
try: try:
status: Dict[str, Any] status: Dict[str, Any]
status = await self.klippy_apis.subscribe_objects(sub_args) status = await self.klippy_apis.subscribe_objects(sub_args)
@ -680,10 +683,10 @@ class PanelDue:
if fan_speed is not None: if fan_speed is not None:
response['fanPercent'] = [round(fan_speed * 100, 1)] response['fanPercent'] = [round(fan_speed * 100, 1)]
extruder_name: str = ""
if self.extruder_count > 0: if self.extruder_count > 0:
extruder_name: Optional[str] extruder_name = p_state['toolhead'].get('extruder', "")
extruder_name = p_state['toolhead'].get('extruder') if extruder_name:
if extruder_name is not None:
tool = 0 tool = 0
if extruder_name != "extruder": if extruder_name != "extruder":
tool = int(extruder_name[-1]) tool = int(extruder_name[-1])
@ -699,10 +702,13 @@ class PanelDue:
response.setdefault('heaters', []).append(temp) response.setdefault('heaters', []).append(temp)
response.setdefault('active', []).append(target) response.setdefault('active', []).append(target)
response.setdefault('standby', []).append(target) response.setdefault('standby', []).append(target)
response.setdefault('hstat', []).append(2 if target else 0)
if name.startswith('extruder'): if name.startswith('extruder'):
a_stat = 2 if name == extruder_name else 1
response.setdefault('hstat', []).append(a_stat if target else 0)
response.setdefault('efactor', []).append(efactor) response.setdefault('efactor', []).append(efactor)
response.setdefault('extr', []).append(round(pos[3], 2)) response.setdefault('extr', []).append(round(pos[3], 2))
else:
response.setdefault('hstat', []).append(2 if target else 0)
# Display message (via M117) # Display message (via M117)
msg: str = p_state['display_status'].get('message', "") msg: str = p_state['display_status'].get('message', "")