h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: handle errors at i2ccmds

Browse Source 
Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
This commit is contained in:
Timofey Titovets
2024-10-21 14:19:56 +02:00
committed by KevinOConnor
parent 08a85ba869
commit a4aa2a9002
20 changed files with 123 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rp2040/gpio.h
View File

@@ -50,8 +50,8 @@ struct i2c_config {
};
struct i2c_config i2c_setup(uint32_t bus, uint32_t rate, uint8_t addr);
void i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write);
void i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg
, uint8_t read_len, uint8_t *read);
int i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write);
int i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg
, uint8_t read_len, uint8_t *read);
#endif // gpio.h

9
src/rp2040/i2c.c
View File

@@ -11,6 +11,7 @@
#include "internal.h" // pclock, gpio_peripheral
#include "hardware/regs/resets.h" // RESETS_RESET_I2C*_BITS
#include "hardware/structs/i2c.h"
#include "i2ccmds.h" // I2C_BUS_SUCCESS
struct i2c_info {
i2c_hw_t *i2c;
@@ -211,7 +212,7 @@ i2c_do_read(i2c_hw_t *i2c, uint8_t addr, uint8_t read_len, uint8_t *read
}
}
void
int
i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
{
i2c_hw_t *i2c = (i2c_hw_t*)config.i2c;
@@ -220,9 +221,11 @@ i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
i2c_start(i2c, config.addr);
i2c_do_write(i2c, config.addr, write_len, write, 1, timeout);
i2c_stop(i2c);
return I2C_BUS_SUCCESS;
}
void
int
i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg
, uint8_t read_len, uint8_t *read)
{
@@ -234,4 +237,6 @@ i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg
i2c_do_write(i2c, config.addr, reg_len, reg, 0, timeout);
i2c_do_read(i2c, config.addr, read_len, read, timeout);
i2c_stop(i2c);
return I2C_BUS_SUCCESS;
}