From 233f50424cc2523814edaa2ce3521e86876b4ba7 Mon Sep 17 00:00:00 2001 From: Wayne Manion Date: Thu, 2 Nov 2023 12:03:01 -0500 Subject: [PATCH 1/2] config: Update generic-bigtreetech-skr-pico-v1.0.cfg (#6376) Add RP2040 internal temperature sensor Signed-off-by: Wayne Manion --- config/generic-bigtreetech-skr-pico-v1.0.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/generic-bigtreetech-skr-pico-v1.0.cfg b/config/generic-bigtreetech-skr-pico-v1.0.cfg index 06a0c9f7a80b..4dd750f5c373 100644 --- 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 From 9e765daeedb2adf7641b96882326b80aeeb70c93 Mon Sep 17 00:00:00 2001 From: Pedro Lamas Date: Wed, 1 Nov 2023 01:14:44 +0000 Subject: [PATCH 2/2] bed_screws: Reset on move error Signed-off-by: Pedro Lamas --- klippy/extras/bed_screws.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/klippy/extras/bed_screws.py b/klippy/extras/bed_screws.py index 4749d4e104ba..c34461919466 100644 --- 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)