Skip to content

Use interrupt mode for I2C transfers #115

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
Sep 28, 2017
Merged

Use interrupt mode for I2C transfers #115

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
39 changes: 23 additions & 16 deletions cores/arduino/stm32/twi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,12 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u

handle->State = HAL_I2C_STATE_RESET;

if(master == 0) {
HAL_NVIC_SetPriority(obj->irq, 0, 1);
HAL_NVIC_EnableIRQ(obj->irq);
HAL_NVIC_SetPriority(obj->irq, 0, 1);
HAL_NVIC_EnableIRQ(obj->irq);
#ifdef STM32F1xx
HAL_NVIC_SetPriority(obj->irqER, 0, 1);
HAL_NVIC_EnableIRQ(obj->irqER);
HAL_NVIC_SetPriority(obj->irqER, 0, 1);
HAL_NVIC_EnableIRQ(obj->irqER);
#endif
}

// Init the I2C
HAL_I2C_Init(handle);
Expand Down Expand Up @@ -335,17 +333,18 @@ i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address,

{
i2c_status_e ret = I2C_ERROR;
HAL_StatusTypeDef status = HAL_OK;

// Check the communication status
status = HAL_I2C_Master_Transmit(&(obj->handle), dev_address, data, size, I2C_TIMEOUT_TICK);
uint32_t tickstart = HAL_GetTick();

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

return ret;
}
Expand Down Expand Up @@ -379,9 +378,17 @@ void i2c_slave_write_IT(i2c_t *obj, uint8_t *data, uint8_t size)
i2c_status_e i2c_master_read(i2c_t *obj, uint8_t dev_address, uint8_t *data, uint8_t size)
{
i2c_status_e ret = I2C_ERROR;
uint32_t tickstart = HAL_GetTick();

if(HAL_I2C_Master_Receive(&(obj->handle), dev_address, data, size, I2C_TIMEOUT_TICK) == HAL_OK) {
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_TIMEOUT)){
if((HAL_GetTick() - tickstart) > I2C_TIMEOUT_TICK) {
ret = I2C_TIMEOUT;
}
}
}

return ret;
Expand Down