refactor: DMA2D and LTDC conversion to HAL/LL (#3036)
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
co-authored by
Peter Feerick
parent
d0ae5bd85c
commit
1af8b78256
@@ -76,6 +76,7 @@ if(PCB STREQUAL X10 OR PCB STREQUAL X12S OR PCB STREQUAL NV14)
|
||||
../../../../../fonts/lvgl/lv_font_roboto_bl_16.c
|
||||
../../../../../thirdparty/libopenui/src/bitmapbuffer.cpp
|
||||
../../../../../thirdparty/libopenui/thirdparty/lz4/lz4.c
|
||||
../../../../../targets/common/arm/stm32/dma2d.cpp
|
||||
../../../../../targets/common/arm/stm32/diskio_sdio.cpp
|
||||
../../../../../targets/common/arm/stm32/rtc_driver.cpp
|
||||
../../../../../targets/common/arm/stm32/diskio_spi_flash.cpp
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
/*
|
||||
* Copyright (C) EdgeTX
|
||||
*
|
||||
* Based on code named
|
||||
* opentx - https://github.com/opentx/opentx
|
||||
* th9x - http://code.google.com/p/th9x
|
||||
* er9x - http://code.google.com/p/er9x
|
||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||
*
|
||||
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include "stm32_hal_ll.h"
|
||||
|
||||
#include "definitions.h"
|
||||
#include "libopenui_defines.h"
|
||||
#include "dma2d.h"
|
||||
|
||||
void DMACopyBitmap(uint16_t *dest, uint16_t destw, uint16_t desth, uint16_t x,
|
||||
uint16_t y, const uint16_t *src, uint16_t srcw,
|
||||
uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w,
|
||||
uint16_t h)
|
||||
{
|
||||
DMAWait();
|
||||
|
||||
LL_DMA2D_DeInit(DMA2D);
|
||||
|
||||
LL_DMA2D_InitTypeDef DMA2D_InitStruct;
|
||||
LL_DMA2D_StructInit(&DMA2D_InitStruct);
|
||||
|
||||
DMA2D_InitStruct.Mode = LL_DMA2D_MODE_M2M;
|
||||
DMA2D_InitStruct.ColorMode = LL_DMA2D_OUTPUT_MODE_RGB565;
|
||||
DMA2D_InitStruct.OutputMemoryAddress = CONVERT_PTR_UINT(dest + y*destw + x);
|
||||
DMA2D_InitStruct.LineOffset = destw - w;
|
||||
DMA2D_InitStruct.NbrOfLines = h;
|
||||
DMA2D_InitStruct.NbrOfPixelsPerLines = w;
|
||||
LL_DMA2D_Init(DMA2D, &DMA2D_InitStruct);
|
||||
|
||||
LL_DMA2D_FGND_SetMemAddr(DMA2D, CONVERT_PTR_UINT(src + srcy*srcw + srcx));
|
||||
LL_DMA2D_FGND_SetLineOffset(DMA2D, srcw - w);
|
||||
LL_DMA2D_FGND_SetColorMode(DMA2D, LL_DMA2D_INPUT_MODE_RGB565);
|
||||
LL_DMA2D_FGND_SetAlphaMode(DMA2D, LL_DMA2D_ALPHA_MODE_NO_MODIF);
|
||||
LL_DMA2D_FGND_SetAlpha(DMA2D, 0);
|
||||
|
||||
/* Start Transfer */
|
||||
LL_DMA2D_Start(DMA2D);
|
||||
}
|
||||
|
||||
void DMACopyAlphaBitmap(uint16_t *dest, uint16_t destw, uint16_t desth,
|
||||
uint16_t x, uint16_t y, const uint16_t *src,
|
||||
uint16_t srcw, uint16_t srch, uint16_t srcx,
|
||||
uint16_t srcy, uint16_t w, uint16_t h)
|
||||
{
|
||||
DMAWait();
|
||||
LL_DMA2D_DeInit(DMA2D);
|
||||
|
||||
LL_DMA2D_InitTypeDef DMA2D_InitStruct;
|
||||
LL_DMA2D_StructInit(&DMA2D_InitStruct);
|
||||
|
||||
DMA2D_InitStruct.Mode = LL_DMA2D_MODE_M2M_BLEND;
|
||||
DMA2D_InitStruct.ColorMode = LL_DMA2D_OUTPUT_MODE_RGB565;
|
||||
DMA2D_InitStruct.OutputMemoryAddress = CONVERT_PTR_UINT(dest + y*destw + x);
|
||||
DMA2D_InitStruct.LineOffset = destw - w;
|
||||
DMA2D_InitStruct.NbrOfLines = h;
|
||||
DMA2D_InitStruct.NbrOfPixelsPerLines = w;
|
||||
LL_DMA2D_Init(DMA2D, &DMA2D_InitStruct);
|
||||
|
||||
LL_DMA2D_FGND_SetMemAddr(DMA2D, CONVERT_PTR_UINT(src + srcy*srcw + srcx));
|
||||
LL_DMA2D_FGND_SetLineOffset(DMA2D, srcw - w);
|
||||
LL_DMA2D_FGND_SetColorMode(DMA2D, LL_DMA2D_INPUT_MODE_ARGB4444);
|
||||
LL_DMA2D_FGND_SetAlphaMode(DMA2D, LL_DMA2D_ALPHA_MODE_NO_MODIF);
|
||||
LL_DMA2D_FGND_SetAlpha(DMA2D, 0);
|
||||
|
||||
LL_DMA2D_BGND_SetMemAddr(DMA2D, CONVERT_PTR_UINT(dest + y*destw + x));
|
||||
LL_DMA2D_BGND_SetLineOffset(DMA2D, destw - w);
|
||||
LL_DMA2D_BGND_SetColorMode(DMA2D, LL_DMA2D_OUTPUT_MODE_RGB565);
|
||||
LL_DMA2D_BGND_SetAlphaMode(DMA2D, LL_DMA2D_ALPHA_MODE_NO_MODIF);
|
||||
LL_DMA2D_BGND_SetAlpha(DMA2D, 0);
|
||||
|
||||
/* Start Transfer */
|
||||
LL_DMA2D_Start(DMA2D);
|
||||
}
|
||||
|
||||
// same as DMACopyAlphaBitmap(), but with an 8 bit mask for each pixel (used by fonts)
|
||||
void DMACopyAlphaMask(uint16_t *dest, uint16_t destw, uint16_t desth,
|
||||
uint16_t x, uint16_t y, const uint8_t *src, uint16_t srcw,
|
||||
uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w,
|
||||
uint16_t h, uint16_t bg_color)
|
||||
{
|
||||
DMAWait();
|
||||
LL_DMA2D_DeInit(DMA2D);
|
||||
|
||||
LL_DMA2D_InitTypeDef DMA2D_InitStruct;
|
||||
LL_DMA2D_StructInit(&DMA2D_InitStruct);
|
||||
|
||||
DMA2D_InitStruct.Mode = LL_DMA2D_MODE_M2M_BLEND;
|
||||
DMA2D_InitStruct.ColorMode = LL_DMA2D_OUTPUT_MODE_RGB565;
|
||||
DMA2D_InitStruct.OutputMemoryAddress = CONVERT_PTR_UINT(dest + y*destw + x);
|
||||
DMA2D_InitStruct.LineOffset = destw - w;
|
||||
DMA2D_InitStruct.NbrOfLines = h;
|
||||
DMA2D_InitStruct.NbrOfPixelsPerLines = w;
|
||||
LL_DMA2D_Init(DMA2D, &DMA2D_InitStruct);
|
||||
|
||||
LL_DMA2D_FGND_SetMemAddr(DMA2D, CONVERT_PTR_UINT(src + srcy*srcw + srcx));
|
||||
LL_DMA2D_FGND_SetLineOffset(DMA2D, srcw - w);
|
||||
LL_DMA2D_FGND_SetColorMode(DMA2D, LL_DMA2D_INPUT_MODE_A8);
|
||||
LL_DMA2D_FGND_SetAlphaMode(DMA2D, LL_DMA2D_ALPHA_MODE_NO_MODIF);
|
||||
LL_DMA2D_FGND_SetAlpha(DMA2D, 0);
|
||||
LL_DMA2D_FGND_SetRedColor(DMA2D, GET_RED(bg_color)); // 8 bit red
|
||||
LL_DMA2D_FGND_SetGreenColor(DMA2D, GET_GREEN(bg_color)); // 8 bit green
|
||||
LL_DMA2D_FGND_SetBlueColor(DMA2D, GET_BLUE(bg_color)); // 8 bit blue
|
||||
|
||||
LL_DMA2D_BGND_SetMemAddr(DMA2D, CONVERT_PTR_UINT(dest + y*destw + x));
|
||||
LL_DMA2D_BGND_SetLineOffset(DMA2D, destw - w);
|
||||
LL_DMA2D_BGND_SetColorMode(DMA2D, LL_DMA2D_OUTPUT_MODE_RGB565);
|
||||
LL_DMA2D_BGND_SetAlphaMode(DMA2D, LL_DMA2D_ALPHA_MODE_NO_MODIF);
|
||||
LL_DMA2D_BGND_SetAlpha(DMA2D, 0);
|
||||
|
||||
/* Start Transfer */
|
||||
LL_DMA2D_Start(DMA2D);
|
||||
DMAWait();
|
||||
}
|
||||
|
||||
void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t h, uint32_t format)
|
||||
{
|
||||
DMAWait();
|
||||
LL_DMA2D_DeInit(DMA2D);
|
||||
|
||||
LL_DMA2D_InitTypeDef DMA2D_InitStruct;
|
||||
LL_DMA2D_StructInit(&DMA2D_InitStruct);
|
||||
|
||||
DMA2D_InitStruct.Mode = LL_DMA2D_MODE_M2M_PFC;
|
||||
DMA2D_InitStruct.ColorMode = format;
|
||||
DMA2D_InitStruct.OutputMemoryAddress = CONVERT_PTR_UINT(dest);
|
||||
DMA2D_InitStruct.NbrOfLines = h;
|
||||
DMA2D_InitStruct.NbrOfPixelsPerLines = w;
|
||||
LL_DMA2D_Init(DMA2D, &DMA2D_InitStruct);
|
||||
|
||||
LL_DMA2D_FGND_SetMemAddr(DMA2D, CONVERT_PTR_UINT(src));
|
||||
LL_DMA2D_FGND_SetLineOffset(DMA2D, 0);
|
||||
LL_DMA2D_FGND_SetColorMode(DMA2D, LL_DMA2D_INPUT_MODE_ARGB8888);
|
||||
LL_DMA2D_FGND_SetAlphaMode(DMA2D, LL_DMA2D_ALPHA_MODE_REPLACE);
|
||||
LL_DMA2D_FGND_SetAlpha(DMA2D, 0);
|
||||
|
||||
/* Start Transfer */
|
||||
LL_DMA2D_Start(DMA2D);
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright (C) EdgeTX
|
||||
*
|
||||
* Based on code named
|
||||
* opentx - https://github.com/opentx/opentx
|
||||
* th9x - http://code.google.com/p/th9x
|
||||
* er9x - http://code.google.com/p/er9x
|
||||
* gruvin9x - http://code.google.com/p/gruvin9x
|
||||
*
|
||||
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "opentx_types.h"
|
||||
|
||||
#if !defined(SIMU)
|
||||
static inline void DMAWait()
|
||||
{
|
||||
while(DMA2D->CR & DMA2D_CR_START);
|
||||
}
|
||||
#else
|
||||
static inline void DMAWait() {}
|
||||
#endif
|
||||
|
||||
void DMAFillRect(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t color);
|
||||
void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
||||
void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
||||
void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint8_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h, uint16_t bg_color);
|
||||
void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t h, uint32_t format);
|
||||
@@ -6,6 +6,14 @@ if(NOT NATIVE_BUILD)
|
||||
# STM32 HAL/LL library
|
||||
set(STM32CUBE_DIR ${THIRDPARTY_DIR}/STM32F4xx_HAL_Driver)
|
||||
include_directories(${STM32CUBE_DIR}/Inc)
|
||||
|
||||
if(CPU_TYPE_FULL STREQUAL STM32F429xI)
|
||||
set(STM32_COLORLCD_DRIVERS
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_ll_dma2d.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_ltdc.c
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
add_library(stm32cube_ll OBJECT EXCLUDE_FROM_ALL
|
||||
# LL drivers
|
||||
@@ -23,11 +31,16 @@ if(NOT NATIVE_BUILD)
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_pwr.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_pwr_ex.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_rcc.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_rcc_ex.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_rtc.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_i2c.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_i2c_ex.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_sd.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_dma.c
|
||||
${STM32CUBE_DIR}/Src/stm32f4xx_hal_cortex.c
|
||||
|
||||
${STM32_COLORLCD_DRIVERS}
|
||||
|
||||
)
|
||||
|
||||
target_compile_options(stm32cube_ll PRIVATE -DUSE_FULL_LL_DRIVER)
|
||||
@@ -62,9 +75,7 @@ if(CPU_TYPE_FULL STREQUAL STM32F429xI)
|
||||
set(STM32_STDPERIPH_SRC ${STM32_STDPERIPH_SRC}
|
||||
targets/${TARGET_DIR}/startup_stm32f42_43xxx.s
|
||||
${STM32_STDPERIPH_DIR}/src/stm32f4xx_fmc.c
|
||||
${STM32_STDPERIPH_DIR}/src/stm32f4xx_ltdc.c
|
||||
${STM32_STDPERIPH_DIR}/src/stm32f4xx_dma.c
|
||||
${STM32_STDPERIPH_DIR}/src/stm32f4xx_dma2d.c
|
||||
)
|
||||
elseif (CPU_TYPE_FULL STREQUAL STM32F413xG)
|
||||
set(STM32_STDPERIPH_SRC ${STM32_STDPERIPH_SRC}
|
||||
|
||||
@@ -30,6 +30,7 @@ extern "C" {
|
||||
#define USE_FULL_LL_DRIVER
|
||||
#if defined(STM32F4)
|
||||
#include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_bus.h"
|
||||
#include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma2d.h"
|
||||
#include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_gpio.h"
|
||||
#include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_tim.h"
|
||||
#include "STM32F4xx_HAL_Driver/Inc/stm32f4xx_ll_dma.h"
|
||||
|
||||
@@ -62,7 +62,9 @@
|
||||
// #define HAL_SMBUS_MODULE_ENABLED
|
||||
// #define HAL_I2S_MODULE_ENABLED
|
||||
// #define HAL_IWDG_MODULE_ENABLED
|
||||
// #define HAL_LTDC_MODULE_ENABLED
|
||||
#if defined(COLORLCD)
|
||||
#define HAL_LTDC_MODULE_ENABLED
|
||||
#endif
|
||||
// #define HAL_DSI_MODULE_ENABLED
|
||||
#define HAL_PWR_MODULE_ENABLED
|
||||
// #define HAL_QSPI_MODULE_ENABLED
|
||||
@@ -78,7 +80,7 @@
|
||||
// #define HAL_IRDA_MODULE_ENABLED
|
||||
// #define HAL_SMARTCARD_MODULE_ENABLED
|
||||
// #define HAL_WWDG_MODULE_ENABLED
|
||||
// #define HAL_CORTEX_MODULE_ENABLED
|
||||
#define HAL_CORTEX_MODULE_ENABLED
|
||||
// #define HAL_PCD_MODULE_ENABLED
|
||||
// #define HAL_HCD_MODULE_ENABLED
|
||||
// #define HAL_FMPI2C_MODULE_ENABLED
|
||||
|
||||
Reference in New Issue
Block a user