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

pins: Verify the pin_map setting 

Raise an error if pin_map is not set to a valid value.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-09-03 18:13:15 -04:00
parent 30013a1fb8
commit 5801e6f4d0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
klippy/pins.py
View File

@ -5,6 +5,9 @@
# This file may be distributed under the terms of the GNU GPLv3 license. # This file may be distributed under the terms of the GNU GPLv3 license.
import re import re
class error(Exception):
pass
###################################################################### ######################################################################
# Hardware pin names # Hardware pin names
@ -111,7 +114,9 @@ Arduino_from_mcu = {
} }
def update_map_arduino(pins, mcu): def update_map_arduino(pins, mcu):
dpins, apins = Arduino_from_mcu.get(mcu, ([], [])) if mcu not in Arduino_from_mcu:
raise error("Arduino aliases not supported on mcu '%s'" % (mcu,))
dpins, apins = Arduino_from_mcu[mcu]
for i in range(len(dpins)): for i in range(len(dpins)):
pins['ar' + str(i)] = pins[dpins[i]] pins['ar' + str(i)] = pins[dpins[i]]
for i in range(len(apins)): for i in range(len(apins)):
@ -152,6 +157,8 @@ beagleboneblack_mappings = {
} }
def update_map_beaglebone(pins, mcu): def update_map_beaglebone(pins, mcu):
if mcu != 'pru':
raise error("Beaglebone aliases not supported on mcu '%s'" % (mcu,))
for pin, gpio in beagleboneblack_mappings.items(): for pin, gpio in beagleboneblack_mappings.items():
pins[pin] = pins[gpio] pins[pin] = pins[gpio]
@ -174,6 +181,8 @@ class PinResolver:
update_map_arduino(self.pins, self.mcu_type) update_map_arduino(self.pins, self.mcu_type)
elif mapping_name == 'beaglebone': elif mapping_name == 'beaglebone':
update_map_beaglebone(self.pins, self.mcu_type) update_map_beaglebone(self.pins, self.mcu_type)
else:
raise error("Unknown pin alias mapping '%s'" % (mapping_name,))
def update_command(self, cmd): def update_command(self, cmd):
def pin_fixup(m): def pin_fixup(m):
name = m.group('name') name = m.group('name')
@ -192,9 +201,6 @@ class PinResolver:
# Pin to chip mapping # Pin to chip mapping
###################################################################### ######################################################################
class error(Exception):
pass
class PrinterPins: class PrinterPins:
error = error error = error
def __init__(self): def __init__(self):