CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bed_level: add center screw close #863

Browse Source
This commit is contained in:
alfrix 2023-03-08 06:35:39 -06:00
parent 926d78de01
commit 18af1d1410
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Configuration.md
View File

@ -79,7 +79,7 @@ calibrate_y_position: 100
# Bed Screws # Bed Screws
# define the screw positons required for odd number of screws in a comma separated list # define the screw positons required for odd number of screws in a comma separated list
# possible values are: bl, br, bm, fl, fr, fm, lm, rm # possible values are: bl, br, bm, fl, fr, fm, lm, rm, center
# they correspond to back-left, back-right, back-middle, front-left, front-right, front-middle, left-middle, right-middle # they correspond to back-left, back-right, back-middle, front-left, front-right, front-middle, left-middle, right-middle
screw_positions: "" screw_positions: ""

12
panels/bed_level.py
View File

@ -88,7 +88,7 @@ class BedLevelPanel(ScreenPanel):
nscrews = len(self.screws) nscrews = len(self.screws)
# KS config # KS config
valid_positions = True valid_positions = True
valid_screws = ["bl", "fl", "fr", "br", "bm", "fm", "lm", "rm"] valid_screws = ["bl", "fl", "fr", "br", "bm", "fm", "lm", "rm", "center"]
if self.ks_printer_cfg is not None: if self.ks_printer_cfg is not None:
screw_positions = self.ks_printer_cfg.get("screw_positions", "") screw_positions = self.ks_printer_cfg.get("screw_positions", "")
if screw_positions: if screw_positions:
@ -99,7 +99,7 @@ class BedLevelPanel(ScreenPanel):
logging.error(f"Unknown screw: {screw}") logging.error(f"Unknown screw: {screw}")
self._screen.show_popup_message(_("Unknown screw position") + f": {screw}") self._screen.show_popup_message(_("Unknown screw position") + f": {screw}")
valid_positions = False valid_positions = False
if not (3 <= len(screw_positions) <= 8): if not (3 <= len(screw_positions) <= 9):
valid_positions = False valid_positions = False
else: else:
if nscrews in (3, 5, 7): if nscrews in (3, 5, 7):
@ -148,6 +148,8 @@ class BedLevelPanel(ScreenPanel):
lm = find_closest(remaining_screws, (min_x, mid_y), max_distance, remove="lm" in screw_positions) lm = find_closest(remaining_screws, (min_x, mid_y), max_distance, remove="lm" in screw_positions)
rm = find_closest(remaining_screws, (max_x, mid_y), max_distance, remove="rm" in screw_positions) rm = find_closest(remaining_screws, (max_x, mid_y), max_distance, remove="rm" in screw_positions)
center = find_closest(remaining_screws, (mid_x, mid_y), max_distance, remove="center" in screw_positions)
if len(remaining_screws) != 0: if len(remaining_screws) != 0:
logging.debug(f"Screws not used: {remaining_screws}") logging.debug(f"Screws not used: {remaining_screws}")
@ -163,6 +165,7 @@ class BedLevelPanel(ScreenPanel):
self.buttons['rm'] = self._gtk.Button("bed-level-r-m", scale=button_scale) self.buttons['rm'] = self._gtk.Button("bed-level-r-m", scale=button_scale)
self.buttons['fm'] = self._gtk.Button("bed-level-b-m", scale=button_scale) self.buttons['fm'] = self._gtk.Button("bed-level-b-m", scale=button_scale)
self.buttons['bm'] = self._gtk.Button("bed-level-t-m", scale=button_scale) self.buttons['bm'] = self._gtk.Button("bed-level-t-m", scale=button_scale)
self.buttons['center'] = self._gtk.Button("increase", scale=button_scale)
bedgrid = Gtk.Grid() bedgrid = Gtk.Grid()
@ -183,6 +186,9 @@ class BedLevelPanel(ScreenPanel):
bedgrid.attach(self.buttons['lm'], 1, 1, 1, 1) bedgrid.attach(self.buttons['lm'], 1, 1, 1, 1)
if "rm" in screw_positions and rm: if "rm" in screw_positions and rm:
bedgrid.attach(self.buttons['rm'], 3, 1, 1, 1) bedgrid.attach(self.buttons['rm'], 3, 1, 1, 1)
if "center" in screw_positions and center:
bedgrid.attach(self.buttons['center'], 2, 1, 1, 1)
self.buttons['center'].connect("clicked", self.go_to_position, center)
else: else:
label = Gtk.Label( label = Gtk.Label(
_("Bed screw configuration:") + f" {nscrews}\n\n" _("Bed screw configuration:") + f" {nscrews}\n\n"
@ -283,7 +289,7 @@ class BedLevelPanel(ScreenPanel):
'fl': fl, 'fl': fl,
'lm': lm 'lm': lm
} }
self.screw_dict['center'] = center
grid.attach(bedgrid, 1, 0, 3, 2) grid.attach(bedgrid, 1, 0, 3, 2)
self.content.add(grid) self.content.add(grid)