3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pins: Warn on invalid pin format 

Raise an error if a pin description isn't formatted correctly.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-02-07 15:56:38 -05:00
parent 955d940b60
commit 561c84dd93
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
klippy/pins.py
View File

@ -195,19 +195,29 @@ class PrinterPins:
def lookup_pin(self, pin_type, pin_desc, share_type=None): def lookup_pin(self, pin_type, pin_desc, share_type=None):
can_invert = pin_type in ['stepper', 'endstop', 'digital_out', 'pwm'] can_invert = pin_type in ['stepper', 'endstop', 'digital_out', 'pwm']
can_pullup = pin_type == 'endstop' can_pullup = pin_type == 'endstop'
desc = pin_desc
pullup = invert = 0 pullup = invert = 0
if can_pullup and pin_desc.startswith('^'): if can_pullup and desc.startswith('^'):
pullup = 1 pullup = 1
pin_desc = pin_desc[1:].strip() desc = desc[1:].strip()
if can_invert and pin_desc.startswith('!'): if can_invert and desc.startswith('!'):
invert = 1 invert = 1
pin_desc = pin_desc[1:].strip() desc = desc[1:].strip()
if ':' not in pin_desc: if ':' not in desc:
chip_name, pin = 'mcu', pin_desc chip_name, pin = 'mcu', desc
else: else:
chip_name, pin = [s.strip() for s in pin_desc.split(':', 1)] chip_name, pin = [s.strip() for s in desc.split(':', 1)]
if chip_name not in self.chips: if chip_name not in self.chips:
raise error("Unknown pin chip name '%s'" % (chip_name,)) raise error("Unknown pin chip name '%s'" % (chip_name,))
if [c for c in '^!: ' if c in pin]:
format = ""
if can_pullup:
format += "[^] "
if can_invert:
format += "[!] "
raise error("Invalid pin description '%s'\n"
"Format is: %s[chip_name:] pin_name" % (
pin_desc, format))
share_name = "%s:%s" % (chip_name, pin) share_name = "%s:%s" % (chip_name, pin)
if share_name in self.active_pins: if share_name in self.active_pins:
pin_params = self.active_pins[share_name] pin_params = self.active_pins[share_name]