diff options
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/bus.py | 10 | ||||
| -rw-r--r-- | klippy/extras/tmc2130.py | 19 |
2 files changed, 25 insertions, 4 deletions
diff --git a/klippy/extras/bus.py b/klippy/extras/bus.py index 09259b9f..9b3e476a 100644 --- a/klippy/extras/bus.py +++ b/klippy/extras/bus.py @@ -92,8 +92,14 @@ class MCU_SPI: return self.spi_send_cmd.send([self.oid, data], minclock=minclock, reqclock=reqclock) - def spi_transfer(self, data): - return self.spi_transfer_cmd.send([self.oid, data]) + def spi_transfer(self, data, minclock=0, reqclock=0): + return self.spi_transfer_cmd.send([self.oid, data], + minclock=minclock, reqclock=reqclock) + def spi_transfer_with_preface(self, preface_data, data, + minclock=0, reqclock=0): + return self.spi_transfer_cmd.send_with_preface( + self.spi_send_cmd, [self.oid, preface_data], [self.oid, data], + minclock=minclock, reqclock=reqclock) # Helper to setup an spi bus from settings in a config section def MCU_SPI_from_config(config, mode, pin_option="cs_pin", diff --git a/klippy/extras/tmc2130.py b/klippy/extras/tmc2130.py index e827b32a..38405b21 100644 --- a/klippy/extras/tmc2130.py +++ b/klippy/extras/tmc2130.py @@ -183,7 +183,17 @@ class MCU_TMC_SPI_chain: minclock = self.spi.get_mcu().print_time_to_clock(print_time) data = [(reg | 0x80) & 0xff, (val >> 24) & 0xff, (val >> 16) & 0xff, (val >> 8) & 0xff, val & 0xff] - self.spi.spi_send(self._build_cmd(data, chain_pos), minclock) + if self.printer.get_start_args().get('debugoutput') is not None: + self.spi.spi_send(self._build_cmd(data, chain_pos), minclock) + return val + write_cmd = self._build_cmd(data, chain_pos) + dummy_read = self._build_cmd([0x00, 0x00, 0x00, 0x00, 0x00], chain_pos) + params = self.spi.spi_transfer_with_preface(write_cmd, dummy_read, + minclock=minclock) + pr = bytearray(params['response']) + pr = pr[(self.chain_len - chain_pos) * 5 : + (self.chain_len - chain_pos + 1) * 5] + return (pr[1] << 24) | (pr[2] << 16) | (pr[3] << 8) | pr[4] # Helper to setup an spi daisy chain bus from settings in a config section def lookup_tmc_spi_chain(config): @@ -225,7 +235,12 @@ class MCU_TMC_SPI: def set_register(self, reg_name, val, print_time=None): reg = self.name_to_reg[reg_name] with self.mutex: - self.tmc_spi.reg_write(reg, val, self.chain_pos, print_time) + for retry in range(5): + v = self.tmc_spi.reg_write(reg, val, self.chain_pos, print_time) + if v == val: + return + raise self.printer.command_error( + "Unable to write tmc spi '%s' register %s" % (self.name, reg_name)) ###################################################################### |