gcode: "gcode_position" and toolhead "position" as get_status() named tuple

Add "gcode_position" named tuple to gcode.get_status(). Add a
"position" named tuple to toolhead.get_status().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-05-28 17:40:19 -04:00 committed by KevinOConnor
parent 4ccc218b06
commit 6e88320d62
3 changed files with 6 additions and 2 deletions

View File

@ -144,6 +144,7 @@ class GCodeParser:
'homing_xpos': self.homing_position[0],
'homing_ypos': self.homing_position[1],
'homing_zpos': self.homing_position[2],
'gcode_position': homing.Coord(*move_position),
'action_respond_info': self._action_respond_info,
'action_respond_error': self._action_respond_error,
'action_emergency_stop': self._action_emergency_stop,

View File

@ -1,9 +1,9 @@
# Code for state tracking during homing operations
#
# Copyright (C) 2016,2017 Kevin O'Connor <kevin@koconnor.net>
# Copyright (C) 2016-2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, math
import logging, math, collections
HOMING_STEP_DELAY = 0.00000025
HOMING_START_DELAY = 0.001
@ -152,3 +152,5 @@ class EndstopError(Exception):
def EndstopMoveError(pos, msg="Move out of range"):
return EndstopError("%s: %.3f %.3f %.3f [%.3f]" % (
msg, pos[0], pos[1], pos[2], pos[3]))
Coord = collections.namedtuple('Coord', ('x', 'y', 'z', 'e'))

View File

@ -417,6 +417,7 @@ class ToolHead:
status = "Ready"
return { 'status': status, 'print_time': print_time,
'estimated_print_time': estimated_print_time,
'position': homing.Coord(*self.commanded_pos),
'printing_time': print_time - last_print_start_time }
def _handle_request_restart(self, print_time):
self.motor_off()