@@ -255,14 +255,12 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
255
255
256
256
handle -> State = HAL_I2C_STATE_RESET ;
257
257
258
- if (master == 0 ) {
259
- HAL_NVIC_SetPriority (obj -> irq , 0 , 1 );
260
- HAL_NVIC_EnableIRQ (obj -> irq );
258
+ HAL_NVIC_SetPriority (obj -> irq , 0 , 1 );
259
+ HAL_NVIC_EnableIRQ (obj -> irq );
261
260
#ifdef STM32F1xx
262
- HAL_NVIC_SetPriority (obj -> irqER , 0 , 1 );
263
- HAL_NVIC_EnableIRQ (obj -> irqER );
261
+ HAL_NVIC_SetPriority (obj -> irqER , 0 , 1 );
262
+ HAL_NVIC_EnableIRQ (obj -> irqER );
264
263
#endif
265
- }
266
264
267
265
// Init the I2C
268
266
HAL_I2C_Init (handle );
@@ -335,17 +333,18 @@ i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address,
335
333
336
334
{
337
335
i2c_status_e ret = I2C_ERROR ;
338
- HAL_StatusTypeDef status = HAL_OK ;
339
-
340
- // Check the communication status
341
- status = HAL_I2C_Master_Transmit (& (obj -> handle ), dev_address , data , size , I2C_TIMEOUT_TICK );
336
+ uint32_t tickstart = HAL_GetTick ();
342
337
343
- if (status == HAL_OK )
338
+ if (HAL_I2C_Master_Transmit_IT ( & ( obj -> handle ), dev_address , data , size ) == HAL_OK ){
344
339
ret = I2C_OK ;
345
- else if (status == HAL_TIMEOUT )
346
- ret = I2C_TIMEOUT ;
347
- else
348
- ret = I2C_ERROR ;
340
+ // wait for transfer completion
341
+ while ((HAL_I2C_GetState (& (obj -> handle )) != HAL_I2C_STATE_READY )
342
+ && (ret != I2C_TIMEOUT )){
343
+ if ((HAL_GetTick () - tickstart ) > I2C_TIMEOUT_TICK ) {
344
+ ret = I2C_TIMEOUT ;
345
+ }
346
+ }
347
+ }
349
348
350
349
return ret ;
351
350
}
@@ -379,9 +378,17 @@ void i2c_slave_write_IT(i2c_t *obj, uint8_t *data, uint8_t size)
379
378
i2c_status_e i2c_master_read (i2c_t * obj , uint8_t dev_address , uint8_t * data , uint8_t size )
380
379
{
381
380
i2c_status_e ret = I2C_ERROR ;
381
+ uint32_t tickstart = HAL_GetTick ();
382
382
383
- if (HAL_I2C_Master_Receive (& (obj -> handle ), dev_address , data , size , I2C_TIMEOUT_TICK ) == HAL_OK ) {
383
+ if (HAL_I2C_Master_Receive_IT (& (obj -> handle ), dev_address , data , size ) == HAL_OK ) {
384
384
ret = I2C_OK ;
385
+ // wait for transfer completion
386
+ while ((HAL_I2C_GetState (& (obj -> handle )) != HAL_I2C_STATE_READY )
387
+ && (ret != I2C_TIMEOUT )){
388
+ if ((HAL_GetTick () - tickstart ) > I2C_TIMEOUT_TICK ) {
389
+ ret = I2C_TIMEOUT ;
390
+ }
391
+ }
385
392
}
386
393
387
394
return ret ;
0 commit comments