aboutsummaryrefslogtreecommitdiffstats
path: root/klippy
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2021-08-19 13:03:59 -0400
committerKevin O'Connor <kevin@koconnor.net>2021-08-21 18:08:10 -0400
commit67d99fe8a85eed47caa73f9246ef7c66807ae3d5 (patch)
tree47268a2bdbc7b69c7b34901297f50b98a5cf394a /klippy
parentf9ca5b90980273bbfab7e1636ac7cfe60e5ce839 (diff)
downloadkutter-67d99fe8a85eed47caa73f9246ef7c66807ae3d5.tar.gz
kutter-67d99fe8a85eed47caa73f9246ef7c66807ae3d5.tar.xz
kutter-67d99fe8a85eed47caa73f9246ef7c66807ae3d5.zip
stepper: Use config.getlists() for gear_ratio config option
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
-rw-r--r--klippy/stepper.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/klippy/stepper.py b/klippy/stepper.py
index f386f5b8..0e415bad 100644
--- a/klippy/stepper.py
+++ b/klippy/stepper.py
@@ -215,17 +215,11 @@ def PrinterStepper(config, units_in_radians=False):
# Parse stepper gear_ratio config parameter
def parse_gear_ratio(config, note_valid):
- gear_ratio = config.get('gear_ratio', None, note_valid=note_valid)
- if gear_ratio is None:
- return 1.
+ gear_ratio = config.getlists('gear_ratio', (), seps=(':', ','), count=2,
+ parser=float, note_valid=note_valid)
result = 1.
- try:
- gears = gear_ratio.split(',')
- for gear in gears:
- g1, g2 = [float(v.strip()) for v in gear.split(':')]
- result *= g1 / g2
- except:
- raise config.error("Unable to parse gear_ratio: %s" % (gear_ratio,))
+ for g1, g2 in gear_ratio:
+ result *= g1 / g2
return result
# Obtain "step distance" information from a config section