EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STM32: Fixed ltdc_setup_windowing helper

Browse Source
This commit is contained in:
Bastian de Byl
2021-07-17 19:07:47 -04:00
committed by Karl Palsson
parent 470a1394a8
commit 6763681c26
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/libopencm3/stm32/common/ltdc_common_f47.h
View File

@@ -109,9 +109,15 @@
#define LTDC_L1CLUTWR LTDC_LxCLUTWR(LTDC_LAYER_1)
#define LTDC_L2CLUTWR LTDC_LxCLUTWR(LTDC_LAYER_2)
/* LTDC layer base addresses (for API parameters) */
/** @defgroup ltdc_layer_num LTDC Layer Number
@ingroup STM32F4xx_ltdc_defines
@{*/
#define LTDC_LAYER_1 1
#define LTDC_LAYER_2 2
/**@}*/
/* --- LTDC_SSCR values ---------------------------------------------------- */
@@ -500,7 +506,8 @@ void ltdc_set_tft_sync_timings(
void ltdc_setup_windowing(
uint8_t layer_number,
uint16_t h_back_porch, uint16_t v_back_porch,
uint16_t active_width, uint16_t active_height
uint16_t h_sync, uint16_t v_sync,
uint16_t width, uint16_t height
);

33
lib/stm32/common/ltdc_common_f47.c
View File

@@ -67,20 +67,25 @@ void ltdc_set_tft_sync_timings(uint16_t sync_width, uint16_t sync_height,
LTDC_TWCR = (w << 16) | (h << 0);
}
void ltdc_setup_windowing(uint8_t layer_number,
uint16_t h_back_porch, uint16_t v_back_porch,
uint16_t active_width, uint16_t active_height)
{
active_width += h_back_porch - 1;
active_height += v_back_porch - 1;
/*assert((h_back_porch & 0xfff == h_back_porch) &&
(v_back_porch & 0xfff == v_back_porch) &&
(active_width & 0xfff == active_width) &&
(active_height & 0xfff == active_height));*/
LTDC_LxWHPCR(layer_number) = (active_width << 16) |
(h_back_porch << 0);
LTDC_LxWVPCR(layer_number) = (active_height << 16) |
(v_back_porch << 0);
/*---------------------------------------------------------------------------*/
/** @brief LTDC Windowing Setup
@param[in] layer_number unsigned int8. @ref ltdc_layer_num
@param[in] h_back_porch unsigned int16. Horizontal Back Porch
@param[in] v_back_porch unsigned int16. Vertical Back Porch
@param[in] h_sync unsigned int16. Horizontal Sync
@param[in] v_sync unsigned int16. Vertical Sync
@param[in] width unsigned int16. Width of the screen (e.g. LCD is 320x240, width
would be 320)
@param[in] height unsigned int16. Height of the screen (e.g. LCD is 320x240,
height would be 240)
*/
void ltdc_setup_windowing(uint8_t layer_number, uint16_t h_back_porch,
uint16_t v_back_porch, uint16_t h_sync,
uint16_t v_sync, uint16_t width, uint16_t height) {
LTDC_LxWHPCR(layer_number) = (h_back_porch + width + h_sync - 1) << LTDC_LxWHPCR_WHSPPOS_SHIFT |
(h_sync + h_back_porch) << LTDC_LxWHPCR_WHSTPOS_SHIFT;
LTDC_LxWVPCR(layer_number) = (v_back_porch + height + v_sync - 1) << LTDC_LxWVPCR_WVSPPOS_SHIFT |
(v_back_porch + v_sync) << LTDC_LxWVPCR_WVSTPOS_SHIFT;
}
/**@}*/