diff options
| author | Tectu <joel@unormal.org> | 2012-11-10 03:19:45 -0800 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2012-11-10 03:19:45 -0800 |
| commit | cc5ae04b7bba81739bf9b8f5c9a79ea98e6e9319 (patch) | |
| tree | 20b41e477afe3d80fc3426877d3dc92c81b750b2 /include | |
| parent | affd9792ff42fab8f376bd2c87a71b25fd52baf7 (diff) | |
| parent | 77e1371b86c6181da153d68b326c624486c1245c (diff) | |
| download | uGFX-cc5ae04b7bba81739bf9b8f5c9a79ea98e6e9319.tar.gz uGFX-cc5ae04b7bba81739bf9b8f5c9a79ea98e6e9319.tar.bz2 uGFX-cc5ae04b7bba81739bf9b8f5c9a79ea98e6e9319.zip | |
Merge pull request #14 from inmarket/master
Win32 touch support
Diffstat (limited to 'include')
| -rw-r--r-- | include/gdisp.h | 1 | ||||
| -rw-r--r-- | include/gdisp_lld.h | 2 | ||||
| -rw-r--r-- | include/gwin.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/gdisp.h b/include/gdisp.h index 9be97a12..db865284 100644 --- a/include/gdisp.h +++ b/include/gdisp.h @@ -293,6 +293,7 @@ void gdispDrawBox(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); /* Now obsolete functions */
#define gdispBlitArea(x, y, cx, cy, buffer) gdispBlitAreaEx(x, y, cx, cy, 0, 0, cx, buffer)
+#define RGB565CONVERT(r,g,b) RGB2COLOR(r,g,b)
/* Macro definitions for common gets and sets */
#define gdispSetPowerMode(powerMode) gdispControl(GDISP_CONTROL_POWER, (void *)(unsigned)(powerMode))
diff --git a/include/gdisp_lld.h b/include/gdisp_lld.h index 8b7dd0e7..1a78e448 100644 --- a/include/gdisp_lld.h +++ b/include/gdisp_lld.h @@ -468,8 +468,6 @@ #define RED_OF(c) (((c) & 0xF800)>>8)
#define GREEN_OF(c) (((c)&0x007E)>>3)
#define BLUE_OF(c) (((c)&0x001F)<<3)
- #define RGB565CONVERT(red, green, blue) (uint16_t)( (( red >> 3 ) << 11 ) | (( green >> 2 ) << 5 ) | ( blue >> 3 ))
-
#elif GDISP_PIXELFORMAT == GDISP_PIXELFORMAT_RGB888
typedef uint32_t color_t;
diff --git a/include/gwin.h b/include/gwin.h index 79b8371c..37fecab4 100644 --- a/include/gwin.h +++ b/include/gwin.h @@ -66,7 +66,7 @@ /* Low Level Driver details and error checks. */
/*===========================================================================*/
-#if !defined(GFX_USE_GDISP)
+#if !defined(GFX_USE_GDISP) || !GFX_USE_GDISP
#error "GWIN: GFX_USE_GDISP must also be defined"
#endif
#include "gdisp.h"
|