update to CubeMX 6.14.0, FW_H7 1.12.1
This commit is contained in:
@ -279,24 +279,20 @@ HAL_StatusTypeDef HAL_LTDC_Init(LTDC_HandleTypeDef *hltdc)
|
||||
hltdc->Init.DEPolarity | hltdc->Init.PCPolarity);
|
||||
|
||||
/* Set Synchronization size */
|
||||
hltdc->Instance->SSCR &= ~(LTDC_SSCR_VSH | LTDC_SSCR_HSW);
|
||||
tmp = (hltdc->Init.HorizontalSync << 16U);
|
||||
hltdc->Instance->SSCR |= (tmp | hltdc->Init.VerticalSync);
|
||||
WRITE_REG(hltdc->Instance->SSCR, (tmp | hltdc->Init.VerticalSync));
|
||||
|
||||
/* Set Accumulated Back porch */
|
||||
hltdc->Instance->BPCR &= ~(LTDC_BPCR_AVBP | LTDC_BPCR_AHBP);
|
||||
tmp = (hltdc->Init.AccumulatedHBP << 16U);
|
||||
hltdc->Instance->BPCR |= (tmp | hltdc->Init.AccumulatedVBP);
|
||||
WRITE_REG(hltdc->Instance->BPCR, (tmp | hltdc->Init.AccumulatedVBP));
|
||||
|
||||
/* Set Accumulated Active Width */
|
||||
hltdc->Instance->AWCR &= ~(LTDC_AWCR_AAH | LTDC_AWCR_AAW);
|
||||
tmp = (hltdc->Init.AccumulatedActiveW << 16U);
|
||||
hltdc->Instance->AWCR |= (tmp | hltdc->Init.AccumulatedActiveH);
|
||||
WRITE_REG(hltdc->Instance->AWCR, (tmp | hltdc->Init.AccumulatedActiveH));
|
||||
|
||||
/* Set Total Width */
|
||||
hltdc->Instance->TWCR &= ~(LTDC_TWCR_TOTALH | LTDC_TWCR_TOTALW);
|
||||
tmp = (hltdc->Init.TotalWidth << 16U);
|
||||
hltdc->Instance->TWCR |= (tmp | hltdc->Init.TotalHeigh);
|
||||
WRITE_REG(hltdc->Instance->TWCR, (tmp | hltdc->Init.TotalHeigh));
|
||||
|
||||
/* Set the background color value */
|
||||
tmp = ((uint32_t)(hltdc->Init.Backcolor.Green) << 8U);
|
||||
@ -916,11 +912,12 @@ HAL_StatusTypeDef HAL_LTDC_ConfigColorKeying(LTDC_HandleTypeDef *hltdc, uint32_t
|
||||
* LTDC_LAYER_1 (0) or LTDC_LAYER_2 (1)
|
||||
* @retval HAL status
|
||||
*/
|
||||
HAL_StatusTypeDef HAL_LTDC_ConfigCLUT(LTDC_HandleTypeDef *hltdc, uint32_t *pCLUT, uint32_t CLUTSize, uint32_t LayerIdx)
|
||||
HAL_StatusTypeDef HAL_LTDC_ConfigCLUT(LTDC_HandleTypeDef *hltdc, const uint32_t *pCLUT, uint32_t CLUTSize,
|
||||
uint32_t LayerIdx)
|
||||
{
|
||||
uint32_t tmp;
|
||||
uint32_t counter;
|
||||
uint32_t *pcolorlut = pCLUT;
|
||||
const uint32_t *pcolorlut = pCLUT;
|
||||
/* Check the parameters */
|
||||
assert_param(IS_LTDC_LAYER(LayerIdx));
|
||||
|
||||
@ -2092,7 +2089,7 @@ HAL_StatusTypeDef HAL_LTDC_DisableCLUT_NoReload(LTDC_HandleTypeDef *hltdc, uint3
|
||||
* the configuration information for the LTDC.
|
||||
* @retval HAL state
|
||||
*/
|
||||
HAL_LTDC_StateTypeDef HAL_LTDC_GetState(LTDC_HandleTypeDef *hltdc)
|
||||
HAL_LTDC_StateTypeDef HAL_LTDC_GetState(const LTDC_HandleTypeDef *hltdc)
|
||||
{
|
||||
return hltdc->State;
|
||||
}
|
||||
@ -2103,7 +2100,7 @@ HAL_LTDC_StateTypeDef HAL_LTDC_GetState(LTDC_HandleTypeDef *hltdc)
|
||||
* the configuration information for the LTDC.
|
||||
* @retval LTDC Error Code
|
||||
*/
|
||||
uint32_t HAL_LTDC_GetError(LTDC_HandleTypeDef *hltdc)
|
||||
uint32_t HAL_LTDC_GetError(const LTDC_HandleTypeDef *hltdc)
|
||||
{
|
||||
return hltdc->ErrorCode;
|
||||
}
|
||||
@ -2154,9 +2151,7 @@ static void LTDC_SetConfig(LTDC_HandleTypeDef *hltdc, LTDC_LayerCfgTypeDef *pLay
|
||||
tmp = ((uint32_t)(pLayerCfg->Backcolor.Green) << 8U);
|
||||
tmp1 = ((uint32_t)(pLayerCfg->Backcolor.Red) << 16U);
|
||||
tmp2 = (pLayerCfg->Alpha0 << 24U);
|
||||
LTDC_LAYER(hltdc, LayerIdx)->DCCR &= ~(LTDC_LxDCCR_DCBLUE | LTDC_LxDCCR_DCGREEN | LTDC_LxDCCR_DCRED |
|
||||
LTDC_LxDCCR_DCALPHA);
|
||||
LTDC_LAYER(hltdc, LayerIdx)->DCCR = (pLayerCfg->Backcolor.Blue | tmp | tmp1 | tmp2);
|
||||
WRITE_REG(LTDC_LAYER(hltdc, LayerIdx)->DCCR, (pLayerCfg->Backcolor.Blue | tmp | tmp1 | tmp2));
|
||||
|
||||
/* Specifies the constant alpha value */
|
||||
LTDC_LAYER(hltdc, LayerIdx)->CACR &= ~(LTDC_LxCACR_CONSTA);
|
||||
@ -2167,8 +2162,7 @@ static void LTDC_SetConfig(LTDC_HandleTypeDef *hltdc, LTDC_LayerCfgTypeDef *pLay
|
||||
LTDC_LAYER(hltdc, LayerIdx)->BFCR = (pLayerCfg->BlendingFactor1 | pLayerCfg->BlendingFactor2);
|
||||
|
||||
/* Configure the color frame buffer start address */
|
||||
LTDC_LAYER(hltdc, LayerIdx)->CFBAR &= ~(LTDC_LxCFBAR_CFBADD);
|
||||
LTDC_LAYER(hltdc, LayerIdx)->CFBAR = (pLayerCfg->FBStartAdress);
|
||||
WRITE_REG(LTDC_LAYER(hltdc, LayerIdx)->CFBAR, pLayerCfg->FBStartAdress);
|
||||
|
||||
if (pLayerCfg->PixelFormat == LTDC_PIXEL_FORMAT_ARGB8888)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user