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/menu.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'klippy/extras/display/menu.py') diff --git a/klippy/extras/display/menu.py b/klippy/extras/display/menu.py index ae9209d1..3849eae2 100644 --- a/klippy/extras/display/menu.py +++ b/klippy/extras/display/menu.py @@ -7,7 +7,6 @@ import os, logging from string import Template from . import menu_keys -from .. import gcode_macro class sentinel: @@ -722,13 +721,11 @@ class MenuManager: def update_context(self, eventtime): # menu default jinja2 context - self.context = { - 'printer': gcode_macro.GetStatusWrapper(self.printer, eventtime), - 'menu': { - 'eventtime': eventtime, - 'back': self._action_back, - 'exit': self._action_exit - } + self.context = self.gcode_macro.create_template_context(eventtime) + self.context['menu'] = { + 'eventtime': eventtime, + 'back': self._action_back, + 'exit': self._action_exit } def stack_push(self, container): -- cgit v1.2.3-70-g09d2