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/stm32/gpio.h
View File

@@ -51,8 +51,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/stm32/i2c.c
View File

@@ -11,6 +11,7 @@
#include "internal.h" // GPIO
#include "sched.h" // sched_shutdown
#include "board/irq.h" //irq_disable
#include "i2ccmds.h" // I2C_BUS_SUCCESS
struct i2c_info {
I2C_TypeDef *i2c;
@@ -149,7 +150,7 @@ i2c_stop(I2C_TypeDef *i2c, uint32_t timeout)
i2c_wait(i2c, 0, I2C_SR1_TXE, timeout);
}
void
int
i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
{
I2C_TypeDef *i2c = config.i2c;
@@ -159,9 +160,11 @@ i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
while (write_len--)
i2c_send_byte(i2c, *write++, timeout);
i2c_stop(i2c, timeout);
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)
{
@@ -182,4 +185,6 @@ i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg
read++;
}
i2c_wait(i2c, 0, I2C_SR1_RXNE, timeout);
return I2C_BUS_SUCCESS;
}

9
src/stm32/stm32f0_i2c.c
View File

@@ -9,6 +9,7 @@
#include "gpio.h" // i2c_setup
#include "internal.h" // GPIO
#include "sched.h" // sched_shutdown
#include "i2ccmds.h" // I2C_BUS_SUCCESS
struct i2c_info {
I2C_TypeDef *i2c;
@@ -188,7 +189,7 @@ i2c_wait(I2C_TypeDef *i2c, uint32_t set, uint32_t timeout)
}
}
void
int
i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
{
I2C_TypeDef *i2c = config.i2c;
@@ -202,9 +203,11 @@ i2c_write(struct i2c_config config, uint8_t write_len, uint8_t *write)
i2c->TXDR = *write++;
}
i2c_wait(i2c, I2C_ISR_TXE, timeout);
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)
{
@@ -228,4 +231,6 @@ i2c_read(struct i2c_config config, uint8_t reg_len, uint8_t *reg
*read++ = i2c->RXDR;
}
i2c_wait(i2c, I2C_ISR_STOPF, timeout);
return I2C_BUS_SUCCESS;
}