diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-04-24 22:49:13 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-05-05 11:08:11 -0400 |
| commit | 12b20c6e77bb597f89a3b1df8e00da352c4bbbc5 (patch) | |
| tree | 0294b3c1fcda6cb2ca38563e216365410886d211 /klippy/extras/safe_z_home.py | |
| parent | 947569d347fdc3a242444cc1c87b5e6e49506ded (diff) | |
| download | kutter-12b20c6e77bb597f89a3b1df8e00da352c4bbbc5.tar.gz kutter-12b20c6e77bb597f89a3b1df8e00da352c4bbbc5.tar.xz kutter-12b20c6e77bb597f89a3b1df8e00da352c4bbbc5.zip | |
safe_z_home: Use new GCodeCommand wrappers
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/safe_z_home.py')
| -rw-r--r-- | klippy/extras/safe_z_home.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/klippy/extras/safe_z_home.py b/klippy/extras/safe_z_home.py index 265cbf41..eaaee965 100644 --- a/klippy/extras/safe_z_home.py +++ b/klippy/extras/safe_z_home.py @@ -28,7 +28,7 @@ class SafeZHoming: raise config.error("homing_override and safe_z_homing cannot" +" be used simultaneously") - def cmd_G28(self, params): + def cmd_G28(self, gcmd): toolhead = self.printer.lookup_object('toolhead') # Perform Z Hop if necessary @@ -40,10 +40,9 @@ class SafeZHoming: if 'z' in kin_status['homed_axes']: # Check if the zhop would exceed the printer limits if pos[2] + self.z_hop > self.max_z: - self.gcode.respond_info( + gcmd.respond_info( "No zhop performed, target Z out of bounds: " + - str(pos[2] + self.z_hop) - ) + str(pos[2] + self.z_hop)) elif pos[2] < self.z_hop: self._perform_z_hop(pos) else: @@ -52,7 +51,8 @@ class SafeZHoming: toolhead.get_kinematics().note_z_not_homed() # Determine which axes we need to home - need_x, need_y, need_z = [axis in params for axis in "XYZ"] + need_x, need_y, need_z = [gcmd.get(axis, None) is not None + for axis in "XYZ"] if not need_x and not need_y and not need_z: need_x = need_y = need_z = True |