diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2016-11-30 15:05:26 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2016-11-30 21:19:44 -0500 |
| commit | 3806ed882a262b2001d672c0829280c63d1628d6 (patch) | |
| tree | c0ee1beca81b49acb12a8e49409d1bc76571defa | |
| parent | ce7e7c40486561d832a03aa95fb003a0cdd3686d (diff) | |
| download | kutter-3806ed882a262b2001d672c0829280c63d1628d6.tar.gz kutter-3806ed882a262b2001d672c0829280c63d1628d6.tar.xz kutter-3806ed882a262b2001d672c0829280c63d1628d6.zip | |
mcu: Raise a config error on an invalid pin name in the config file
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/klippy.py | 1 | ||||
| -rw-r--r-- | klippy/mcu.py | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/klippy/klippy.py b/klippy/klippy.py index 151bd1c6..849c5b8b 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -34,6 +34,7 @@ Printer is shutdown """ class ConfigWrapper: + error = ConfigParser.Error def __init__(self, printer, section): self.printer = printer self.section = section diff --git a/klippy/mcu.py b/klippy/mcu.py index e039f2d5..09942df8 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -399,8 +399,14 @@ class MCU: pnames = pins.mcu_to_pins(mcu) else: pnames = pins.map_pins(pin_map, mcu) - self._config_cmds = [pins.update_command(c, pnames) - for c in self._config_cmds] + updated_cmds = [] + for cmd in self._config_cmds: + try: + updated_cmds.append(pins.update_command(cmd, pnames)) + except: + raise self._config.error("Unable to translate pin name: %s" % ( + cmd,)) + self._config_cmds = updated_cmds # Calculate config CRC self._config_crc = zlib.crc32('\n'.join(self._config_cmds)) & 0xffffffff |