From d1bdde56cced15cdc76625e4e1075abdcda3c9b5 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 3 Jul 2021 22:52:42 -0400 Subject: samd_sercom: Specify the sercom explicitly in a config option Do not infer the sercom from the config section name, as that prevents one from using SPI buses on multiple samd mcus. Signed-off-by: Kevin O'Connor --- klippy/extras/samd_sercom.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'klippy') diff --git a/klippy/extras/samd_sercom.py b/klippy/extras/samd_sercom.py index 36df2f0a..44a9263c 100644 --- a/klippy/extras/samd_sercom.py +++ b/klippy/extras/samd_sercom.py @@ -7,8 +7,8 @@ class SamdSERCOM: def __init__(self, config): self.printer = config.get_printer() - self.name = config.get_name().split()[1] + self.sercom = config.get("sercom") self.tx_pin = config.get("tx_pin") self.rx_pin = config.get("rx_pin", None) self.clk_pin = config.get("clk_pin") @@ -18,15 +18,15 @@ class SamdSERCOM: self.mcu = tx_pin_params['chip'] self.mcu.add_config_cmd( "set_sercom_pin bus=%s sercom_pin_type=tx pin=%s" % ( - self.name, tx_pin_params['pin'])) + self.sercom, tx_pin_params['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(),)) + raise ppins.error("%s: SERCOM pins must be on same mcu" % ( + config.get_name(),)) self.mcu.add_config_cmd( "set_sercom_pin bus=%s sercom_pin_type=clk pin=%s" % ( - self.name, clk_pin_params['pin'])) + self.sercom, clk_pin_params['pin'])) if self.rx_pin: rx_pin_params = ppins.lookup_pin(self.rx_pin) @@ -35,7 +35,7 @@ class SamdSERCOM: config.get_name(),)) self.mcu.add_config_cmd( "set_sercom_pin bus=%s sercom_pin_type=rx pin=%s" % ( - self.name, rx_pin_params['pin'])) + self.sercom, rx_pin_params['pin'])) def load_config_prefix(config): return SamdSERCOM(config) -- cgit v1.2.3-70-g09d2