aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2021-08-19 14:40:41 -0400
committerKevin O'Connor <kevin@koconnor.net>2021-08-21 18:08:10 -0400
commitd3484efe7327f2091d71ff9bfec620b4fffb940f (patch)
tree8d929e968dfc1a9cbd68a4aa2d94ba9f6053ffc7
parent673ecec6a2ded576ba1b5ffb4a601cdbef6fc3be (diff)
downloadkutter-d3484efe7327f2091d71ff9bfec620b4fffb940f.tar.gz
kutter-d3484efe7327f2091d71ff9bfec620b4fffb940f.tar.xz
kutter-d3484efe7327f2091d71ff9bfec620b4fffb940f.zip
probe: Use config.getlists() for points config option
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--klippy/extras/probe.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py
index d7af1ec1..4a32a300 100644
--- a/klippy/extras/probe.py
+++ b/klippy/extras/probe.py
@@ -360,14 +360,8 @@ class ProbePointsHelper:
self.gcode = self.printer.lookup_object('gcode')
# Read config settings
if default_points is None or config.get('points', None) is not None:
- points = config.get('points').split('\n')
- try:
- points = [line.split(',', 1) for line in points if line.strip()]
- self.probe_points = [(float(p[0].strip()), float(p[1].strip()))
- for p in points]
- except:
- raise config.error("Unable to parse probe points in %s" % (
- self.name))
+ self.probe_points = config.getlists('points', seps=(',', '\n'),
+ parser=float, count=2)
self.horizontal_move_z = config.getfloat('horizontal_move_z', 5.)
self.speed = config.getfloat('speed', 50., above=0.)
self.use_offsets = False