From e8d941b2dfabf23985c4448de4c8acff5acdbeff Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Mon, 13 Nov 2023 18:09:32 +0100 Subject: [PATCH] Format code in lcd_api --- project/Core/Src/lcd_api.c | 40 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/project/Core/Src/lcd_api.c b/project/Core/Src/lcd_api.c index b0fcaf1..740e0c7 100644 --- a/project/Core/Src/lcd_api.c +++ b/project/Core/Src/lcd_api.c @@ -15,7 +15,7 @@ void lcd_init(bool bl_on) { BSP_LCD_Init(); BSP_LCD_LayerDefaultInit(1, LCD_FB_START_ADDRESS); - BSP_LCD_LayerDefaultInit(0, LCD_FB_START_ADDRESS + (BSP_LCD_GetXSize()*BSP_LCD_GetYSize()*4)); + BSP_LCD_LayerDefaultInit(0, LCD_FB_START_ADDRESS + (BSP_LCD_GetXSize() * BSP_LCD_GetYSize() * 4)); BSP_LCD_SelectLayer(0); BSP_LCD_Clear(LCD_COLOR_BLACK); BSP_LCD_SelectLayer(1); @@ -24,12 +24,12 @@ void lcd_init(bool bl_on) { HAL_GPIO_WritePin(GPIOK, GPIO_PIN_3, GPIO_PIN_SET); HAL_GPIO_WritePin(GPIOI, GPIO_PIN_12, GPIO_PIN_SET); } else { - HAL_GPIO_WritePin(GPIOK, GPIO_PIN_3, GPIO_PIN_RESET); - HAL_GPIO_WritePin(GPIOI, GPIO_PIN_12, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOK, GPIO_PIN_3, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOI, GPIO_PIN_12, GPIO_PIN_RESET); } } -void lcd_display_text(uint8_t* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT *font) { +void lcd_display_text(uint8_t* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT* font) { LOG_INFO(TAG, "Display text: %s @x=%d,y=%d", text, x_pos, y_pos); uint16_t tot_length = x_pos + (strlen(text) * font->Width); @@ -43,8 +43,8 @@ void lcd_display_text(uint8_t* text, uint16_t x_pos, uint16_t y_pos, uint32_t co if (tot_length > BSP_LCD_GetXSize()) { for (int i = 0; i < strlen(text); i++) { - if ((x_pos) > BSP_LCD_GetXSize() - (font->Width)*2) { - if (isalpha(text[i-1]) && isalpha(text[i])) { + if ((x_pos) > BSP_LCD_GetXSize() - (font->Width) * 2) { + if (isalpha(text[i - 1]) && isalpha(text[i])) { BSP_LCD_DisplayChar(x_pos, y_pos, '-'); i -= 1; } @@ -55,21 +55,23 @@ void lcd_display_text(uint8_t* text, uint16_t x_pos, uint16_t y_pos, uint32_t co x_pos += font->Width; } } - } else { - BSP_LCD_DisplayStringAt(x_pos, y_pos, text, LEFT_MODE); + return; } - + BSP_LCD_DisplayStringAt(x_pos, y_pos, text, LEFT_MODE); } -void lcd_draw_raw_img(const void* p_src, uint32_t x_pos, uint32_t y_pos, uint32_t x_size, uint32_t y_size, uint32_t color_mode) { +void lcd_draw_raw_img(const void* p_src, + uint32_t x_pos, + uint32_t y_pos, + uint32_t x_size, + uint32_t y_size, + uint32_t color_mode) { + uint32_t address = hLtdcHandler.LayerCfg[1].FBStartAdress + (((BSP_LCD_GetXSize() * y_pos) + x_pos) * (4)); + void* p_dst = (void*)address; - uint32_t address = hLtdcHandler.LayerCfg[1].FBStartAdress + (((BSP_LCD_GetXSize()*y_pos) + x_pos)*(4)); - void *p_dst = (void *)address; - - - hDma2dHandler2.Init.Mode = DMA2D_M2M_PFC; - hDma2dHandler2.Init.ColorMode = DMA2D_ARGB8888; - hDma2dHandler2.Init.OutputOffset = BSP_LCD_GetXSize()-x_size; + hDma2dHandler2.Init.Mode = DMA2D_M2M_PFC; + hDma2dHandler2.Init.ColorMode = DMA2D_ARGB8888; + hDma2dHandler2.Init.OutputOffset = BSP_LCD_GetXSize() - x_size; hDma2dHandler2.LayerCfg[1].AlphaMode = DMA2D_NO_MODIF_ALPHA; hDma2dHandler2.LayerCfg[1].InputAlpha = 0xFF; @@ -84,7 +86,7 @@ void lcd_draw_raw_img(const void* p_src, uint32_t x_pos, uint32_t y_pos, uint32_ } LOG_INFO(TAG, "DMA2D config layer"); if (HAL_DMA2D_ConfigLayer(&hDma2dHandler2, 1) != HAL_OK) { - LOG_CRIT(TAG, "HAL_DMA2D_ConfigLayer error"); + LOG_CRIT(TAG, "HAL_DMA2D_ConfigLayer error"); return; } LOG_INFO(TAG, "DMA2D start"); @@ -100,7 +102,7 @@ void lcd_draw_bmp_img(uint8_t* bmp_buff, uint32_t x_pos, uint32_t y_pos) { BSP_LCD_DrawBitmap(x_pos, y_pos, bmp_buff); } -void lcd_draw_img_from_fs_with_name(const char* name, uint32_t x_pos, uint32_t y_pos){ +void lcd_draw_img_from_fs_with_name(const char* name, uint32_t x_pos, uint32_t y_pos) { llfs_file_t* file = llfs_file_open(name); if (file != NULL) { BSP_LCD_DrawBitmap(x_pos, y_pos, file->data);