Merge branch 'master' of https://github.com/Klipper3d/klipper

LynxCrew · Nov 3, 2023 · 5fb3117 · 5fb3117
2 parents d2512e9 + 9e765da
commit 5fb3117
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/config/generic-bigtreetech-skr-pico-v1.0.cfg b/config/generic-bigtreetech-skr-pico-v1.0.cfg
@@ -106,6 +106,9 @@ pin: gpio18
 [heater_fan controller_fan]
 pin: gpio20
 
+[temperature_sensor pico]
+sensor_type: temperature_mcu
+
 [mcu]
 serial: /dev/serial/by-id/usb-Klipper_Klipper_firmware_12345-if00
 

diff --git a/klippy/extras/bed_screws.py b/klippy/extras/bed_screws.py
@@ -42,7 +42,12 @@ def reset(self):
         self.current_screw = 0
         self.accepted_screws = 0
     def move(self, coord, speed):
-        self.printer.lookup_object('toolhead').manual_move(coord, speed)
+        try:
+            self.printer.lookup_object('toolhead').manual_move(coord, speed)
+        except self.printer.command_error as e:
+            self.unregister_commands()
+            self.reset()
+            raise
     def move_to_screw(self, state, screw):
         # Move up, over, and then down
         self.move((None, None, self.horizontal_move_z), self.lift_speed)