uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Add support for a default application orientation.

Browse source 
Also remove old unneeded GDISP_USE_CUSTOM_BOARD macro
This commit is contained in:
inmarket 2013-11-09 19:18:59 +10:00
parent daa4e8bbd7
commit 1f99d5c9fa
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
demos/3rdparty/tdisp_f4_discovery/gfxconf.h vendored
View file

@ -136,7 +136,6 @@
/* Optional Low Level Driver Definitions */ /* Optional Low Level Driver Definitions */
/* /*
#define GDISP_USE_CUSTOM_BOARD FALSE
#define GDISP_SCREEN_WIDTH 320 #define GDISP_SCREEN_WIDTH 320
#define GDISP_SCREEN_HEIGHT 240 #define GDISP_SCREEN_HEIGHT 240
#define GDISP_USE_FSMC #define GDISP_USE_FSMC

3
demos/modules/gwin/widgets/gfxconf.h
View file

@ -50,10 +50,11 @@
#define GDISP_NEED_TEXT TRUE #define GDISP_NEED_TEXT TRUE
#define GDISP_NEED_IMAGE TRUE #define GDISP_NEED_IMAGE TRUE
#define GDISP_NEED_CONVEX_POLYGON TRUE #define GDISP_NEED_CONVEX_POLYGON TRUE
#define GDISP_NEED_CONTROL TRUE
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
/* The following are optional depending on your hardware */ /* The following are optional depending on your hardware */
//#define GDISP_NEED_SCROLL TRUE //#define GDISP_NEED_SCROLL TRUE
//#define GDISP_NEED_CONTROL TRUE
/* GDISP fonts to include */ /* GDISP fonts to include */
#define GDISP_INCLUDE_FONT_UI2 TRUE #define GDISP_INCLUDE_FONT_UI2 TRUE

1
gfxconf.example.h
View file

@ -171,6 +171,7 @@
/* Optional Parameters for various subsystems */ /* Optional Parameters for various subsystems */
/* /*
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
#define GDISP_LINEBUF_SIZE 128 #define GDISP_LINEBUF_SIZE 128
#define GEVENT_MAXIMUM_SIZE 32 #define GEVENT_MAXIMUM_SIZE 32
#define GEVENT_MAX_SOURCE_LISTENERS 32 #define GEVENT_MAX_SOURCE_LISTENERS 32

14
include/gdisp/options.h
View file

@ -346,14 +346,10 @@
* @{ * @{
*/ */
/** /**
* @brief Use a custom board definition even if a board definition exists. * @brief Define the default orientation for all displays in the system.
* @details Defaults to FALSE * @note GDISP_NEED_CONTROL must also be set (and the hardware must support it)
* @details If TRUE, add gdisp_lld_board.h to your project directory and customise it.
* @note Not all GDISP low level drivers currently use board definition files.
*/ */
#ifndef GDISP_USE_CUSTOM_BOARD // #define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
#define GDISP_USE_CUSTOM_BOARD FALSE
#endif
/** /**
* @brief Set the screen height and width. * @brief Set the screen height and width.
* @note Ignored by some low level GDISP drivers, optional for others. * @note Ignored by some low level GDISP drivers, optional for others.
@ -368,8 +364,8 @@
* @details Only required by the SSD1963 driver. * @details Only required by the SSD1963 driver.
* @note This will be replaced eventually by board definition files * @note This will be replaced eventually by board definition files
*/ */
/* #define GDISP_USE_FSMC */ // #define GDISP_USE_FSMC
/* #define GDISP_USE_GPIO */ // #define GDISP_USE_GPIO
/** @} */ /** @} */
#endif /* _GDISP_OPTIONS_H */ #endif /* _GDISP_OPTIONS_H */

9
src/gdisp/gdisp.c
View file

@ -587,6 +587,15 @@ void _gdispInit(void) {
g->flags = 0; g->flags = 0;
gdisp_lld_init(g); gdisp_lld_init(g);
#if defined(GDISP_DEFAULT_ORIENTATION) && GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
g->p.x = GDISP_CONTROL_ORIENTATION;
g->p.ptr = GDISP_DEFAULT_ORIENTATION;
#if GDISP_HARDWARE_CONTROL == HARDWARE_AUTODETECT
if (g->vmt->control)
#endif
gdisp_lld_control(g);
#endif
// Set the initial clipping region // Set the initial clipping region
#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP