From f837451dae9ba9eb59a486d848f8b615cfe013a0 Mon Sep 17 00:00:00 2001 From: Timofey Titovets Date: Wed, 13 Aug 2025 22:35:05 +0200 Subject: [PATCH] bus: raise I2C errors on the host side Signed-off-by: Timofey Titovets --- klippy/extras/bus.py | 50 +++++++++++++++++++++++++++++++++++++------- src/i2ccmds.c | 31 +++++++++++++++++---------- 2 files changed, 63 insertions(+), 18 deletions(-) diff --git a/klippy/extras/bus.py b/klippy/extras/bus.py index 19e278418..922d2a1c5 100644 --- a/klippy/extras/bus.py +++ b/klippy/extras/bus.py @@ -180,10 +180,13 @@ class MCU_I2C: self.cmd_queue = self.mcu.alloc_command_queue() self.mcu.register_config_callback(self.build_config) self.i2c_write_cmd = self.i2c_read_cmd = None + self.i2c_transfer_cmd = None printer = self.mcu.get_printer() printer.register_event_handler("klippy:connect", self._handle_connect) # backward support i2c_write inside the init section self._to_write = [] + # Host side I2C error handling + self._configured = False def _handle_connect(self): for data in self._to_write: self.i2c_write(data) @@ -208,21 +211,54 @@ class MCU_I2C: self.mcu.add_config_cmd(self.config_fmt) self.i2c_write_cmd = self.mcu.lookup_command( "i2c_write oid=%c data=%*s", cq=self.cmd_queue) - self.i2c_read_cmd = self.mcu.lookup_query_command( - "i2c_read oid=%c reg=%*s read_len=%u", - "i2c_read_response oid=%c response=%*s", oid=self.oid, - cq=self.cmd_queue) + if self.mcu.try_lookup_command("i2c_read oid=%c reg=%*s read_len=%u"): + self.i2c_read_cmd = self.mcu.lookup_query_command( + "i2c_read oid=%c reg=%*s read_len=%u", + "i2c_read_response oid=%c response=%*s", oid=self.oid, + cq=self.cmd_queue) + else: + self.i2c_transfer_cmd = self.mcu.lookup_query_command( + "i2c_transfer oid=%c write=%*s read_len=%u", + "i2c_response oid=%c i2c_bus_status=%c response=%*s", + oid=self.oid, cq=self.cmd_queue) + if self.mcu.is_fileoutput(): + self.i2c_transfer_cmd = self.mcu.lookup_command( + "i2c_transfer oid=%c write=%*s read_len=%u", + cq=self.cmd_queue) + self._configured = True def i2c_write_noack(self, data, minclock=0, reqclock=0): self.i2c_write_cmd.send([self.oid, data], minclock=minclock, reqclock=reqclock) - def i2c_write(self, data, minclock=0, reqclock=0): - if self.i2c_write_cmd is None: + def i2c_write(self, data, minclock=0, reqclock=0, retry=True): + if not self._configured: self._to_write.append(data) return + if self.i2c_transfer_cmd is not None: + self.i2c_transfer(data, minclock=minclock, reqclock=reqclock, + retry=retry) + return self.i2c_write_cmd.send_wait_ack([self.oid, data], minclock=minclock, reqclock=reqclock) def i2c_read(self, write, read_len, retry=True): - return self.i2c_read_cmd.send([self.oid, write, read_len], retry) + if self.i2c_transfer_cmd is not None: + return self.i2c_transfer(write, read_len, retry=retry) + return self.i2c_read_cmd.send([self.oid, write, read_len], + retry=retry) + def i2c_transfer(self, write, read_len=0, minclock=0, reqclock=0, + retry=True): + cmd = self.i2c_transfer_cmd + if self.mcu.is_fileoutput(): + cmd.send([self.oid, write, read_len], + minclock=minclock, reqclock=reqclock) + return + param = cmd.send([self.oid, write, read_len], + minclock=minclock, reqclock=reqclock, retry=retry) + status = param["i2c_bus_status"] + if status == "SUCCESS": + return param + err_msg = "MCU '%s' I2C request to addr %i reports error %s" % ( + self.mcu.get_name(), self.i2c_address, status) + self.mcu.get_printer().invoke_shutdown(err_msg) def MCU_I2C_from_config(config, default_addr=None, default_speed=100000): # Load bus parameters diff --git a/src/i2ccmds.c b/src/i2ccmds.c index c51772f1d..621cfd378 100644 --- a/src/i2ccmds.c +++ b/src/i2ccmds.c @@ -17,6 +17,12 @@ enum { IF_SOFTWARE = 1, IF_HARDWARE = 2 }; +DECL_ENUMERATION("i2c_bus_status", "SUCCESS", I2C_BUS_SUCCESS); +DECL_ENUMERATION("i2c_bus_status", "NACK", I2C_BUS_NACK); +DECL_ENUMERATION("i2c_bus_status", "START_NACK", I2C_BUS_START_NACK); +DECL_ENUMERATION("i2c_bus_status", "START_READ_NACK", I2C_BUS_START_READ_NACK); +DECL_ENUMERATION("i2c_bus_status", "BUS_TIMEOUT", I2C_BUS_TIMEOUT); + void command_config_i2c(uint32_t *args) { @@ -78,8 +84,7 @@ void command_i2c_write(uint32_t *args) struct i2cdev_s *i2c = oid_lookup(oid, command_config_i2c); uint8_t data_len = args[1]; uint8_t *data = command_decode_ptr(args[2]); - int ret = i2c_dev_write(i2c, data_len, data); - i2c_shutdown_on_err(ret); + i2c_dev_write(i2c, data_len, data); } DECL_COMMAND(command_i2c_write, "i2c_write oid=%c data=%*s"); @@ -93,16 +98,20 @@ int i2c_dev_read(struct i2cdev_s *i2c, uint8_t reg_len, uint8_t *reg return i2c_read(i2c->i2c_hw, reg_len, reg, read_len, read); } -void command_i2c_read(uint32_t *args) +void command_i2c_transfer(uint32_t *args) { uint8_t oid = args[0]; struct i2cdev_s *i2c = oid_lookup(oid, command_config_i2c); - uint8_t reg_len = args[1]; - uint8_t *reg = command_decode_ptr(args[2]); - uint8_t data_len = args[3]; - uint8_t data[data_len]; - int ret = i2c_dev_read(i2c, reg_len, reg, data_len, data); - i2c_shutdown_on_err(ret); - sendf("i2c_read_response oid=%c response=%*s", oid, data_len, data); + uint8_t wlen = args[1]; + uint8_t *wdata = command_decode_ptr(args[2]); + uint8_t rlen = args[3]; + uint8_t rdata[rlen]; + uint8_t nack; + if (rlen > 0) + nack = i2c_dev_read(i2c, wlen, wdata, rlen, rdata); + else + nack = i2c_dev_write(i2c, wlen, wdata); + sendf("i2c_response oid=%c i2c_bus_status=%c response=%*s", + oid, nack, rlen, rdata); } -DECL_COMMAND(command_i2c_read, "i2c_read oid=%c reg=%*s read_len=%u"); +DECL_COMMAND(command_i2c_transfer, "i2c_transfer oid=%c write=%*s read_len=%u");