|
|
@@ -89,7 +89,7 @@
|
|
|
add his own code by customization of function pointer HAL_I2C_SlaveRxCpltCallback()
|
|
|
(+) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and user can
|
|
|
add his own code by customization of function pointer HAL_I2C_ErrorCallback()
|
|
|
- (+) Abort a master I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
|
|
|
+ (+) Abort a master or memory I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
|
|
|
(+) End of abort process, HAL_I2C_AbortCpltCallback() is executed and user can
|
|
|
add his own code by customization of function pointer HAL_I2C_AbortCpltCallback()
|
|
|
|
|
|
@@ -139,7 +139,7 @@
|
|
|
or using HAL_I2C_Master_Seq_Receive_DMA()
|
|
|
(+++) At reception end of current frame transfer, HAL_I2C_MasterRxCpltCallback() is executed and user can
|
|
|
add his own code by customization of function pointer HAL_I2C_MasterRxCpltCallback()
|
|
|
- (++) Abort a master IT or DMA I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
|
|
|
+ (++) Abort a master or memory IT or DMA I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
|
|
|
(+++) End of abort process, HAL_I2C_AbortCpltCallback() is executed and user can
|
|
|
add his own code by customization of function pointer HAL_I2C_AbortCpltCallback()
|
|
|
(++) Enable/disable the Address listen mode in slave I2C mode using HAL_I2C_EnableListen_IT() HAL_I2C_DisableListen_IT()
|
|
|
@@ -193,7 +193,7 @@
|
|
|
add his own code by customization of function pointer HAL_I2C_SlaveRxCpltCallback()
|
|
|
(+) In case of transfer Error, HAL_I2C_ErrorCallback() function is executed and user can
|
|
|
add his own code by customization of function pointer HAL_I2C_ErrorCallback()
|
|
|
- (+) Abort a master I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
|
|
|
+ (+) Abort a master or memory I2C process communication with Interrupt using HAL_I2C_Master_Abort_IT()
|
|
|
(+) End of abort process, HAL_I2C_AbortCpltCallback() is executed and user can
|
|
|
add his own code by customization of function pointer HAL_I2C_AbortCpltCallback()
|
|
|
|
|
|
@@ -4713,7 +4713,7 @@ HAL_StatusTypeDef HAL_I2C_DisableListen_IT(I2C_HandleTypeDef *hi2c)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * @brief Abort a master I2C IT or DMA process communication with Interrupt.
|
|
|
+ * @brief Abort a master or memory I2C IT or DMA process communication with Interrupt.
|
|
|
* @param hi2c Pointer to a I2C_HandleTypeDef structure that contains
|
|
|
* the configuration information for the specified I2C.
|
|
|
* @param DevAddress Target device address: The device 7 bits address value
|
|
|
@@ -4729,7 +4729,8 @@ HAL_StatusTypeDef HAL_I2C_Master_Abort_IT(I2C_HandleTypeDef *hi2c, uint16_t DevA
|
|
|
UNUSED(DevAddress);
|
|
|
|
|
|
/* Abort Master transfer during Receive or Transmit process */
|
|
|
- if ((__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_BUSY) != RESET) && (CurrentMode == HAL_I2C_MODE_MASTER))
|
|
|
+ if ((__HAL_I2C_GET_FLAG(hi2c, I2C_FLAG_BUSY) != RESET) && ((CurrentMode == HAL_I2C_MODE_MASTER) ||
|
|
|
+ (CurrentMode == HAL_I2C_MODE_MEM)))
|
|
|
{
|
|
|
/* Process Locked */
|
|
|
__HAL_LOCK(hi2c);
|