From d82dc1e84442135536ecb17c712bbb922f44b769 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 19 Aug 2021 15:16:49 -0400 Subject: [PATCH] resonance_tester: Use config.getlists() for probe_points config option Signed-off-by: Kevin O'Connor --- klippy/extras/resonance_tester.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/klippy/extras/resonance_tester.py b/klippy/extras/resonance_tester.py index 97802a71..7d7c76b6 100644 --- a/klippy/extras/resonance_tester.py +++ b/klippy/extras/resonance_tester.py @@ -6,15 +6,6 @@ import logging, math, os, time from . import shaper_calibrate -def _parse_probe_points(config): - points = config.get('probe_points').split('\n') - try: - points = [line.split(',', 2) for line in points if line.strip()] - return [[float(coord.strip()) for coord in p] for p in points] - except: - raise config.error("Unable to parse probe_points in %s" % ( - config.get_name())) - class TestAxis: def __init__(self, axis=None, vib_dir=None): if axis is None: @@ -66,7 +57,8 @@ class VibrationPulseTest: self.hz_per_sec = config.getfloat('hz_per_sec', 1., minval=0.1, maxval=2.) - self.probe_points = _parse_probe_points(config) + self.probe_points = config.getlists('probe_points', seps=(',', '\n'), + parser=float, count=3) def get_start_test_points(self): return self.probe_points def prepare_test(self, gcmd):