Merge branch 'tdisp'

4 files changed, 272 insertions, 0 deletions

diff --git a/include/gfx.h b/include/gfx.h
index 9dfe681a..b6107de6 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -94,6 +94,7 @@
 #include "gdisp/options.h"

 #include "gwin/options.h"

 #include "ginput/options.h"

+#include "tdisp/options.h"

 

 /**

  * Inter-dependancy safety checks on the sub-systems.

@@ -109,6 +110,7 @@
 #include "gdisp/gdisp.h"

 #include "gwin/gwin.h"

 #include "ginput/ginput.h"

+#include "tdisp/tdisp.h"

 

 #endif /* _GFX_H */

 /** @} */

diff --git a/include/tdisp/lld/tdisp_lld.h b/include/tdisp/lld/tdisp_lld.h
new file mode 100644
index 00000000..a8f2e4b1
--- /dev/null
+++ b/include/tdisp/lld/tdisp_lld.h
@@ -0,0 +1,52 @@
+/*
+    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    include/tdisp/lld/tdisp_lld.h
+ * @brief   TDISP driver subsystem low level driver header.
+ *
+ * @addtogroup TDISP
+ * @{
+ */
+
+#ifndef _TDISP_LLD_H
+#define _TDISP_LLD_H
+
+#if GFX_USE_TDISP || defined(__DOXYGEN__)
+
+#include "tdisp_lld_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern bool_t foo(void);
+extern void write_cmd(uint8_t data);
+extern void write_data(uint8_t data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GFX_USE_TDISP */
+
+#endif /* _TDISP_LLD_H */
+/** @} */
+
diff --git a/include/tdisp/options.h b/include/tdisp/options.h
new file mode 100644
index 00000000..a7bab720
--- /dev/null
+++ b/include/tdisp/options.h
@@ -0,0 +1,84 @@
+/*

+    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    include/tdisp/options.h

+ * @brief   TDISP sub-system options header file.

+ *

+ * @addtogroup TDISP

+ * @{

+ */

+

+#ifndef _TDISP_OPTIONS_H

+#define _TDISP_OPTIONS_H

+

+/**

+ * @name    TDISP configuration

+ * @{

+ */

+

+	/**

+	 * @brief	How many rows of characters the TDISP provides

+	 */

+	#ifndef TDISP_ROWS

+		#define TDISP_ROWS		2

+	#endif

+

+	/**

+	 * @brief	How many columns of characters the TDISP provides

+	 */

+	#ifndef TDISP_COLUMNS

+		#define TDISP_COLUMNS	16

+	#endif

+

+/** @} */

+

+/**

+ * @name	TDISP interface configuration

+ * @note	Only one of these interfaces can be selected at a time!

+ * @{

+ */

+	/**

+	 * @brief	Use the 4-bit paralle interface

+	 */

+	#ifndef TDISP_NEED_4BIT_MODE

+		#define TDISP_NEED_4BIT_MODE	FALSE

+	#endif

+

+	/**

+	 * @brief	Use the 8-bit parallel interface

+	 */

+	#ifndef TDISP_NEED_8BIT_MODE

+		#define TDISP_NEED_8BIT_MODE	FALSE

+	#endif

+

+	#if (!TDISP_NEED_4BIT_MODE && !TDISP_NEED_8BIT_MODE)

+		#error "Either TDISP_NEED_4BIT_MODE or TDISP_NEED_8BIT_MODE needs to be set to TRUE in your gfxconf.h!"

+	#endif

+

+	#if (TDISP_NEED_4BIT_MODE && TDISP_NEED_8BIT_MODE)

+		#error "Only TDISP_NEED_4BIT_MODE or TDISP_NEED_8BIT_MODE can be set to TRUE, not both at one!"

+	#endif

+

+/** @} */

+

+#endif /* _TDISP_OPTIONS_H */

+/** @} */

+

diff --git a/include/tdisp/tdisp.h b/include/tdisp/tdisp.h
new file mode 100644
index 00000000..58de7af2
--- /dev/null
+++ b/include/tdisp/tdisp.h
@@ -0,0 +1,134 @@
+/*
+    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    include/tdisp/tdisp.h
+ * @brief   TDISP Graphic Driver subsystem header file.
+ *
+ * @addtogroup TDISP
+ *
+ * @details		The TDISP module provides high level abstraction to interface pixel oriented graphic displays.
+ *
+ * @pre			GFX_USE_TDISP must be set to TRUE in gfxconf.h
+ *
+ * @{
+ */
+
+#ifndef _TDISP_H
+#define _TDISP_H
+
+#include "gfx.h"
+
+#if GFX_USE_TDISP || defined(__DOXYGEN__)
+
+/* Include the low level driver information */
+#include "tdisp/lld/tdisp_lld.h"
+
+/**
+ * @name	TDISP display attributes
+ * @{
+ */
+#define	TDISP_ON				0x01
+#define TDISP_OFF				0x02
+#define TDISP_CURSOR_ON			0x03
+#define TDISP_CURSOR_OFF		0x04
+#define TDISP_CURSOR_BLINK_ON	0x05
+#define TDISP_CURSOR_BLINK_OFF	0x06
+/** @} */
+
+/**
+ * @brief	TDISP driver initialisation
+ * @note	This function is not implicitly invoked by @p halInit().
+ *			It must be called manually.
+ *
+ * @return	TRUE if success, FALSE otherwise
+ *
+ * @init
+ */
+bool_t tdispInit(void);
+
+/**
+ * @brief	Control different display properties
+ * @note	Multiple attributes can be passed using the OR operator.
+ * @note	Example: TDISP_DISPLAY_ON | TDISP_CURSOR_BLINK
+ *
+ * @param[in] attributes	The attributes
+ */
+void tdispSetAttributes(uint8_t attributes);
+
+/**
+ * @brief	Clears the display
+ */
+void tdispClear(void);
+
+/**
+ * @brief	Sets the cursor to it's home position ( 0/0 )
+ */
+void tdispHome(void);
+
+/**
+ * @brief	Set cursor to a certain position
+ *
+ * @param[in] col	The column
+ * @param[in] row	The row
+ */
+void tdispGotoXY(coord_t col, coord_t row);
+
+/**
+ * @brief	Draws a single character at the current cursor position
+ *
+ * @param[in] c		The character to be drawn
+ */
+void tdispDrawChar(char c);
+
+/**
+ * @brief	Draws a string at the current cursor position
+ *
+ * @param[in] s		The string to be drawn
+ */
+void tdispDrawString(char *s);
+
+/**
+ * @brief	Draws a single character at a given position
+ * @note	This function manipulates the cursor position and it will not be
+ *			reset to it's original state
+ *
+ * @param[in] col	The column
+ * @param[in] row	The row
+ * @param[in] c		The character to be drawn
+ */
+void tdispDrawCharLocation(coord_t col, coord_t row, char c);
+
+/**
+ * @brief	Draws a string at a given position
+ * @note	This function manipulates the cursor position and it will not be
+ *			reset to it's original state
+ *
+ * @param[in] col	The column
+ * @param[in] row	The row
+ * @param[in] s		The string to be drawn
+ */
+void tdispDrawStringLocation(coord_t col, coord_t row, char *s);
+
+#endif /* GFX_USE_TDISP */
+
+#endif /* _TDISP_H */
+/** @} */
+