Bed level updates. The buttons now work!

panels/bed_level.py

@@ -1,20 +1,70 @@
 import gi
+import re
 
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
+from KlippyGcodes import KlippyGcodes
 from KlippyGtk import KlippyGtk
 from panels.screen_panel import ScreenPanel
 
+import logging
+logger = logging.getLogger("KlipperScreen.BedLevelPanel")
+
 class BedLevelPanel(ScreenPanel):
     def initialize(self, menu):
-        # Create gtk items here
+        self.screws = None
         self.panel = KlippyGtk.HomogeneousGrid()
 
+        screws = []
+        if "bed_screws" in self._screen.printer.get_config_section_list():
+            bed_screws = self._screen.printer.get_config_section("bed_screws")
+            for item in bed_screws:
+                if re.match(r"^[0-9\.]+,[0-9\.]+$", bed_screws[item]):
+                    screws.append(bed_screws[item].split(","))
+
+            screws = sorted(screws, key=lambda x: (float(x[1]), float(x[0])))
+            logger.debug("Bed screw locations [x,y]: %s", screws)
+            if "bltouch" in self._screen.printer.get_config_section_list():
+                x_offset = 0
+                y_offset = 0
+                bltouch = self._screen.printer.get_config_section("bltouch")
+                if "x_offset" in bltouch:
+                    x_offset = float(bltouch['x_offset'])
+                if "y_offset" in bltouch:
+                    y_offset = float(bltouch['y_offset'])
+                new_screws = []
+                for screw in screws:
+                    new_screws.append([float(screw[0]) + x_offset, float(screw[1]) + y_offset])
+                screws = new_screws
+
+            self.screws = screws
+
+        if len(screws) < 4:
+            logger.debug("bed_screws not configured, calculating locations")
+            xconf = self._screen.printer.get_config_section("stepper_x")
+            yconf = self._screen.printer.get_config_section("stepper_y")
+            x = int(int(xconf['position_max'])/4)
+            y = int(int(yconf['position_max'])/4)
+            screws = [
+                [x, y],
+                [x*3, y],
+                [x, y*3],
+                [x*3, y*3],
+            ]
+            logger.debug("Calculated screw locations [x,y]: %s", screws)
+        else:
+            logger.debug("Configured screw locations [x,y]: %s", screws)
+
+
         self.labels['tl'] = KlippyGtk.ButtonImage("bed-level-t-l")
+        self.labels['tl'].connect("clicked", self.go_to_position, self.screws[2])
         self.labels['tr'] = KlippyGtk.ButtonImage("bed-level-t-r")
+        self.labels['tr'].connect("clicked", self.go_to_position, self.screws[3])
         self.labels['bl'] = KlippyGtk.ButtonImage("bed-level-b-l")
+        self.labels['bl'].connect("clicked", self.go_to_position, self.screws[0])
         self.labels['br'] = KlippyGtk.ButtonImage("bed-level-b-r")
+        self.labels['br'].connect("clicked", self.go_to_position, self.screws[1])
 
         self.panel.attach(self.labels['tl'], 1, 0, 1, 1)
         self.panel.attach(self.labels['tr'], 2, 0, 1, 1)
@@ -22,11 +72,38 @@ class BedLevelPanel(ScreenPanel):
         self.panel.attach(self.labels['br'], 2, 1, 1, 1)
 
         self.labels['home'] = KlippyGtk.ButtonImage("home","Home All","color2")
-        self.labels['dm'] = KlippyGtk.ButtonImage("motor-off", "Disable X/Y", "color3")
+        self.labels['home'].connect("clicked", self.home)
+
+        self.labels['dm'] = KlippyGtk.ButtonImage("motor-off", "Disable XY", "color3")
 
         self.panel.attach(self.labels['home'], 0, 0, 1, 1)
-        self.panel.attach(self.labels['dm'], 0, 1, 1, 1)
+        #self.panel.attach(self.labels['dm'], 0, 1, 1, 1)
+
+        self.labels['estop'] = KlippyGtk.ButtonImage("decrease","Emergency Stop","color4")
+        self.labels['estop'].connect("clicked", self.emergency_stop)
+        self.panel.attach(self.labels['estop'], 3, 0, 1, 1)
 
         b = KlippyGtk.ButtonImage('back', 'Back')
         b.connect("clicked", self._screen._menu_go_back)
         self.panel.attach(b, 3, 1, 1, 1)
+
+    def go_to_position(self, widget, position):
+        logger.debug("Going to position: %s", position)
+        script = [
+            "%s" % KlippyGcodes.MOVE_ABSOLUTE,
+            "G1 Z7 F800\n",
+            "G1 X%s Y%s F3600\n" % (position[0], position[1]),
+            "G1 Z.1 F300\n"
+        ]
+
+        self._screen._ws.klippy.gcode_script(
+            "\n".join(script)
+        )
+
+
+
+
+
+
+#for screw in screws:
+#    sorted(screws.items(), key=lambda x: (float(x[1].split(",")[0]), float(x[1].split(",")[1])))