ported console (thanks to badger)

2 files changed, 0 insertions, 257 deletions

diff --git a/old/console.c b/old/console.c
deleted file mode 100644
index 55bc3312..00000000
--- a/old/console.c
+++ /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/>.

-*/

-

-#include "ch.h"

-#include "hal.h"

-

-#include "gdisp.h"

-#include "gdisp_fonts.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, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) {

-	const uint8_t* ptr;

-	uint16_t chi;

-	uint16_t x,y;

-

-	console->vmt = &vmt;

-	/* read font, get height */

-	console->fy = font->height;

-

-	/* 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;

-

-	gdispFillArea(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)

-			gdispFillArea(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 = _getCharWidth(console->font, c);

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

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

-			gdispFillArea(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)) {

-			/* scroll the screen */

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

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

-			/* reset the cursor */

-			console->cx = 0;

-			console->cy = console->sy;

-		}

-

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

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

-

-		/* update cursor */

-		console->cx += width;

-	}

-	return RDY_OK;

-}

-

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

-	size_t i;

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

-		lcdConsolePut(console, bp[i]);

-

-	return RDY_OK;

-}

diff --git a/old/console.h b/old/console.h
deleted file mode 100644
index edd8498e..00000000
--- a/old/console.h
+++ /dev/null
@@ -1,87 +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 "ch.h"
-#include "hal.h"
-
-#include "gdisp.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 */
-	coord_t x0,y0;
-	/* current cursor position, in pixels */
-	coord_t cx,cy;
-	/* console size in pixels */
-	coord_t sx,sy;
-	/* foreground and background colour */
-	pixel_t bkcolor, color;
-	/* font size in pixels */
-	uint8_t fy;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-msg_t lcdConsoleInit(GLCDConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color);
-msg_t lcdConsolePut(GLCDConsole *console, char c);
-msg_t lcdConsoleWrite(GLCDConsole *console, char *bp, size_t n);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CONSOLE_H */