TDISP cleanup

Seperate High level and low level code better
Implement tdispControl
Cleanup

4 files changed, 283 insertions, 262 deletions

diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c
index d0f4af0d..8a9c886f 100644
--- a/drivers/tdisp/HD44780/tdisp_lld.c
+++ b/drivers/tdisp/HD44780/tdisp_lld.c
@@ -1,153 +1,164 @@
-/*
-    ChibiOS/GFX - Copyright (C) 2012
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX 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/GFX 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/>.
-*/
-
-/**
- * @file    drivers/tdisp/HD44780/tdisp_lld.c
- * @brief   TDISP driver subsystem low level driver source for the HD44780 display
- *
- * @addtogroup TDISP
- * @{
- */
-
-#include "ch.h"
-#include "hal.h"
-#include "gfx.h"
-
-#if GFX_USE_TDISP /*|| defined(__DOXYGEN__)*/
-
-#include "tdisp_lld_board_example.h"
-
-static void _writeData(uint8_t data) {
-	write_bus(data);
-	
-	setpin_e(TRUE);
-	chThdSleepMicroseconds(1);
-	setpin_e(FALSE);
-	chThdSleepMicroseconds(5);
-}
-
-void tdisp_lld_write_cmd(uint8_t data) {
-	setpin_rs(FALSE);
-	setpin_rw(FALSE);
-
-	#if TDISP_NEED_4BIT_MODE
-	_writeData(data>>4);
-	#endif
-	_writeData(data);
-}
-
-void tdisp_lld_write_data(uint8_t data) {
-	setpin_rs(TRUE);
-	setpin_rw(FALSE);
-
-	#if TDISP_NEED_4BIT_MODE
-	_writeData(data>>4);
-	#endif
-	_writeData(data);
-}
-
-bool_t tdisp_lld_init(void) { 
-	/* initialise MCU hardware */
-	init_board();
-
-	/* wait some time */
-	chThdSleepMilliseconds(50);
-
-	tdisp_lld_write_cmd(0x38);
-	chThdSleepMilliseconds(64);
-
-	tdisp_lld_write_cmd(0x0f);	
-	chThdSleepMicroseconds(50);
-
-	tdisp_lld_write_cmd(0x01);
-	chThdSleepMilliseconds(5);
-
-	tdisp_lld_write_cmd(0x06);
-	chThdSleepMicroseconds(50);
-
-	return TRUE;
-}
-
-void tdisp_lld_set_cursor(coord_t col, coord_t row) {
-	uint8_t row_offsets[] = { 0x00, 0x40, 0x14, 0x54 };
-
-	if(row >= TDISP_ROWS)
-		row = TDISP_ROWS - 1;
-
-	tdisp_lld_write_cmd(0x80 | (col + row_offsets[row]));
-}
-
-void tdisp_lld_create_char(uint8_t address, char *charmap) {
-	uint8_t i;
-
-	/* make sure we don't write somewhere we're not supposed to */
-	address &= TDISP_MAX_CUSTOM_CHARS;
-
-	tdisp_lld_write_cmd(0x40 | (address << 3));
-
-	for(i = 0; i < 8; i++) {
-		tdisp_lld_write_data(charmap[i]);
-	}
-}
-
-void tdisp_lld_clear(void) {
-	tdisp_lld_write_cmd(0x01);
-}
-
-void tdisp_lld_home(void) {
-	tdisp_lld_write_cmd(0x02);
-}
-
-void tdisp_lld_control(uint16_t what, void *value) {
-	(void)what;
-	(void)value;
-/*
-	switch(attributes) {
-		case TDISP_ON:
-			_displaycontrol |= 0x04;
-			tdisp_lld_write_cmd(0x08 | _displaycontrol);
-			break;
-		case TDISP_OFF:
-			_displaycontrol &=~ 0x04;
-			tdisp_lld_write_cmd(0x08 | _displaycontrol);
-			break;
-		case TDISP_CURSOR_ON:
-			_displaycontrol |= 0x02;
-			tdisp_lld_write_cmd(0x08 | _displaycontrol);
-			break;
-		case TDISP_CURSOR_OFF:
-			_displaycontrol &=~ 0x02;
-			tdisp_lld_write_cmd(0x08 | _displaycontrol);
-			break;
-		case TDISP_CURSOR_BLINK_ON:
-			_displaycontrol |= 0x00;
-			tdisp_lld_write_cmd(0x08 | _displaycontrol);
-			break;
-		case TDISP_CURSOR_BLINK_OFF:
-			_displaycontrol &=~ 0x00;
-			tdisp_lld_write_cmd(0x08 | _displaycontrol);
-			break;
-	}
-*/
-}
-
-#endif /* GFX_USE_TDISP */
-/** @} */
-
+/*

+    ChibiOS/GFX - Copyright (C) 2012

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

+

+    This file is part of ChibiOS/GFX.

+

+    ChibiOS/GFX 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/GFX 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/>.

+*/

+

+/**

+ * @file    drivers/tdisp/HD44780/tdisp_lld.c

+ * @brief   TDISP driver subsystem low level driver source for the HD44780 display

+ *

+ * @addtogroup TDISP

+ * @{

+ */

+

+#include "ch.h"

+#include "hal.h"

+#include "gfx.h"

+

+#if GFX_USE_TDISP /*|| defined(__DOXYGEN__)*/

+

+/* The user may override the default display size */

+#ifndef TDISP_COLUMNS

+	#define TDISP_COLUMNS		16

+#endif

+#ifndef TDISP_ROWS

+	#define TDISP_ROWS			2

+#endif

+

+/* Controller Specific Properties */

+#define CUSTOM_CHAR_COUNT		8

+#define CUSTOM_CHAR_XBITS		5

+#define CUSTOM_CHAR_YBITS		8

+

+/* Define the properties of our controller */

+tdispStruct	TDISP = {

+		TDISP_COLUMNS, TDISP_ROWS,				/* cols, rows */

+		CUSTOM_CHAR_XBITS, CUSTOM_CHAR_YBITS,	/* charBitsX, charBitsY */

+		CUSTOM_CHAR_COUNT						/* maxCustomChars */

+		};

+

+/* Include the hardware interface details */

+#if defined(TDISP_USE_CUSTOM_BOARD) && TDISP_USE_CUSTOM_BOARD

+	/* Include the user supplied board definitions */

+	#include "tdisp_lld_board.h"

+#elif defined(BOARD_UNKNOWN)

+	#include "gdisp_lld_board_unknown.h"

+#else

+	/* Include the user supplied board definitions */

+	#include "gdisp_lld_board.h"

+#endif

+

+/* Our display control */

+#define DISPLAY_ON		0x04

+#define CURSOR_ON		0x02

+#define CURSOR_BLINK	0x01

+

+static uint8_t	displaycontrol;

+

+

+bool_t tdisp_lld_init(void) { 

+	/* initialise hardware */

+	init_board();

+

+	/* wait some time */

+	chThdSleepMilliseconds(50);

+

+	write_cmd(0x38);

+	chThdSleepMilliseconds(64);

+

+	displaycontrol = DISPLAY_ON | CURSOR_ON | CURSOR_BLINK;		// The default displaycontrol

+	write_cmd(0x08 | displaycontrol);

+	chThdSleepMicroseconds(50);

+

+	write_cmd(0x01);					// Clear the screen

+	chThdSleepMilliseconds(5);

+

+	write_cmd(0x06);

+	chThdSleepMicroseconds(50);

+

+	return TRUE;

+}

+

+void tdisp_lld_clear(void) {

+	write_cmd(0x01);

+}

+

+void tdisp_lld_draw_char(char c) {

+	write_data(c);

+}

+

+void tdisp_lld_set_cursor(coord_t col, coord_t row) {

+	static const uint8_t row_offsets[] = { 0x00, 0x40, 0x14, 0x54 };

+

+	/*

+	 *  Short-cut:

+	 *

+	 *  If x and y = 0 then use the home command.

+	 *

+	 *  Note: There is probably no advantage as both commands are a single byte

+	 */

+//	if (col == 0 && row == 0) {

+//		write_cmd(0x02);

+//		return;

+//	}

+

+	write_cmd(0x80 | (col + row_offsets[row]));

+}

+

+void tdisp_lld_create_char(uint8_t address, uint8_t *charmap) {

+	int i;

+

+	write_cmd(0x40 | (address << 3));

+	for(i = 0; i < CUSTOM_CHAR_YBITS; i++)

+		write_data(charmap[i]);

+}

+

+void tdisp_lld_control(uint16_t what, void *value) {

+	switch(what) {

+		case TDISP_CTRL_BACKLIGHT:

+			if ((uint8_t)value)

+				displaycontrol |= DISPLAY_ON;

+			else

+				displaycontrol &= ~DISPLAY_ON;

+			write_cmd(0x08 | displaycontrol);

+			break;

+		case TDISP_CTRL_CURSOR:

+			switch((cursorshape)value) {

+			case cursorOff:

+				displaycontrol &= ~CURSOR_ON;

+				break;

+			case cursorBlock:

+			case cursorUnderline:

+			case cursorBar:

+				displaycontrol = (displaycontrol | CURSOR_ON) & ~CURSOR_BLINK;

+				break;

+			case cursorBlinkingBlock:

+			case cursorBlinkingUnderline:

+			case cursorBlinkingBar:

+			default:

+				displaycontrol |= (CURSOR_ON | CURSOR_BLINK);

+				break;

+			}

+			write_cmd(0x08 | displaycontrol);

+			break;

+	}

+}

+

+#endif /* GFX_USE_TDISP */

+/** @} */

+

diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_example.h b/drivers/tdisp/HD44780/tdisp_lld_board_example.h
index 3f5c47d7..37463d37 100644
--- a/drivers/tdisp/HD44780/tdisp_lld_board_example.h
+++ b/drivers/tdisp/HD44780/tdisp_lld_board_example.h
@@ -1,64 +1,48 @@
-/*
-    ChibiOS/GFX - Copyright (C) 2012
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX 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/GFX 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/>.
-*/
-
-/**
- * @file    drivers/tdisp/HD44780/tdisp_lld_board_example.h
- * @brief   TDISP driver subsystem board interface for the HD44780 display
- *
- * @addtogroup TDISP
- * @{
- */
-
-#ifndef _TDISP_LLD_BOARD_H
-#define _TDISP_LLD_BOARD_H
-
-void init_board(void) {
-	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
-	palSetGroupMode(GPIOG, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
-}
-
-void setpin_e(bool_t state) {
-	if(state)
-		palSetPad(GPIOE, 2);
-	else
-		palClearPad(GPIOE, 2);
-}
-
-void setpin_rs(bool_t state) {
-	if(state)
-		palSetPad(GPIOE, 0);
-	else
-		palClearPad(GPIOE, 0);
-}
-
-void setpin_rw(bool_t state) {
-	if(state)
-		palSetPad(GPIOE, 1);
-	else
-		palClearPad(GPIOE, 1);
-}
-
-void write_bus(uint8_t data) {
-	palWritePort(GPIOG, data);
-}
-
-#endif /* _TDISP_LLD_BOARD_H */
-/** @} */
-
+/*

+    ChibiOS/GFX - Copyright (C) 2012

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

+

+    This file is part of ChibiOS/GFX.

+

+    ChibiOS/GFX 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/GFX 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/>.

+*/

+

+/**

+ * @file    drivers/tdisp/HD44780/tdisp_lld_board_example.h

+ * @brief   TDISP driver subsystem board interface for the HD44780 display

+ *

+ * @addtogroup TDISP

+ * @{

+ */

+

+#ifndef _TDISP_LLD_BOARD_H

+#define _TDISP_LLD_BOARD_H

+

+static void init_board(void) {

+	/* Code here */

+	#error "tdispHD44780: You must supply a definition for init_board for your board"

+}

+

+static void write_cmd(uint8_t data) {

+	/* Code here */

+	#error "tdispHD44780: You must supply a definition for write_cmd for your board"

+}

+

+static void write_data(uint8_t data) {

+	/* Code here */

+	#error "tdispHD44780: You must supply a definition for write_data for your board"

+}

+

+#endif /* _TDISP_LLD_BOARD_H */

+/** @} */

diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_unknown.h b/drivers/tdisp/HD44780/tdisp_lld_board_unknown.h
new file mode 100644
index 00000000..381dc52b
--- /dev/null
+++ b/drivers/tdisp/HD44780/tdisp_lld_board_unknown.h
@@ -0,0 +1,71 @@
+/*

+    ChibiOS/GFX - Copyright (C) 2012

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

+

+    This file is part of ChibiOS/GFX.

+

+    ChibiOS/GFX 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/GFX 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/>.

+*/

+

+/**

+ * @file    drivers/tdisp/HD44780/tdisp_lld_board_unknown.h

+ * @brief   TDISP driver subsystem board interface for the HD44780 display

+ *

+ * @addtogroup TDISP

+ * @{

+ */

+

+#ifndef _TDISP_LLD_BOARD_H

+#define _TDISP_LLD_BOARD_H

+

+/* Configure these to match the hardware connections on your board */

+#define BUS_4BITS	FALSE

+#define PORT_DATA	GPIOG

+#define PORT_CTRL	GPIOE

+#define PIN_RS		0

+#define PIN_RW		1

+#define PIN_EN		2

+

+static void init_board(void) {

+	palSetGroupMode(PORT_CTRL, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);

+	palSetGroupMode(PORT_DATA, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);

+	palClearPad(PORT_CTRL, PIN_RW);

+}

+

+static void writeToLCD(uint8_t data) {

+	palWritePort(PORT_DATA, data);

+	palSetPad(PORT_CTRL, PIN_EN);

+	chThdSleepMicroseconds(1);

+	palClearPad(PORT_CTRL, PIN_EN);

+	chThdSleepMicroseconds(5);

+}

+

+static void write_cmd(uint8_t data) {

+	palClearPad(PORT_CTRL, PIN_RS);

+	#if BUS_4BITS

+		writeToLCD(data>>4);

+	#endif

+	writeToLCD(data);

+}

+

+static void write_data(uint8_t data) {

+	palSetPad(PORT_CTRL, PIN_RS);

+	#if BUS_4BITS

+		writeToLCD(data>>4);

+	#endif

+	writeToLCD(data);

+}

+

+#endif /* _TDISP_LLD_BOARD_H */

+/** @} */

diff --git a/drivers/tdisp/HD44780/tdisp_lld_config.h b/drivers/tdisp/HD44780/tdisp_lld_config.h
deleted file mode 100644
index 3b37cd70..00000000
--- a/drivers/tdisp/HD44780/tdisp_lld_config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

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

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX 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/GFX 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/>.

-*/

-

-/**

- * @file    drivers/tdisp/HD44780/tdisp_lld_config.h

- * @brief   TDISP Driver subsystem low level driver header for the HD44780 display.

- *

- * @addtogroup TDISP

- * @{

- */

-

-#ifndef _TDISP_LLD_CONFIG_H

-#define _TDISP_LLD_CONFIG_H

-

-#if GFX_USE_TDISP

-

-/*===========================================================================*/

-/* Driver hardware support.                                                  */

-/*===========================================================================*/

-

-#define TDISP_DRIVER_NAME				"HD44780"

-

-#define TDISP_MAX_CUSTOM_CHARS			0x07

-

-#endif	/* GFX_USE_TDISP */

-

-#endif	/* _TDISP_LLD_CONFIG_H */

-/** @} */