Skip to content

Fix I2C bug for F4 platforms in IT mode #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2017
Merged

Fix I2C bug for F4 platforms in IT mode #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 34 additions & 22 deletions cores/arduino/stm32/twi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,19 +353,25 @@ i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address,
{
i2c_status_e ret = I2C_ERROR;
uint32_t tickstart = HAL_GetTick();

if(HAL_I2C_Master_Transmit_IT(&(obj->handle), dev_address, data, size) == HAL_OK){
ret = I2C_OK;
// wait for transfer completion
while((HAL_I2C_GetState(&(obj->handle)) != HAL_I2C_STATE_READY)
&& (ret == I2C_OK)){
if((HAL_GetTick() - tickstart) > I2C_TIMEOUT_TICK) {
ret = I2C_TIMEOUT;
} else if(HAL_I2C_GetError(&(obj->handle)) != HAL_I2C_ERROR_NONE) {
ret = I2C_ERROR;
uint32_t delta = 0;

do{
if(HAL_I2C_Master_Transmit_IT(&(obj->handle), dev_address, data, size) == HAL_OK){
ret = I2C_OK;
// wait for transfer completion
while((HAL_I2C_GetState(&(obj->handle)) != HAL_I2C_STATE_READY)
&& (ret == I2C_OK)){
delta = (HAL_GetTick() - tickstart);
if(delta > I2C_TIMEOUT_TICK) {
ret = I2C_TIMEOUT;
} else if(HAL_I2C_GetError(&(obj->handle)) != HAL_I2C_ERROR_NONE) {
ret = I2C_ERROR;
}
}
}
}
/* When Acknowledge failure occurs (Slave don't acknowledge it's address)
Master restarts communication */
}while(HAL_I2C_GetError(&(obj->handle)) == HAL_I2C_ERROR_AF && delta < I2C_TIMEOUT_TICK);

return ret;
}
Expand Down Expand Up @@ -407,19 +413,25 @@ i2c_status_e i2c_master_read(i2c_t *obj, uint8_t dev_address, uint8_t *data, uin
{
i2c_status_e ret = I2C_ERROR;
uint32_t tickstart = HAL_GetTick();

if(HAL_I2C_Master_Receive_IT(&(obj->handle), dev_address, data, size) == HAL_OK) {
ret = I2C_OK;
// wait for transfer completion
while((HAL_I2C_GetState(&(obj->handle)) != HAL_I2C_STATE_READY)
&& (ret == I2C_OK)){
if((HAL_GetTick() - tickstart) > I2C_TIMEOUT_TICK) {
ret = I2C_TIMEOUT;
} else if(HAL_I2C_GetError(&(obj->handle)) != HAL_I2C_ERROR_NONE) {
ret = I2C_ERROR;
uint32_t delta = 0;

do{
if(HAL_I2C_Master_Receive_IT(&(obj->handle), dev_address, data, size) == HAL_OK) {
ret = I2C_OK;
// wait for transfer completion
while((HAL_I2C_GetState(&(obj->handle)) != HAL_I2C_STATE_READY)
&& (ret == I2C_OK)){
delta = (HAL_GetTick() - tickstart);
if( delta > I2C_TIMEOUT_TICK) {
ret = I2C_TIMEOUT;
} else if(HAL_I2C_GetError(&(obj->handle)) != HAL_I2C_ERROR_NONE) {
ret = I2C_ERROR;
}
}
}
}
/* When Acknowledge failure occurs (Slave don't acknowledge it's address)
Master restarts communication */
}while(HAL_I2C_GetError(&(obj->handle)) == HAL_I2C_ERROR_AF && delta < I2C_TIMEOUT_TICK);

return ret;
}
Expand Down