diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-03-31 23:37:17 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-04-04 18:29:31 -0400 |
| commit | bc9fd03dabc38ae55fae3151e94cffe7157b95bd (patch) | |
| tree | bee1984f5afd76e6c4d9e013d8984076dd90e422 /klippy | |
| parent | 7e8ecfe177945e10a1e4adaac64c1d803e9405ff (diff) | |
| download | kutter-bc9fd03dabc38ae55fae3151e94cffe7157b95bd.tar.gz kutter-bc9fd03dabc38ae55fae3151e94cffe7157b95bd.tar.xz kutter-bc9fd03dabc38ae55fae3151e94cffe7157b95bd.zip | |
atsamd: Use enumerations for buses and reserve pins
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/samd_sercom.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/klippy/extras/samd_sercom.py b/klippy/extras/samd_sercom.py index 2861cf6a..5bce44b1 100644 --- a/klippy/extras/samd_sercom.py +++ b/klippy/extras/samd_sercom.py @@ -8,30 +8,25 @@ class SamdSERCOM: def __init__(self, config): self.printer = config.get_printer() self.name = config.get_name().split()[1] - ppins = self.printer.lookup_object("pins") - try: - int(self.name) - except ValueError: - raise ppins.error("%s: SERCOM name must be an integer" % ( - config.get_name(),)) self.tx_pin = config.get("tx_pin") self.rx_pin = config.get("rx_pin", None) self.clk_pin = config.get("clk_pin") + ppins = self.printer.lookup_object("pins") tx_pin_params = ppins.lookup_pin(self.tx_pin) self.mcu = tx_pin_params['chip'] self.mcu.add_config_cmd( - "set_sercom_pin sercom_id=%s pin_type=%d pin=%s" % ( - self.name, 0, self.tx_pin)) + "set_sercom_pin bus=%s sercom_pin_type=tx pin=%s" % ( + self.name, self.tx_pin)) clk_pin_params = ppins.lookup_pin(self.clk_pin) if self.mcu is not clk_pin_params['chip']: raise ppins.error("%s: SERCOM pins must be on same mcu" % ( config.get_name(),)) self.mcu.add_config_cmd( - "set_sercom_pin sercom_id=%s pin_type=%d pin=%s" % ( - self.name, 2, self.clk_pin)) + "set_sercom_pin bus=%s sercom_pin_type=clk pin=%s" % ( + self.name, self.clk_pin)) if self.rx_pin: rx_pin_params = ppins.lookup_pin(self.rx_pin) @@ -39,8 +34,8 @@ class SamdSERCOM: raise ppins.error("%s: SERCOM pins must be on same mcu" % ( config.get_name(),)) self.mcu.add_config_cmd( - "set_sercom_pin sercom_id=%s pin_type=%d pin=%s" % ( - self.name, 1, self.rx_pin)) + "set_sercom_pin bus=%s sercom_pin_type=rx pin=%s" % ( + self.name, self.rx_pin)) def load_config_prefix(config): return SamdSERCOM(config) |