3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2026-02-09 10:30:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bus: raise I2C errors on the host side

Browse source 
Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
This commit is contained in:
Timofey Titovets 2025-08-13 22:35:05 +02:00 • committed by KevinOConnor
parent 87ea2ff1ce
commit 8965958a8b
2 changed files with 63 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/i2ccmds.c
View file

@ -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");