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

bed_mesh: cache mesh status 

Prevent calls to `get_status()` from creating a new
status dict on each request.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-06-16 20:09:56 -04:00 committed by KevinOConnor
parent 55d1c3728d
commit 78454dd3b1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
klippy/extras/bed_mesh.py
View File

@ -124,6 +124,8 @@ class BedMesh:
# Register transform # Register transform
gcode_move = self.printer.load_object(config, 'gcode_move') gcode_move = self.printer.load_object(config, 'gcode_move')
gcode_move.set_move_transform(self) gcode_move.set_move_transform(self)
# initialize status dict
self.update_status()
def handle_connect(self): def handle_connect(self):
self.toolhead = self.printer.lookup_object('toolhead') self.toolhead = self.printer.lookup_object('toolhead')
self.bmc.print_generated_points(logging.info) self.bmc.print_generated_points(logging.info)
@ -162,6 +164,7 @@ class BedMesh:
# cache the current position before a transform takes place # cache the current position before a transform takes place
gcode_move = self.printer.lookup_object('gcode_move') gcode_move = self.printer.lookup_object('gcode_move')
gcode_move.reset_last_position() gcode_move.reset_last_position()
self.update_status()
def get_z_factor(self, z_pos): def get_z_factor(self, z_pos):
if z_pos >= self.fade_end: if z_pos >= self.fade_end:
return 0. return 0.
@ -216,7 +219,9 @@ class BedMesh:
"Mesh Leveling: Error splitting move ") "Mesh Leveling: Error splitting move ")
self.last_position[:] = newpos self.last_position[:] = newpos
def get_status(self, eventtime=None): def get_status(self, eventtime=None):
status = { return self.status
def update_status(self):
self.status = {
"profile_name": "", "profile_name": "",
"mesh_min": (0., 0.), "mesh_min": (0., 0.),
"mesh_max": (0., 0.), "mesh_max": (0., 0.),
@ -230,12 +235,11 @@ class BedMesh:
mesh_max = (params['max_x'], params['max_y']) mesh_max = (params['max_x'], params['max_y'])
probed_matrix = self.z_mesh.get_probed_matrix() probed_matrix = self.z_mesh.get_probed_matrix()
mesh_matrix = self.z_mesh.get_mesh_matrix() mesh_matrix = self.z_mesh.get_mesh_matrix()
status['profile_name'] = self.pmgr.get_current_profile() self.status['profile_name'] = self.pmgr.get_current_profile()
status['mesh_min'] = mesh_min self.status['mesh_min'] = mesh_min
status['mesh_max'] = mesh_max self.status['mesh_max'] = mesh_max
status['probed_matrix'] = probed_matrix self.status['probed_matrix'] = probed_matrix
status['mesh_matrix'] = mesh_matrix self.status['mesh_matrix'] = mesh_matrix
return status
def get_mesh(self): def get_mesh(self):
return self.z_mesh return self.z_mesh
cmd_BED_MESH_OUTPUT_help = "Retrieve interpolated grid of probed z-points" cmd_BED_MESH_OUTPUT_help = "Retrieve interpolated grid of probed z-points"
@ -1180,6 +1184,7 @@ class ProfileManager:
profile['mesh_params'] = collections.OrderedDict(mesh_params) profile['mesh_params'] = collections.OrderedDict(mesh_params)
self.profiles = profiles self.profiles = profiles
self.current_profile = prof_name self.current_profile = prof_name
self.bedmesh.update_status()
self.gcode.respond_info( self.gcode.respond_info(
"Bed Mesh state has been saved to profile [%s]\n" "Bed Mesh state has been saved to profile [%s]\n"
"for the current session. The SAVE_CONFIG command will\n" "for the current session. The SAVE_CONFIG command will\n"
@ -1206,6 +1211,7 @@ class ProfileManager:
profiles = dict(self.profiles) profiles = dict(self.profiles)
del profiles[prof_name] del profiles[prof_name]
self.profiles = profiles self.profiles = profiles
self.bedmesh.update_status()
self.gcode.respond_info( self.gcode.respond_info(
"Profile [%s] removed from storage for this session.\n" "Profile [%s] removed from storage for this session.\n"
"The SAVE_CONFIG command will update the printer\n" "The SAVE_CONFIG command will update the printer\n"