From b2c78d71b05690c68e4e48e6bba0c7bdebf8814d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 16 Aug 2020 15:39:30 -0400 Subject: gcode: Remove "action_" commands from get_status() calls Rename printer.gcode.action_emergency_stop() to action_emergency_stop(), printer.gcode.action_respond_info() to action_respond_info(), and printer.gcode.action_respond_error() to action_raise_error() in command templates. This simplifies the get_status() interface, as returning callable functions from that interface was confusing. Signed-off-by: Kevin O'Connor --- klippy/extras/display/display.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'klippy/extras/display/display.py') diff --git a/klippy/extras/display/display.py b/klippy/extras/display/display.py index 8e47e5a1..8034d670 100644 --- a/klippy/extras/display/display.py +++ b/klippy/extras/display/display.py @@ -66,9 +66,8 @@ class DisplayGroup: template = gcode_macro.load_template(c, 'text') self.data_items.append((row, col, template)) def show(self, display, templates, eventtime): - swrap = self.data_items[0][2].create_status_wrapper(eventtime) - context = { 'printer': swrap, - 'draw_progress_bar': display.draw_progress_bar } + context = self.data_items[0][2].create_template_context(eventtime) + context['draw_progress_bar'] = display.draw_progress_bar def render(name, **kwargs): return templates[name].render(context, **kwargs) context['render'] = render -- cgit v1.2.3-70-g09d2