3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bed_screws: Use config.getfloatlist() for coordinates config option 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-08-19 14:31:19 -04:00
parent 3ef6e2ba56
commit a546415884
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
klippy/extras/bed_screws.py
View File

@ -1,17 +1,9 @@
# Helper script to adjust bed screws # Helper script to adjust bed screws
# #
# Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net> # Copyright (C) 2019-2021 Kevin O'Connor <kevin@koconnor.net>
# #
# This file may be distributed under the terms of the GNU GPLv3 license. # This file may be distributed under the terms of the GNU GPLv3 license.
def parse_coord(config, param):
pair = config.get(param).strip().split(',', 1)
try:
return (float(pair[0]), float(pair[1]))
except:
raise config.error("%s:%s needs to be an x,y coordinate" % (
config.get_name(), param))
class BedScrews: class BedScrews:
def __init__(self, config): def __init__(self, config):
self.printer = config.get_printer() self.printer = config.get_printer()
@ -26,12 +18,13 @@ class BedScrews:
prefix = "screw%d" % (i + 1,) prefix = "screw%d" % (i + 1,)
if config.get(prefix, None) is None: if config.get(prefix, None) is None:
break break
screw_coord = parse_coord(config, prefix) screw_coord = config.getfloatlist(prefix, count=2)
screw_name = "screw at %.3f,%.3f" % screw_coord screw_name = "screw at %.3f,%.3f" % screw_coord
screw_name = config.get(prefix + "_name", screw_name) screw_name = config.get(prefix + "_name", screw_name)
screws.append((screw_coord, screw_name)) screws.append((screw_coord, screw_name))
if config.get(prefix + "_fine_adjust", None) is not None: pfa = prefix + "_fine_adjust"
fine_coord = parse_coord(config, prefix + "_fine_adjust") if config.get(pfa, None) is not None:
fine_coord = config.getfloatlist(pfa, count=2)
fine_adjust.append((fine_coord, screw_name)) fine_adjust.append((fine_coord, screw_name))
if len(screws) < 3: if len(screws) < 3:
raise config.error("bed_screws: Must have at least three screws") raise config.error("bed_screws: Must have at least three screws")