diff options
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/board_pins.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/klippy/extras/board_pins.py b/klippy/extras/board_pins.py index 780a49b6..11244e4a 100644 --- a/klippy/extras/board_pins.py +++ b/klippy/extras/board_pins.py @@ -1,27 +1,18 @@ # Support for custom board pin aliases # -# Copyright (C) 2019-2020 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. class PrinterBoardAliases: def __init__(self, config): ppins = config.get_printer().lookup_object('pins') - mcu_names = [n.strip() for n in config.get('mcu', 'mcu').split(',')] + mcu_names = config.getlist('mcu', ('mcu',)) pin_resolvers = [ppins.get_pin_resolver(n) for n in mcu_names] options = ["aliases"] + config.get_prefix_options("aliases_") for opt in options: - aliases = config.get(opt, "").strip() - if not aliases: - continue - if aliases.endswith(','): - aliases = aliases[:-1] - parts = [a.split('=', 1) for a in aliases.split(',')] - for pair in parts: - if len(pair) != 2: - raise ppins.error("Unable to parse aliases in %s" - % (config.get_name(),)) - name, value = [s.strip() for s in pair] + aliases = config.getlists(opt, seps=('=', ','), count=2) + for name, value in aliases: if value.startswith('<') and value.endswith('>'): for pin_resolver in pin_resolvers: pin_resolver.reserve_pin(name, value) |