Merge branch 'master' into console

ugfx_release_2.6
Joel Bodenmann 2013-12-18 15:40:10 +01:00
commit 92750f0207
1 changed files with 7 additions and 7 deletions

View File

@ -77,13 +77,13 @@ typedef enum powermode { powerOff, powerSleep, powerDeepSleep, powerOn } powermo
* below to access it in case the implementation ever changed. * below to access it in case the implementation ever changed.
*/ */
typedef struct GDISPControl { typedef struct GDISPControl {
coord_t Width; coord_t Width;
coord_t Height; coord_t Height;
orientation_t Orientation; orientation_t Orientation;
powermode_t Powermode; powermode_t Powermode;
uint8_t Backlight; uint8_t Backlight;
uint8_t Contrast; uint8_t Contrast;
} GDISPControl; } GDISPControl;
/* /*
* Our black box display structure. We know only one thing about it... * Our black box display structure. We know only one thing about it...