From 9566e80854c00de3ac90eb026e8c3196a5e168ad Mon Sep 17 00:00:00 2001 From: Andrew Hannam Date: Mon, 12 Nov 2012 17:10:30 +1000 Subject: [PATCH] Remove RGB565CONVERT() Remove RGB565CONVERT() macro Update madlebrot demo to use hardware independant way of setting the color. --- demos/mandelbrot/main.c | 4 ++-- include/gdisp.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/demos/mandelbrot/main.c b/demos/mandelbrot/main.c index 0c8dc47d..1e35ce9c 100644 --- a/demos/mandelbrot/main.c +++ b/demos/mandelbrot/main.c @@ -42,8 +42,8 @@ void mandelbrot(float x1, float y1, float x2, float y2) { y = 2.0f*x*y + cy; x = xx - yy + cx; } - color = ((iter << 8) | (iter&0xFF)); - //color = RGB565CONVERT(iter*4, iter*13, iter*10); + //color = ((iter << 8) | (iter&0xFF)); + color = RGB2COLOR(iter<<7, iter<<4, iter); gdispDrawPixel(i, j, color); } } diff --git a/include/gdisp.h b/include/gdisp.h index db865284..9be97a12 100644 --- a/include/gdisp.h +++ b/include/gdisp.h @@ -293,7 +293,6 @@ 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))