FaSTTUBe/steering-wheel
52
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to CubeMX 6.14.0, FW_H7 1.12.1

Browse Source
This commit is contained in:
Leonard Gies
2025-04-01 23:59:23 +02:00
parent 5c441a87cd
commit 4ed2283fc9
280 changed files with 16378 additions and 6476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_swpmi.c
View File

@ -131,7 +131,7 @@
and a pointer to the user callback function.
[..]
Use function HAL_SWPMI_UnRegisterCallback() to reset a callback to the default
weak (surcharged) function.
weak (overridden) function.
HAL_SWPMI_UnRegisterCallback() takes as parameters the HAL peripheral handle,
and the callback ID.
This function allows to reset following callbacks:
@ -144,10 +144,10 @@
(+) MspDeInitCallback : SWPMI MspDeInit.
[..]
By default, after the HAL_SWPMI_Init and if the state is HAL_SWPMI_STATE_RESET
all callbacks are reset to the corresponding legacy weak (surcharged) functions:
all callbacks are reset to the corresponding legacy weak functions:
examples HAL_SWPMI_RxCpltCallback(), HAL_SWPMI_ErrorCallback().
Exception done for MspInit and MspDeInit callbacks that are respectively
reset to the legacy weak (surcharged) functions in the HAL_SWPMI_Init
reset to the legacy weak functions in the HAL_SWPMI_Init
and HAL_SWPMI_DeInit only when these callbacks are null (not registered beforehand).
If not, MspInit or MspDeInit are not null, the HAL_SWPMI_Init and HAL_SWPMI_DeInit
keep and use the user MspInit/MspDeInit callbacks (registered beforehand).
@ -162,7 +162,7 @@
[..]
When the compilation define USE_HAL_SWPMI_REGISTER_CALLBACKS is set to 0 or
not defined, the callback registering feature is not available
and weak (surcharged) callbacks are used.
and weak callbacks are used.
@endverbatim
*/
@ -208,7 +208,8 @@ static void SWPMI_EndTransmit_IT(SWPMI_HandleTypeDef *hswpmi);
static void SWPMI_Receive_IT(SWPMI_HandleTypeDef *hswpmi);
static void SWPMI_EndReceive_IT(SWPMI_HandleTypeDef *hswpmi);
static void SWPMI_EndTransmitReceive_IT(SWPMI_HandleTypeDef *hswpmi);
static HAL_StatusTypeDef SWPMI_WaitOnFlagSetUntilTimeout(SWPMI_HandleTypeDef *hswpmi, uint32_t Flag, uint32_t Tickstart, uint32_t Timeout);
static HAL_StatusTypeDef SWPMI_WaitOnFlagSetUntilTimeout(SWPMI_HandleTypeDef *hswpmi, uint32_t Flag, uint32_t Tickstart,
uint32_t Timeout);
/* Exported functions --------------------------------------------------------*/
@ -276,7 +277,7 @@ HAL_StatusTypeDef HAL_SWPMI_Init(SWPMI_HandleTypeDef *hswpmi)
#else
/* Init the low level hardware : GPIO, CLOCK, NVIC and DMA */
HAL_SWPMI_MspInit(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
hswpmi->State = HAL_SWPMI_STATE_BUSY;
@ -302,7 +303,8 @@ HAL_StatusTypeDef HAL_SWPMI_Init(SWPMI_HandleTypeDef *hswpmi)
/* Enable the SWPMI transceiver */
SET_BIT(hswpmi->Instance->CR, SWPMI_CR_SWPEN);
/* Wait on RDYF flag to activate SWPMI */
if (SWPMI_WaitOnFlagSetUntilTimeout(hswpmi, SWPMI_FLAG_RDYF, tickstart, SWPMI_TRANSCEIVER_RDY_TIMEOUT_VALUE) != HAL_OK)
if (SWPMI_WaitOnFlagSetUntilTimeout(hswpmi, SWPMI_FLAG_RDYF, tickstart,
SWPMI_TRANSCEIVER_RDY_TIMEOUT_VALUE) != HAL_OK)
{
status = HAL_TIMEOUT;
}
@ -365,7 +367,7 @@ HAL_StatusTypeDef HAL_SWPMI_DeInit(SWPMI_HandleTypeDef *hswpmi)
hswpmi->MspDeInitCallback(hswpmi);
#else
HAL_SWPMI_MspDeInit(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
hswpmi->ErrorCode = HAL_SWPMI_ERROR_NONE;
hswpmi->State = HAL_SWPMI_STATE_RESET;
@ -410,7 +412,7 @@ __weak void HAL_SWPMI_MspDeInit(SWPMI_HandleTypeDef *hswpmi)
#if (USE_HAL_SWPMI_REGISTER_CALLBACKS == 1)
/**
* @brief Register a user SWPMI callback
* to be used instead of the weak predefined callback.
* To be used to override the weak predefined callback.
* @param hswpmi SWPMI handle.
* @param CallbackID ID of the callback to be registered.
* This parameter can be one of the following values:
@ -503,7 +505,7 @@ HAL_StatusTypeDef HAL_SWPMI_RegisterCallback(SWPMI_HandleTypeDef *hswpmi,
/**
* @brief Unregister a user SWPMI callback.
* SWPMI callback is redirected to the weak predefined callback.
* Callback is redirected to the weak predefined callback.
* @param hswpmi SWPMI handle.
* @param CallbackID ID of the callback to be unregistered.
* This parameter can be one of the following values:
@ -651,12 +653,13 @@ HAL_StatusTypeDef HAL_SWPMI_UnRegisterCallback(SWPMI_HandleTypeDef *hswpm
* @param Timeout Timeout duration
* @retval HAL status
*/
HAL_StatusTypeDef HAL_SWPMI_Transmit(SWPMI_HandleTypeDef *hswpmi, uint32_t *pData, uint16_t Size, uint32_t Timeout)
HAL_StatusTypeDef HAL_SWPMI_Transmit(SWPMI_HandleTypeDef *hswpmi, const uint32_t *pData, uint16_t Size,
uint32_t Timeout)
{
uint32_t tickstart = HAL_GetTick();
HAL_StatusTypeDef status = HAL_OK;
HAL_SWPMI_StateTypeDef tmp_state;
uint32_t *ptmp_data;
const uint32_t *ptmp_data;
uint32_t tmp_size;
if ((pData == NULL) || (Size == 0U))
@ -713,8 +716,7 @@ HAL_StatusTypeDef HAL_SWPMI_Transmit(SWPMI_HandleTypeDef *hswpmi, uint32_t *pDat
}
}
}
}
while (tmp_size != 0U);
} while (tmp_size != 0U);
/* Wait on TXBEF flag to be able to start a second transfer */
if (SWPMI_WaitOnFlagSetUntilTimeout(hswpmi, SWPMI_FLAG_TXBEF, tickstart, Timeout) != HAL_OK)
@ -789,7 +791,8 @@ HAL_StatusTypeDef HAL_SWPMI_Receive(SWPMI_HandleTypeDef *hswpmi, uint32_t *pData
hswpmi->State = HAL_SWPMI_STATE_BUSY_RX;
/* Disable any receiver interrupts */
CLEAR_BIT(hswpmi->Instance->IER, SWPMI_IT_SRIE | SWPMI_IT_RIE | SWPMI_IT_RXBERIE | SWPMI_IT_RXOVRIE | SWPMI_IT_RXBFIE);
CLEAR_BIT(hswpmi->Instance->IER,
SWPMI_IT_SRIE | SWPMI_IT_RIE | SWPMI_IT_RXBERIE | SWPMI_IT_RXOVRIE | SWPMI_IT_RXBFIE);
/* Enable SWPMI peripheral if not */
SET_BIT(hswpmi->Instance->CR, SWPMI_CR_SWPACT);
@ -822,8 +825,7 @@ HAL_StatusTypeDef HAL_SWPMI_Receive(SWPMI_HandleTypeDef *hswpmi, uint32_t *pData
}
}
}
}
while (tmp_size != 0U);
} while (tmp_size != 0U);
if (status == HAL_OK)
{
@ -868,7 +870,7 @@ HAL_StatusTypeDef HAL_SWPMI_Receive(SWPMI_HandleTypeDef *hswpmi, uint32_t *pData
* @param Size Amount of data to be sent
* @retval HAL status
*/
HAL_StatusTypeDef HAL_SWPMI_Transmit_IT(SWPMI_HandleTypeDef *hswpmi, uint32_t *pData, uint16_t Size)
HAL_StatusTypeDef HAL_SWPMI_Transmit_IT(SWPMI_HandleTypeDef *hswpmi, const uint32_t *pData, uint16_t Size)
{
HAL_StatusTypeDef status = HAL_OK;
HAL_SWPMI_StateTypeDef tmp_state;
@ -998,7 +1000,7 @@ HAL_StatusTypeDef HAL_SWPMI_Receive_IT(SWPMI_HandleTypeDef *hswpmi, uint32_t *pD
* @param Size Amount of data to be sent
* @retval HAL status
*/
HAL_StatusTypeDef HAL_SWPMI_Transmit_DMA(SWPMI_HandleTypeDef *hswpmi, uint32_t *pData, uint16_t Size)
HAL_StatusTypeDef HAL_SWPMI_Transmit_DMA(SWPMI_HandleTypeDef *hswpmi, const uint32_t *pData, uint16_t Size)
{
HAL_StatusTypeDef status = HAL_OK;
HAL_SWPMI_StateTypeDef tmp_state;
@ -1044,7 +1046,8 @@ HAL_StatusTypeDef HAL_SWPMI_Transmit_DMA(SWPMI_HandleTypeDef *hswpmi, uint32_t *
hswpmi->hdmatx->XferErrorCallback = SWPMI_DMAError;
/* Enable the SWPMI transmit DMA stream */
if (HAL_DMA_Start_IT(hswpmi->hdmatx, (uint32_t)hswpmi->pTxBuffPtr, (uint32_t)&hswpmi->Instance->TDR, Size) != HAL_OK)
if (HAL_DMA_Start_IT(hswpmi->hdmatx, (uint32_t)hswpmi->pTxBuffPtr,
(uint32_t)&hswpmi->Instance->TDR, Size) != HAL_OK)
{
hswpmi->State = tmp_state; /* Back to previous state */
hswpmi->ErrorCode = HAL_SWPMI_ERROR_DMA;
@ -1130,7 +1133,8 @@ HAL_StatusTypeDef HAL_SWPMI_Receive_DMA(SWPMI_HandleTypeDef *hswpmi, uint32_t *p
hswpmi->hdmarx->XferErrorCallback = SWPMI_DMAError;
/* Enable the DMA request */
if (HAL_DMA_Start_IT(hswpmi->hdmarx, (uint32_t)&hswpmi->Instance->RDR, (uint32_t)hswpmi->pRxBuffPtr, Size) != HAL_OK)
if (HAL_DMA_Start_IT(hswpmi->hdmarx, (uint32_t)&hswpmi->Instance->RDR,
(uint32_t)hswpmi->pRxBuffPtr, Size) != HAL_OK)
{
hswpmi->State = tmp_state; /* Back to previous state */
hswpmi->ErrorCode = HAL_SWPMI_ERROR_DMA;
@ -1271,8 +1275,8 @@ HAL_StatusTypeDef HAL_SWPMI_DisableLoopback(SWPMI_HandleTypeDef *hswpmi)
*/
/** @defgroup SWPMI_Exported_Group3 SWPMI IRQ handler and callbacks
* @brief SWPMI IRQ handler.
*
* @brief SWPMI IRQ handler.
*
@verbatim
==============================================================================
##### SWPMI IRQ handler and callbacks #####
@ -1363,7 +1367,7 @@ void HAL_SWPMI_IRQHandler(SWPMI_HandleTypeDef *hswpmi)
hswpmi->ErrorCallback(hswpmi);
#else
HAL_SWPMI_ErrorCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
}
else
@ -1375,7 +1379,7 @@ void HAL_SWPMI_IRQHandler(SWPMI_HandleTypeDef *hswpmi)
hswpmi->ErrorCallback(hswpmi);
#else
HAL_SWPMI_ErrorCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
}
else
@ -1408,7 +1412,7 @@ void HAL_SWPMI_IRQHandler(SWPMI_HandleTypeDef *hswpmi)
hswpmi->ErrorCallback(hswpmi);
#else
HAL_SWPMI_ErrorCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
}
else
@ -1420,7 +1424,7 @@ void HAL_SWPMI_IRQHandler(SWPMI_HandleTypeDef *hswpmi)
hswpmi->ErrorCallback(hswpmi);
#else
HAL_SWPMI_ErrorCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
}
}
@ -1555,19 +1559,19 @@ __weak void HAL_SWPMI_ErrorCallback(SWPMI_HandleTypeDef *hswpmi)
* @param hswpmi SWPMI handle
* @retval HAL state
*/
HAL_SWPMI_StateTypeDef HAL_SWPMI_GetState(SWPMI_HandleTypeDef *hswpmi)
HAL_SWPMI_StateTypeDef HAL_SWPMI_GetState(const SWPMI_HandleTypeDef *hswpmi)
{
/* Return SWPMI handle state */
return hswpmi->State;
}
/**
* @brief Return the SWPMI error code.
* @param hswpmi : pointer to a SWPMI_HandleTypeDef structure that contains
* @brief Return the SWPMI error code.
* @param hswpmi : pointer to a SWPMI_HandleTypeDef structure that contains
* the configuration information for the specified SWPMI.
* @retval SWPMI Error Code
*/
uint32_t HAL_SWPMI_GetError(SWPMI_HandleTypeDef *hswpmi)
* @retval SWPMI Error Code
*/
uint32_t HAL_SWPMI_GetError(const SWPMI_HandleTypeDef *hswpmi)
{
return hswpmi->ErrorCode;
}
@ -1642,7 +1646,7 @@ static void SWPMI_EndTransmit_IT(SWPMI_HandleTypeDef *hswpmi)
hswpmi->TxCpltCallback(hswpmi);
#else
HAL_SWPMI_TxCpltCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
/**
@ -1668,7 +1672,7 @@ static void SWPMI_Receive_IT(SWPMI_HandleTypeDef *hswpmi)
hswpmi->RxCpltCallback(hswpmi);
#else
HAL_SWPMI_RxCpltCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
}
else
@ -1759,7 +1763,7 @@ static void SWPMI_DMATransmitCplt(DMA_HandleTypeDef *hdma)
hswpmi->ErrorCallback(hswpmi);
#else
HAL_SWPMI_ErrorCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
else
{
@ -1778,7 +1782,7 @@ static void SWPMI_DMATransmitCplt(DMA_HandleTypeDef *hdma)
hswpmi->TxCpltCallback(hswpmi);
#else
HAL_SWPMI_TxCpltCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
}
/* DMA Circular mode */
@ -1788,7 +1792,7 @@ static void SWPMI_DMATransmitCplt(DMA_HandleTypeDef *hdma)
hswpmi->TxCpltCallback(hswpmi);
#else
HAL_SWPMI_TxCpltCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
}
@ -1805,7 +1809,7 @@ static void SWPMI_DMATxHalfCplt(DMA_HandleTypeDef *hdma)
hswpmi->TxHalfCpltCallback(hswpmi);
#else
HAL_SWPMI_TxHalfCpltCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
@ -1841,7 +1845,7 @@ static void SWPMI_DMAReceiveCplt(DMA_HandleTypeDef *hdma)
hswpmi->RxCpltCallback(hswpmi);
#else
HAL_SWPMI_RxCpltCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
/**
@ -1857,7 +1861,7 @@ static void SWPMI_DMARxHalfCplt(DMA_HandleTypeDef *hdma)
hswpmi->RxHalfCpltCallback(hswpmi);
#else
HAL_SWPMI_RxHalfCpltCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
/**
@ -1879,7 +1883,7 @@ static void SWPMI_DMAError(DMA_HandleTypeDef *hdma)
hswpmi->ErrorCallback(hswpmi);
#else
HAL_SWPMI_ErrorCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
/**
@ -1900,7 +1904,7 @@ static void SWPMI_DMAAbortOnError(DMA_HandleTypeDef *hdma)
hswpmi->ErrorCallback(hswpmi);
#else
HAL_SWPMI_ErrorCallback(hswpmi);
#endif
#endif /* USE_HAL_SWPMI_REGISTER_CALLBACKS */
}
/**
@ -1911,7 +1915,8 @@ static void SWPMI_DMAAbortOnError(DMA_HandleTypeDef *hdma)
* @param Timeout timeout duration.
* @retval HAL status
*/
static HAL_StatusTypeDef SWPMI_WaitOnFlagSetUntilTimeout(SWPMI_HandleTypeDef *hswpmi, uint32_t Flag, uint32_t Tickstart, uint32_t Timeout)
static HAL_StatusTypeDef SWPMI_WaitOnFlagSetUntilTimeout(SWPMI_HandleTypeDef *hswpmi, uint32_t Flag, uint32_t Tickstart,
uint32_t Timeout)
{
HAL_StatusTypeDef status = HAL_OK;