From e61f0ae4248bdafeace54c330d488904a495c045 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 13:51:20 +1000 Subject: Added type gOrientation to replace V2.x orientation_t, and values gOrientationX replace GDISP_ROTATE_X --- demos/applications/combo/gfxconf.h | 2 +- demos/benchmarks/main.c | 2 +- demos/games/tetris/gfxconf.h | 2 +- demos/modules/gwin/button/main.c | 4 ++-- demos/modules/gwin/frame/gfxconf.h | 2 +- demos/modules/gwin/imagebox/gfxconf.h | 2 +- demos/modules/gwin/keyboard/gfxconf.h | 2 +- demos/modules/gwin/widgets/gfxconf.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'demos') diff --git a/demos/applications/combo/gfxconf.h b/demos/applications/combo/gfxconf.h index cf218206..801a76f5 100644 --- a/demos/applications/combo/gfxconf.h +++ b/demos/applications/combo/gfxconf.h @@ -44,7 +44,7 @@ #define GDISP_NEED_IMAGE_BMP GFXON #define GDISP_NEED_IMAGE_GIF GFXON -#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE +#define GDISP_DEFAULT_ORIENTATION gOrientationLandscape #define GDISP_NEED_MULTITHREAD GFXON /////////////////////////////////////////////////////////////////////////// diff --git a/demos/benchmarks/main.c b/demos/benchmarks/main.c index 43af099e..fa7f0b9a 100644 --- a/demos/benchmarks/main.c +++ b/demos/benchmarks/main.c @@ -92,7 +92,7 @@ void benchmark(void) { gColor random_color; gFont font; - gdispSetOrientation(GDISP_ROTATE_90); + gdispSetOrientation(gOrientation90); width = gdispGetWidth(); height = gdispGetHeight(); diff --git a/demos/games/tetris/gfxconf.h b/demos/games/tetris/gfxconf.h index 72df36c7..779c1138 100644 --- a/demos/games/tetris/gfxconf.h +++ b/demos/games/tetris/gfxconf.h @@ -53,7 +53,7 @@ /* Comment these out if it conflicts with your hardware */ #define GDISP_NEED_CONTROL GFXON -#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_PORTRAIT +#define GDISP_DEFAULT_ORIENTATION gOrientationPortrait #define GDISP_SCREEN_WIDTH 240 #define GDISP_SCREEN_HEIGHT 320 diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c index 6e766e74..ab70d1a0 100644 --- a/demos/modules/gwin/button/main.c +++ b/demos/modules/gwin/button/main.c @@ -52,13 +52,13 @@ static void createWidgets(void) { int main(void) { GEvent* pe; - static const orientation_t orients[] = { GDISP_ROTATE_0, GDISP_ROTATE_90, GDISP_ROTATE_180, GDISP_ROTATE_270 }; + static const gOrientation orients[] = { gOrientation0, gOrientation90, gOrientation180, gOrientation270 }; unsigned which; // Initialize the display gfxInit(); - // We are currently at GDISP_ROTATE_0 + // We are currently at gOrientation0 which = 0; gdispSetOrientation(orients[which]); diff --git a/demos/modules/gwin/frame/gfxconf.h b/demos/modules/gwin/frame/gfxconf.h index 853bcd76..5cd2d760 100644 --- a/demos/modules/gwin/frame/gfxconf.h +++ b/demos/modules/gwin/frame/gfxconf.h @@ -39,7 +39,7 @@ #define GDISP_INCLUDE_FONT_UI2 GFXON #define GDISP_NEED_MULTITHREAD GFXON -#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE +#define GDISP_DEFAULT_ORIENTATION gOrientationLandscape /////////////////////////////////////////////////////////////////////////// // GWIN // diff --git a/demos/modules/gwin/imagebox/gfxconf.h b/demos/modules/gwin/imagebox/gfxconf.h index e186e140..ec1b1bef 100644 --- a/demos/modules/gwin/imagebox/gfxconf.h +++ b/demos/modules/gwin/imagebox/gfxconf.h @@ -43,7 +43,7 @@ #define GDISP_NEED_IMAGE_BMP GFXON #define GDISP_NEED_IMAGE_BMP_24 GFXON -#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE +#define GDISP_DEFAULT_ORIENTATION gOrientationLandscape /////////////////////////////////////////////////////////////////////////// // GWIN // diff --git a/demos/modules/gwin/keyboard/gfxconf.h b/demos/modules/gwin/keyboard/gfxconf.h index 79d443dc..48272724 100644 --- a/demos/modules/gwin/keyboard/gfxconf.h +++ b/demos/modules/gwin/keyboard/gfxconf.h @@ -33,7 +33,7 @@ #define GDISP_INCLUDE_FONT_UI2 GFXON //#define GDISP_NEED_CONTROL GFXON -//#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE +//#define GDISP_DEFAULT_ORIENTATION gOrientationLandscape #define GDISP_NEED_MULTITHREAD GFXON #define GFX_USE_GWIN GFXON diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index 79ef8795..6db15d67 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -42,7 +42,7 @@ #define GDISP_NEED_IMAGE GFXON #define GDISP_NEED_IMAGE_GIF GFXON -#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE +#define GDISP_DEFAULT_ORIENTATION gOrientationLandscape #define GDISP_NEED_MULTITHREAD GFXON /////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3