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 <kevin@koconnor.net>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -137,21 +137,21 @@ type: command
|
||||
enable: {printer.idle_timeout.state == "Printing"}
|
||||
name: Pause printing
|
||||
gcode:
|
||||
{printer.gcode.action_respond_info('action:pause')}
|
||||
{action_respond_info('action:pause')}
|
||||
|
||||
[menu __main __octoprint __resume]
|
||||
type: command
|
||||
enable: {not printer.idle_timeout.state == "Printing"}
|
||||
name: Resume printing
|
||||
gcode:
|
||||
{printer.gcode.action_respond_info('action:resume')}
|
||||
{action_respond_info('action:resume')}
|
||||
|
||||
[menu __main __octoprint __abort]
|
||||
type: command
|
||||
enable: {printer.idle_timeout.state == "Printing"}
|
||||
name: Abort printing
|
||||
gcode:
|
||||
{printer.gcode.action_respond_info('action:cancel')}
|
||||
{action_respond_info('action:cancel')}
|
||||
|
||||
### menu virtual sdcard ###
|
||||
[menu __main __sdcard]
|
||||
@@ -720,8 +720,9 @@ name: Dump parameters
|
||||
gcode:
|
||||
{% for name1 in printer %}
|
||||
{% for name2 in printer[name1] %}
|
||||
{ printer.gcode.action_respond_info("printer['%s'].%s = %s" % (name1, name2, printer[name1][name2])) }
|
||||
{ action_respond_info("printer['%s'].%s = %s"
|
||||
% (name1, name2, printer[name1][name2])) }
|
||||
{% else %}
|
||||
{ printer.gcode.action_respond_info("printer['%s'] = %s" % (name1, printer[name1])) }
|
||||
{ action_respond_info("printer['%s'] = %s" % (name1, printer[name1])) }
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user