restructure

7 files changed, 0 insertions, 1034 deletions

diff --git a/glcd/console.c b/glcd/console.c
deleted file mode 100644
index caddfce2..00000000
--- a/glcd/console.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS-LCD-Driver.

-

-    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#include "ch.h"

-

-#include "glcd.h"

-#include "console.h"

-

-/*

- * Interface implementation. The interface is write only

- */

-

-static size_t writes(void *ip, const uint8_t *bp, size_t n) {

-	return lcdConsoleWrite((GLCDConsole *)ip, bp, n);

-}

-

-static size_t reads(void *ip, uint8_t *bp, size_t n) {

-	(void)ip;

-	(void)bp;

-	(void)n;

-

-	return 0;

-}

-

-static msg_t put(void *ip, uint8_t b) {

-	return lcdConsolePut((GLCDConsole *)ip, (char)b);

-}

-

-static msg_t get(void *ip) {

-	(void)ip;

-

-	return RDY_OK;

-}

-

-static msg_t putt(void *ip, uint8_t b, systime_t timeout) {

-	(void)timeout;

-

-	/* TODO: handle timeout */

-

-	return lcdConsolePut((GLCDConsole *)ip, (char)b);

-}

-

-static msg_t gett(void *ip, systime_t timeout) {

-	(void)ip;

-	(void)timeout;

-

-	return RDY_OK;

-}

-

-static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) {

-	(void)time;

-

-	return lcdConsoleWrite((GLCDConsole *)ip, bp, n);

-}

-

-static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) {

-	(void)ip;

-	(void)bp;

-	(void)n;

-	(void)time;

-

-	return 0;

-}

-

-static uint16_t getflags(void *ip) {

-	_chn_get_and_clear_flags_impl(ip);

-}

-

-static const struct GLCDConsoleVMT vmt = {

-	writes, reads, put, get,

-	putt, gett, writet, readt,

-	getflags

-};

-

-

-msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height, font_t font, uint16_t bkcolor, uint16_t color) {

-	const uint8_t* ptr;

-	uint16_t chi;

-	uint16_t x,y;

-

-	console->vmt = &vmt;

-	/* read font, get height */

-	console->fy = lcdGetFontHeight(font);

-

-	/* calculate the size of the console as an integer multiple of characters height*/

-	console->sx = width;

-	console->sy = (((int16_t)(height/console->fy))-1)*console->fy;

-

-	console->cx = 0;

-	console->cy = 0;

-	console->x0 = x0;

-	console->y0 = y0;

-

-	console->bkcolor = bkcolor;

-	console->color = color;

-

-	console->font = font;

-

-	lcdFillArea(x0, y0, x0+width, y0+height, console->bkcolor);

-	return RDY_OK;

-}

-

-msg_t lcdConsolePut(GLCDConsole *console, char c) {

-	uint8_t width;

-

-	if(c == '\n') {

-		/* clear the text at the end of the line */

-		if(console->cx < console->sx)

-			lcdFillArea(console->x0 + console->cx, console->y0 + console->cy,

-						console->x0 + console->sx, console->y0 + console->cy + console->fy,

-						console->bkcolor);

-		console->cx = 0;

-		console->cy += console->fy;

-	} else if(c == '\r') {

-		/* TODO: work backwards through the buffer to the start of the current line */

-		//console->cx = 0;

-	} else {

-		width = lcdMeasureChar(c, console->font);

-		if((console->cx + width) >= console->sx) {

-			/* clear the text at the end of the line */

-			lcdFillArea(console->x0 + console->cx, console->y0 + console->cy,

-						console->x0 + console->cx + width, console->y0 + console->cy + console->fy,

-						console->bkcolor);

-			console->cx = 0;

-			console->cy += console->fy;

-		}

-

-		if((console->cy > console->sy)) {

-

-			lcdVerticalScroll(console->x0, console->y0, console->x0 + console->sx,

-					console->y0 + console->sy + console->fy, console->fy);

-			/* reset the cursor */

-			console->cx = 0;

-			console->cy = console->sy;

-		}

-

-		lcdDrawChar(console->x0 + console->cx, console->y0 + console->cy, c,

-				console->font, console->color, console->bkcolor, solid);

-

-		/* update cursor */

-		console->cx += width;

-	}

-	return RDY_OK;

-}

-

-msg_t lcdConsoleWrite(GLCDConsole *console, uint8_t *bp, size_t n) {

-	size_t i;

-	for(i = 0; i < n; i++)

-		lcdConsolePut(console, bp[i]);

-

-	return RDY_OK;

-}

-

-

diff --git a/glcd/console.h b/glcd/console.h
deleted file mode 100644
index f76c5adf..00000000
--- a/glcd/console.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    ChibiOS/RT - Copyright (C) 2012
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS-LCD-Driver.
-
-    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONSOLE_H
-#define CONSOLE_H
-
-#include "glcd.h"
-
-/**
- * @brief   Structure representing a GLCD driver.
- */
-typedef struct GLCDConsole GLCDConsole;
-
-/**
- * @brief   @p GLCDConsole specific methods.
- */
-#define _glcd_driver_methods                                              \
-	_base_asynchronous_channel_methods
-
-/**
- * @extends BaseAsynchronousChannelVMT
- *
- * @brief   @p GLCDConsole virtual methods table.
- */
-struct GLCDConsoleVMT {
-	_glcd_driver_methods
-};
-
-/**
- * @extends BaseAsynchronousChannel
- *
- * @brief   GLCD Console class.
- * @details This class extends @p BaseAsynchronousChannel by adding physical
- *          I/O queues.
- */
-struct GLCDConsole {
-	/** @brief Virtual Methods Table.*/
-	const struct GLCDConsoleVMT *vmt;
-	_base_asynchronous_channel_data
-	/* WARNING: Do not add any data to this struct above this comment, only below */
-	/* font */
-	font_t font;
-	/* lcd area to use */
-	uint16_t x0,y0;
-	/* current cursor position, in pixels */
-	uint16_t cx,cy;
-	/* console size in pixels */
-	uint16_t sx,sy;
-	/* foreground and background colour */
-	uint16_t bkcolor, color;
-	/* font size in pixels */
-	uint8_t fy;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t width, uint16_t height, font_t font, uint16_t bkcolor, uint16_t color);
-msg_t lcdConsolePut(GLCDConsole *console, char c);
-msg_t lcdConsoleWrite(GLCDConsole *console, uint8_t *bp, size_t n);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CONSOLE_H */
diff --git a/glcd/glcd.c b/glcd/glcd.c
deleted file mode 100644
index 9d4db9cf..00000000
--- a/glcd/glcd.c
+++ /dev/null
@@ -1,431 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS-LCD-Driver.

-

-    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-#ifdef UNUSED

-#elif defined(__GNUC__)

-# define UNUSED(x) UNUSED_ ## x __attribute__((unused))

-#elif defined(__LCLINT__)

-# define UNUSED(x) /*@unused@*/ x

-#else

-# define UNUSED(x) x

-#endif

-

-/* Hack 1: Manually load the low level driver capabilities first so we can

- * 			control what we implement with hardware scrolling and pixel read.

- */

-#include "gdisp_lld_config.h"

-

-/* Hack 2: Force on the bits of functionality that glcd needs. */

-#define HAL_USE_GDISP			TRUE

-#define GDISP_NEED_VALIDATION	FALSE		/* The original glcd didn't so we don't here either */

-#define GDISP_NEED_CIRCLE		TRUE

-#define GDISP_NEED_ELLIPSE		TRUE

-#define GDISP_NEED_TEXT			TRUE

-#define GDISP_NEED_SCROLL		GDISP_HARDWARE_SCROLL

-#define GDISP_NEED_PIXELREAD	GDISP_HARDWARE_PIXELREAD

-#define GDISP_NEED_CONTROL		TRUE

-#define GDISP_NEED_MULTITHREAD	FALSE		/* We implement multi-thread here */

-

-/* Now load the low level driver and font structure definitions */

-#include "gdisp_lld.h"

-#include "gdisp_fonts.h"

-

-/* Hack 3: GLCD only supports RGB565. Anything else would require significant API changes. */

-#ifndef GDISP_PIXELFORMAT_RGB565

-#error "GLCD only support drivers with RGB565 pixel format"

-#endif

-

-/* Now load the glcd headers */

-#include "glcd.h"

-#include "glcdWorker.h"

-

-/* Hack 4: Include the emulation code and font tables.

- * 			We have to include it here rather than compiling

- * 			the files as we need to pass our control defines

- * 			as they are not being defined by the application.

- * 			We need to turn off the inclusion of gdisp.h due

- * 			to conflicting type defines etc.

- */

-#define _GDISP_H						// Prevent gdisp.h from being included

-#include "gdisp_emulation.c"

-#include "gdisp_fonts.c"

-

-#define EMSG(a)	struct a *emsg = (struct a*)msg

-

-static Thread *workerThread = NULL;

-

-static WORKING_AREA(waGLCDWorkerThread, GLCD_WORKER_SIZE);

-static msg_t ThreadGLCDWorker(void *arg) {

-	(void)arg;

-	Thread *p;

- 

-	chRegSetThreadName("GLCDWorker");

- 

-	while(TRUE) {

-		/* Wait for msg with work to do. */

-		p = chMsgWait();

-		struct glcd_msg_base *msg = (struct glcd_msg_base*)chMsgGet(p);

-		glcd_result_t result = GLCD_PROGRESS;

- 

-		/* do work here */

-		switch(msg->action) {

-			case GLCD_SET_POWERMODE: {

-				EMSG(glcd_msg_powermode);

-				gdisp_lld_control(GDISP_CONTROL_POWER, (void *)(int)emsg->powermode);

-				result = GLCD_DONE;

-				break;

-			}

-

-			case GLCD_SET_ORIENTATION: {

-				EMSG(glcd_msg_orientation);

-				gdisp_lld_control(GDISP_CONTROL_ORIENTATION, (void *)(int)emsg->newOrientation);

-				result = GLCD_DONE;

-				break;

-			}

-			case GLCD_FILL_AREA: {

-				EMSG(glcd_msg_fill_area);

-				gdisp_lld_fillarea(emsg->x0, emsg->y0, emsg->x1-emsg->x0+1,emsg->y1-emsg->y0+1,emsg->color);

-				result = GLCD_DONE;

-				break;

-			}

-

-			case GLCD_WRITE_AREA: {

-				EMSG(glcd_msg_write_area);

-				gdisp_lld_blitarea(emsg->x0, emsg->y0, emsg->x1-emsg->x0+1, emsg->y1-emsg->y0+1, emsg->buffer);

-				result = GLCD_DONE;

-				break;

-			}

-

-			case GLCD_CLEAR: {

-				EMSG(glcd_msg_clear);

-				gdisp_lld_clear(emsg->color);

-				result = GLCD_DONE;

-				break;

-			}

-

-			case GLCD_GET_PIXEL_COLOR: {

-				/* Hack 5: This may now fail if the low level driver doesn't

-				 * 			support it. Previously this support was required

-				 * 			in the driver by GLCD

-				 */

-#if GDISP_HARDWARE_READPIXEL

-				((struct glcd_msg_get_pixel_color *)emsg)->color =

-						gdisp_lld_getpixelcolor(emsg->x, emsg->y);

-				result = GLCD_DONE;

-#else

-				EMSG(glcd_msg_get_pixel_color);

-				((struct glcd_msg_get_pixel_color *)emsg)->color = 0;

-				result = GLCD_FAILED;

-#endif

-				break;				

-			}

-

-			case GLCD_DRAW_PIXEL: {

-				EMSG(glcd_msg_draw_pixel);

-				gdisp_lld_drawpixel(emsg->x, emsg->y, emsg->color);

-				result = GLCD_DONE;

-				break;

-			}

-

-			case GLCD_VERTICAL_SCROLL: {

-				/* Hack 6: This may now fail if the low level driver doesn't

-				 * 			support it. Previously this support was required

-				 * 			in the driver by GLCD

-				 */

-#if GDISP_HARDWARE_SCROLL

-				EMSG(glcd_msg_vertical_scroll);

-				gdisp_lld_verticalscroll(emsg->x0, emsg->y0, emsg->x1-emsg->x0+1, emsg->y1-emsg->y0+1, emsg->lines, 0);

-				result = GLCD_DONE;

-#else

-				result = GLCD_FAILED;

-#endif

-				break;

-			}

-

-			case GLCD_DRAW_CHAR: {

-				EMSG(glcd_msg_draw_char);

-				if (emsg->tpText)

-					gdisp_lld_drawchar(emsg->cx, emsg->cy, emsg->c, emsg->font, emsg->color);

-				else

-					gdisp_lld_fillchar(emsg->cx, emsg->cy, emsg->c, emsg->font, emsg->color, emsg->bkcolor);

-				/* We can't normally access a high level function here but in this case it is safe

-				 * because the routine only accesses const data members (multi-thread safe).

-				 */

-				emsg->ret_width = lcdMeasureChar(emsg->c, emsg->font);

-				result = GLCD_DONE;

-				break;

-			}

-

-			default: {

-				result = GLCD_FAILED;

-				break;

-			}

-		}

-

-		/* Done, release msg again. */

-		chMsgRelease(p, (msg_t)result);

-

-	}

- 

-	return 0;

-}

-

-void lcdInit(GLCDDriver *UNUSED(glcdp)) {

-	workerThread = chThdCreateStatic(waGLCDWorkerThread, sizeof(waGLCDWorkerThread), NORMALPRIO, ThreadGLCDWorker, NULL);

-

-	gdisp_lld_init();

-}

-

-uint16_t lcdGetHeight(void) {

-	return GDISP.Height;

-}

-

-uint16_t lcdGetWidth(void) {

-	return GDISP.Width;

-}

-

-uint16_t lcdGetOrientation(void) {

-	return GDISP.Orientation;

-}

-

-glcd_result_t lcdSetPowerMode(uint8_t powerMode) {

-	struct glcd_msg_powermode msg;

-

-	msg.action = GLCD_SET_POWERMODE;

-	msg.powermode = powerMode;

-

-	return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);

-}

-

-glcd_result_t lcdSetOrientation(uint8_t newOrientation) {

-	struct glcd_msg_orientation msg;

-

-	msg.action = GLCD_SET_ORIENTATION;

-	msg.newOrientation = newOrientation;

-

-	return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);

-}

-

-glcd_result_t lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) {

-	struct glcd_msg_fill_area msg;

-

-	msg.action = GLCD_FILL_AREA;

-	msg.x0 = x0;

-	msg.y0 = y0;

-	msg.x1 = x1;

-	msg.y1 = y1;

-	msg.color = color;

-

-	return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);

-}

-

-glcd_result_t lcdWriteArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t *buffer, size_t n) {

-	struct glcd_msg_write_area msg;

-

-	msg.action = GLCD_WRITE_AREA;

-	msg.x0 = x0;

-	msg.y0 = y0;

-	msg.x1 = x1;

-	msg.y1 = y1;

-	msg.buffer = buffer;

-	msg.size = n;

-

-	return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);

-}

-

-glcd_result_t lcdClear(uint16_t color) {

-	struct glcd_msg_clear msg;

-

-	msg.action = GLCD_CLEAR;

-	msg.color = color;

-

-	return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);

-}

-

-uint16_t lcdGetPixelColor(uint16_t x, uint16_t y) {

-	struct glcd_msg_get_pixel_color msg;

-

-	msg.action = GLCD_GET_PIXEL_COLOR;

-	msg.x = x;

-	msg.y = y;

-

-	chMsgSend(workerThread, (msg_t)&msg);

-

-	return msg.color;

-}

-

-glcd_result_t lcdDrawPixel(uint16_t x, uint16_t y, uint16_t color) {

-	struct glcd_msg_draw_pixel msg;

- 

-	msg.action = GLCD_DRAW_PIXEL;

-	msg.x = x;

-	msg.y = y;

-	msg.color = color;

-

-	return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);

-}

-

-glcd_result_t lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines) {

-	struct glcd_msg_vertical_scroll msg;

-

-	msg.action = GLCD_VERTICAL_SCROLL;

-	msg.x0 = x0;

-	msg.y0 = y0;

-	msg.x1 = x1;

-	msg.y1 = y1;

-	msg.lines = lines;

-

-	return (glcd_result_t)chMsgSend(workerThread, (msg_t)&msg);

-}

-

-void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) {

-	struct glcd_msg_draw_line msg;

-

-	msg.action = GLCD_DRAW_LINE;

-	msg.x0 = x0;

-	msg.y0 = y0;

-	msg.x1 = x1;

-	msg.y1 = y1;

-	msg.color = color;

-

-	chMsgSend(workerThread, (msg_t)&msg);

-}

-

-uint16_t lcdDrawChar(uint16_t cx, uint16_t cy, char c, font_t font, uint16_t color, uint16_t bkcolor, bool_t tpText) {

-	struct glcd_msg_draw_char msg;

-

-	msg.action = GLCD_DRAW_CHAR;

-	msg.cx = cx;

-	msg.cy = cy;

-	msg.c = c;

-	msg.font = font;

-	msg.color = color;

-	msg.bkcolor = bkcolor;

-	msg.tpText = tpText;

-	msg.ret_width = 0;

-

-	chMsgSend(workerThread, (msg_t)&msg);

-

-	return msg.ret_width;

-}

-

-void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color) {

-	struct glcd_msg_draw_circle msg;

-

-	msg.action = GLCD_DRAW_CIRCLE;

-	msg.x = x;

-	msg.y = y;

-	msg.radius = radius;

-	msg.filled = filled;

-	msg.color = color;

-

-	chMsgSend(workerThread, (msg_t)&msg);

-}

-

-void lcdDrawEllipse(uint16_t x, uint16_t y, uint16_t a, uint16_t b, uint8_t filled, uint16_t color) {

-	struct glcd_msg_draw_ellipse msg;

-

-	msg.action = GLCD_DRAW_ELLIPSE;

-	msg.x = x;

-	msg.y = y;

-	msg.a = a;

-	msg.b = b;

-	msg.filled = filled;

-	msg.color = color;

-

-	chMsgSend(workerThread, (msg_t)&msg);

-}

-

-/* WARNING: No boundary checks! Unpredictable behaviour if text exceeds boundary */

-void lcdDrawString(uint16_t x, uint16_t y, const char *str, font_t font, uint16_t color, uint16_t bkcolor, bool_t tpText) {

-	uint16_t cx = x, cy = y;

-	

-	while (*str) {

-		cx += lcdDrawChar(cx, cy, *str++, font, color, bkcolor, tpText);

-	}

-}

-

-uint16_t lcdMeasureChar(char c, font_t font) {

-	return (_getCharWidth(font, c)+font->charPadding) * font->xscale;

-}

-

-uint16_t lcdMeasureString(const char *str, font_t font) {

-	uint16_t result = 0;

-

-	/* Measure each char width, add it, return the result */

-	while (*str)

-		result += lcdMeasureChar(*str++, font);

-

-	return result;

-}

-

-uint16_t lcdGetFontHeight(font_t font) {

-	return font->height;

-}

-

-uint16_t lcdBGR2RGB(uint16_t color) {

-	uint16_t  r, g, b, rgb;

-

-	b = ( color>>0 )  & 0x1f;

-	g = ( color>>5 )  & 0x3f;

-	r = ( color>>11 ) & 0x1f;

- 

-	rgb =  (b<<11) + (g<<5) + (r<<0);

-

-	return( rgb );

-}

-

-void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color) {

-	uint16_t TempX;

-	uint16_t TempY;

-

-	if (x0 > x1) {

-		TempX = x1;

-		x1 = x0;

-		x0 = TempX;

-	}

-	if (y0 > y1) {

-		TempY = y1;

-		y1 = y0;

-		y0 = TempY;

-	}

-	if(filled) {

-		lcdFillArea(x0, y0, x1+1, y1+1, color);

-	} else {

-		lcdDrawLine(x0, y0, x1, y0, color);

-		lcdDrawLine(x0, y1, x1, y1, color);

-		lcdDrawLine(x0, y0, x0, y1, color);

-		lcdDrawLine(x1, y0, x1, y1+1, color);

-	}

-}

-

-void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const char* str, font_t font, uint16_t fontColor, uint16_t bkColor) {

-	uint16_t off_left, off_up;

-

-	off_left = ((x1-x0)-lcdMeasureString(str, font))/2;

-	off_up = ((y1-y0) - lcdGetFontHeight(font)) / 2;

-

-	lcdDrawRect(x0, y0, x1, y1, filled, bkColor);

-	/* Abhishek: default to solid text for this? */

-	lcdDrawString(x0+off_left, y0+off_up, str, font, fontColor, bkColor, solid);

-}

diff --git a/glcd/glcd.h b/glcd/glcd.h
deleted file mode 100644
index 9fee528d..00000000
--- a/glcd/glcd.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS-LCD-Driver.

-

-    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#ifndef GLCD_H

-#define GLCD_H

-

-#include "ch.h"

-#include "hal.h"

-

-#define PORTRAIT	(lcdGetOrientation() == portrait || lcdGetOrientation() == portraitInv)

-#define LANDSCAPE	(lcdGetOrientation() == landscape || lcdGetOrientation() == landscapeInv)

-

-/* New fonts */

-extern const struct font fontSmall;

-extern const struct font fontSmallDouble;

-extern const struct font fontSmallNarrow;

-extern const struct font fontLarger;

-extern const struct font fontLargerDouble;

-extern const struct font fontLargerNarrow;

-extern const struct font fontUI1;

-extern const struct font fontUI1Double;

-extern const struct font fontUI1Narrow;

-extern const struct font fontUI2;

-extern const struct font fontUI2Double;

-extern const struct font fontUI2Narrow;

-extern const struct font fontLargeNumbers;

-extern const struct font fontLargeNumbersDouble;

-extern const struct font fontLargeNumbersNarrow;

-

-/* Old font names */

-#define font_Small						(&fontSmall)

-#define font_SmallDouble				(&fontSmallDouble)

-#define font_SmallNarrow				(&fontSmall)

-#define font_Larger						(&fontLarger)

-#define font_LargerDouble				(&fontLargerDouble)

-#define font_LargerNarrow				(&fontLargerNarrow)

-#define font_MediumBold					(&fontUI1)

-#define font_MediumBoldDouble			(&fontUI1Double)

-#define font_MediumBoldNarrow			(&fontUI1Narrow)

-#define font_LargeNumbers				(&fontLargeNumbers)

-#define font_LargeNumbersDouble			(&fontLargeNumbersDouble)

-#define font_LargeNumbersNarrow			(&fontLargeNumbersNarrow)

-

-/* LCD color - Note that GLCD only supports 16 bit color in the API */

-#define White          0xFFFF

-#define Black          0x0000

-#define Grey           0xF7DE

-#define Blue           0x001F

-#define Blue2          0x051F

-#define Red            0xF800

-#define Magenta        0xF81F

-#define Green          0x07E0

-#define Cyan           0x7FFF

-#define Yellow         0xFFE0

-

-#define RGB565CONVERT(red, green, blue) \

-(uint16_t)( (( red   >> 3 ) << 11 ) | (( green >> 2 ) << 5  ) | ( blue  >> 3 ))

-

-#ifndef _GDISP_LLD_H

-	/* Don't double define these at the low level driver */

-	typedef const struct font *font_t;

-	enum orientation {portrait, landscape, portraitInv, landscapeInv};

-	enum powermode {powerOff, powerSleep, powerOn};

-	#define sleepOn	powerSleep

-	#define sleepOff powerOn

-#endif

-

-enum filled {frame, filled};

-enum transparency {solid, transparent};

-

-/**

- * @brief   Structure representing a GLCD driver.

- */

-typedef struct GLCDDriver GLCDDriver;

-

-struct GLCDDriver {

-};

-

-enum glcd_result {	GLCD_DONE,

-					GLCD_FAILED,

-					GLCD_PROGRESS,

-				};

-

-typedef enum glcd_result glcd_result_t;

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/* Core functions */

-void lcdInit(GLCDDriver *GLCDD1);

-glcd_result_t lcdClear(uint16_t color);

-glcd_result_t lcdSetOrientation(uint8_t newOrientation);

-glcd_result_t lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);

-glcd_result_t lcdWriteArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t *buffer, size_t n);

-glcd_result_t lcdSetPowerMode(uint8_t powerMode);

-

-/* Drawing functions */

-glcd_result_t lcdDrawPixel(uint16_t x, uint16_t y, uint16_t point);

-void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);

-void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color);

-void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const char* str, font_t font, uint16_t fontColor, uint16_t bkColor);

-void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color);

-void lcdDrawEllipse(uint16_t x, uint16_t y, uint16_t a, uint16_t b, uint8_t filled, uint16_t color);

-

-/* Text Rendering Functions */

-uint16_t lcdDrawChar(uint16_t cx, uint16_t cy, char c, font_t font, uint16_t color, uint16_t bkcolor, bool_t tpText);

-void lcdDrawString(uint16_t x, uint16_t y, const char *str, font_t font, uint16_t color, uint16_t bkcolor, bool_t tpText);

-

-/* Character measuring functions */

-uint16_t lcdMeasureChar(char c, font_t font);

-uint16_t lcdMeasureString(const char* str, font_t font);

-uint16_t lcdGetFontHeight(font_t font);

-

-/* Size and orientation related */

-uint16_t lcdGetHeight(void);

-uint16_t lcdGetWidth(void);

-uint16_t lcdGetOrientation(void);

-

-/* BGR->RGB and pixel readback */

-uint16_t lcdBGR2RGB(uint16_t color);

-uint16_t lcdGetPixelColor(uint16_t x, uint16_t y);

-

-/* Scrolling function */

-glcd_result_t lcdVerticalScroll(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, int16_t lines);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

diff --git a/glcd/glcd.mk b/glcd/glcd.mk
deleted file mode 100644
index 22ed8922..00000000
--- a/glcd/glcd.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LCD_GLCD_SRC =		$(LCDLIB)/glcd/glcd.c \

-					$(LCDLIB)/glcd/console.c

-

-LCD_GLCD_INC =		$(LCDLIB)/glcd \

-					${CHIBIOS}/os/halext/include ${CHIBIOS}/os/halext/src

diff --git a/glcd/glcdWorker.h b/glcd/glcdWorker.h
deleted file mode 100644
index 0d29d2da..00000000
--- a/glcd/glcdWorker.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS-LCD-Driver.

-

-    ChibiOS-LCD-Driver is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS-LCD-Driver is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#ifndef GLCD_WORKER_H

-#define GLCD_WORKER_H

-

-#include "glcd.h"

-

-#define GLCD_WORKER_SIZE 512

-

-enum glcd_action {	GLCD_SET_POWERMODE,

-					GLCD_SET_ORIENTATION,

-					GLCD_FILL_AREA,

-					GLCD_WRITE_AREA,

-					GLCD_CLEAR,

-					GLCD_GET_PIXEL_COLOR,

-					GLCD_DRAW_PIXEL,

-					GLCD_VERTICAL_SCROLL,

-					GLCD_DRAW_CHAR,

-					GLCD_DRAW_LINE,

-					GLCD_DRAW_CIRCLE,

-					GLCD_DRAW_ELLIPSE,

-				};

-

-#define _glcd_msg_base			\

-	enum glcd_action action;

-

-struct glcd_msg_base {

-	_glcd_msg_base

-};

-

-struct glcd_msg_powermode {

-	_glcd_msg_base

-

-	uint8_t powermode;

-};

-

-struct glcd_msg_orientation {

-	_glcd_msg_base

-

-	uint8_t newOrientation;

-};

-

-struct glcd_msg_set_window {

-	_glcd_msg_base

-

-	uint16_t x0;

-	uint16_t y0;

-	uint16_t x1;

-	uint16_t y1;

-};

-

-struct glcd_msg_fill_area {

-	_glcd_msg_base

-

-	uint16_t x0;

-	uint16_t y0;

-	uint16_t x1;

-	uint16_t y1;

-	uint16_t color;

-};

-

-struct glcd_msg_write_area {

-	_glcd_msg_base

-

-	uint16_t x0;

-	uint16_t y0;

-	uint16_t x1;

-	uint16_t y1;

-	uint16_t *buffer;

-	size_t size;

-};

-

-struct glcd_msg_clear {

-	_glcd_msg_base

-

-	uint16_t color;

-};

-

-struct glcd_msg_get_pixel_color {

-	_glcd_msg_base

-

-	uint16_t x;

-	uint16_t y;

-	uint16_t color;

-};

-

-struct glcd_msg_draw_pixel {

-	_glcd_msg_base

-

-	uint16_t x;

-	uint16_t y;

-	uint16_t color;

-};

-

-struct glcd_msg_vertical_scroll {

-	_glcd_msg_base

-

-	uint16_t x0;

-	uint16_t y0;

-	uint16_t x1;

-	uint16_t y1;

-	int16_t lines;

-};

-

-struct glcd_msg_draw_line {

-	_glcd_msg_base

-

-	uint16_t x0;

-	uint16_t y0;

-	uint16_t x1;

-	uint16_t y1;

-	int16_t color;

-};

-

-struct glcd_msg_draw_circle {

-	_glcd_msg_base

-

-	uint16_t x;

-	uint16_t y;

-	uint16_t radius;

-	uint16_t y1;

-	uint8_t filled;

-	int16_t color;

-};

-

-struct glcd_msg_draw_ellipse {

-	_glcd_msg_base

-

-	uint16_t x;

-	uint16_t y;

-	uint16_t a;

-	uint16_t b;

-	uint16_t y1;

-	uint8_t filled;

-	int16_t color;

-};

-

-struct glcd_msg_draw_char {

-	_glcd_msg_base;

-

-	uint16_t cx;

-	uint16_t cy;

-	uint16_t color;

-	uint16_t bkcolor;

-	uint16_t ret_width;

-	char c;

-	font_t font;

-	bool_t tpText;

-};

-

-#endif

-

diff --git a/glcd/readme.txt b/glcd/readme.txt
deleted file mode 100644
index 985e87c3..00000000
--- a/glcd/readme.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-GLCD now uses the GDISP low level drivers and fonts.

-

-To update your make to use this new version:

-	Add the low level driver yo want to use to your make file. eg.

-		include $(CHIBIOS)/os/halext/drivers/gdispTestStub/gdisp_lld.mk

-

-There some restrictions that GLCD places on your use of new features and on the capabilities

-of the low level driver.

-

-They are:

-	1/ GLCD requires a driver that supports RGB565 pixel format. This is a

-		limitation of the GLCD API. To update the API would create compatability

-		issues with existing applications.

-	2/ If you want to use the GLCD scroll or the GLCD read-pixel calls then your

-		low level driver must support them. If it doesn't these calls will

-		fail.

-	3/ You cannot reduce the code size like in GDISP by defining macros to

-		compile out code that you are not using.

-	4/ Some of the new features of GDISP like right or center justified text are not

-		supported as there is no equivelant API in GDISP.

-	5/ There is no mechanism to send hardware specific commands to the low level driver

-		such as commands to control the back-light.

-

-What it does do that GDISP currently doesn't:

-	1/ Asynchronous multi-thread support.
\ No newline at end of file