diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-07-12 13:20:02 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-07-12 13:20:02 +0200 |
| commit | e4f295ec6d0e4567a6ba8a5b119ab2a569fc67bc (patch) | |
| tree | c3b6be08c4d0c86283d182b419477031d2ada451 | |
| parent | 185cb998e29241d8c2ff25172deffd40cefeb769 (diff) | |
| parent | 1749ff7c3ebeceeafeec647b095d6e846378a01b (diff) | |
| download | uGFX-e4f295ec6d0e4567a6ba8a5b119ab2a569fc67bc.tar.gz uGFX-e4f295ec6d0e4567a6ba8a5b119ab2a569fc67bc.tar.bz2 uGFX-e4f295ec6d0e4567a6ba8a5b119ab2a569fc67bc.zip | |
Merge branch 'master' into Alternate_Raw32_Scheduler
Conflicts:
drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
| -rw-r--r-- | drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c index 5ec7f2f7..c4569949 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c @@ -64,21 +64,7 @@ typedef struct ltdcConfig { ltdcLayerConfig fglayer; // Foreground layer config } ltdcConfig; -#define LTDC_UNUSED_LAYER_CONFIG { - 0, // Frame buffer address - 1, 1, // Width, Height (pixels) - 1, // Line pitch (bytes) - LTDC_FMT_L8, // Pixel format - 0, 0, // Start pixel position (x, y) - 1, 1, // Size of virtual layer (cx, cy) - 0x000000, // Default color (ARGB8888) - 0x000000, // Color key (RGB888) - LTDC_BLEND_FIX1_FIX2, // Blending factors - 0, // Palette (RGB888, can be NULL) - 0, // Palette length - 0, // Constant alpha factor - 0 // Layer configuration flags -} +#define LTDC_UNUSED_LAYER_CONFIG { 0, 1, 1, 1, LTDC_FMT_L8, 0, 0, 1, 1, 0x000000, 0x000000, LTDC_BLEND_FIX1_FIX2, 0, 0, 0, 0 } #if GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_RGB565 #define LTDC_PIXELFORMAT LTDC_FMT_RGB565 |