From 10e1fa867bab7af21a1fcb0744fc5cfbb464046a Mon Sep 17 00:00:00 2001 From: Jordan <31575189+jordanruthe@users.noreply.github.com> Date: Sun, 18 Jul 2021 16:41:56 -0400 Subject: [PATCH] bed_level: Fix #206 Format change for SCREWS_TILT_ADJUST output --- panels/bed_level.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panels/bed_level.py b/panels/bed_level.py index 3027b20b..ff91f9a6 100644 --- a/panels/bed_level.py +++ b/panels/bed_level.py @@ -146,7 +146,7 @@ class BedLevelPanel(ScreenPanel): def process_update(self, action, data): if action == "notify_gcode_response": result = re.match( - "^// (.*) : X ([\-0-9\.]+), Y ([\-0-9\.]+), Z [\-0-9\.]+ : Adjust -> ([CW]+ [0-9:]+)", + "^// (.*) : [xX= ]+([\-0-9\.]+), [yY= ]+([\-0-9\.]+), [zZ= ]+[\-0-9\.]+ : (Adjust ->|adjust) ([CW]+ [0-9:]+)", data ) if result: @@ -159,7 +159,7 @@ class BedLevelPanel(ScreenPanel): logging.debug(self.screws[i]) if x == int(float(self.screws[i][0])) and y == int(float(self.screws[i][1])): break - self.labels[screw_labels[i]].set_label(result.group(4)) + self.labels[screw_labels[i]].set_label(result.group(5)) self.response_count += 1 if self.response_count >= len(self.screws)-1: self._screen.remove_subscription(self.panel_name)