diff options
| -rw-r--r-- | include/gfx.h | 1 | ||||
| -rw-r--r-- | include/tdisp/options.h | 84 | ||||
| -rw-r--r-- | include/tdisp/tdisp.h | 41 | ||||
| -rw-r--r-- | src/tdisp/tdisp.c | 15 |
4 files changed, 119 insertions, 22 deletions
diff --git a/include/gfx.h b/include/gfx.h index 79c176f4..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.
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 index 619a6bab..4641b269 100644 --- a/include/tdisp/tdisp.h +++ b/include/tdisp/tdisp.h @@ -41,28 +41,16 @@ /* Include the low level driver information */ #include "tdisp/lld/tdisp_lld.h" -#ifndef TDISP_ROWS - #define TDISP_ROWS 2 -#endif -#ifndef TDISP_COLUMNS - #define TDISP_COLUMNS 16 -#endif - -#ifndef TDISP_NEED_4BIT_MODE - #define TDISP_NEED_4BIT_MODE FALSE -#endif - -#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 +/** + * @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 0x05 +/** @} */ /** * @brief TDISP driver initialisation @@ -76,6 +64,15 @@ 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); diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index edd5b423..807dd026 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -39,6 +39,21 @@ bool_t tdispInit(void) { return ret; } +void tdispSetAttributes(uint8_t attributes) { + switch(attributes) { + case TDISP_ON: + break; + case TDISP_OFF: + break; + case TDISP_CURSOR_ON: + break; + case TDISP_CURSOR_OFF: + break; + case TDISP_CURSOR_BLINK: + break; + } +} + void tdispClear(void) { TDISP_LLD(write_cmd)(0x01); } |