From a2a87ddd458ef0811dfb71510d7027d23038005b Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Wed, 9 Jan 2013 14:29:32 +0100 Subject: added TDISP - experimental --- include/gfx.h | 1 + include/tdisp/lld/tdisp_lld.h | 51 +++++++++++++++++++++++++++++++++++++++ include/tdisp/tdisp.h | 56 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 include/tdisp/lld/tdisp_lld.h create mode 100644 include/tdisp/tdisp.h (limited to 'include') diff --git a/include/gfx.h b/include/gfx.h index 9dfe681a..79c176f4 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -109,6 +109,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..d548f107 --- /dev/null +++ b/include/tdisp/lld/tdisp_lld.h @@ -0,0 +1,51 @@ +/* + ChibiOS/GFX - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + 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 . +*/ + +/** + * @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/tdisp.h b/include/tdisp/tdisp.h new file mode 100644 index 00000000..9984ef62 --- /dev/null +++ b/include/tdisp/tdisp.h @@ -0,0 +1,56 @@ +/* + ChibiOS/GFX - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + 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 . +*/ + +/** + * @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" + +bool_t tdispInit(void); +void tdispClear(void); +void tdispHome(void); +void tdispGotoXY(coord_t col, coord_t row); +void tdispDrawChar(char c); +void tdispDrawString(char *s); +void tdispDrawCharLocation(coord_t x, coord_t y, char c); +void tdispDrawStringLocation(coord_t x, coord_t y, char *s); + +#endif /* GFX_USE_TDISP */ + +#endif /* _TDISP_H */ + -- cgit v1.2.3 From 6cc67bad84176614936f2c6439d640637186764d Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Thu, 10 Jan 2013 19:47:50 +0100 Subject: some TDISP doxygen --- include/tdisp/lld/tdisp_lld.h | 1 + include/tdisp/tdisp.h | 61 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/tdisp/lld/tdisp_lld.h b/include/tdisp/lld/tdisp_lld.h index d548f107..a8f2e4b1 100644 --- a/include/tdisp/lld/tdisp_lld.h +++ b/include/tdisp/lld/tdisp_lld.h @@ -48,4 +48,5 @@ extern void write_data(uint8_t data); #endif /* GFX_USE_TDISP */ #endif /* _TDISP_LLD_H */ +/** @} */ diff --git a/include/tdisp/tdisp.h b/include/tdisp/tdisp.h index 9984ef62..9d19e0cb 100644 --- a/include/tdisp/tdisp.h +++ b/include/tdisp/tdisp.h @@ -41,16 +41,73 @@ /* Include the low level driver information */ #include "tdisp/lld/tdisp_lld.h" +/** + * @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 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); -void tdispDrawCharLocation(coord_t x, coord_t y, char c); -void tdispDrawStringLocation(coord_t x, coord_t y, 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 */ +/** @} */ -- cgit v1.2.3 From d5e7afe756fe4c19dd9360baed23599b268709af Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Thu, 10 Jan 2013 14:51:31 +0100 Subject: 4-bit mode implemented --- include/tdisp/tdisp.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include') diff --git a/include/tdisp/tdisp.h b/include/tdisp/tdisp.h index 9d19e0cb..aa577f88 100644 --- a/include/tdisp/tdisp.h +++ b/include/tdisp/tdisp.h @@ -41,6 +41,22 @@ /* Include the low level driver information */ #include "tdisp/lld/tdisp_lld.h" +#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 + /** * @brief TDISP driver initialisation * @note This function is not implicitly invoked by @p halInit(). -- cgit v1.2.3 From 77a93bb43d373a59df9da29053b9e64b4b3cf474 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Thu, 10 Jan 2013 15:03:34 +0100 Subject: TDISP update --- include/tdisp/tdisp.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/tdisp/tdisp.h b/include/tdisp/tdisp.h index aa577f88..619a6bab 100644 --- a/include/tdisp/tdisp.h +++ b/include/tdisp/tdisp.h @@ -41,6 +41,13 @@ /* 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 -- cgit v1.2.3 From 905bb0292bb3f0e2ce633716528aae143605f767 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 11 Jan 2013 13:25:38 +0100 Subject: some tdisp update --- include/gfx.h | 1 + include/tdisp/options.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ include/tdisp/tdisp.h | 41 +++++++++++------------- 3 files changed, 104 insertions(+), 22 deletions(-) create mode 100644 include/tdisp/options.h (limited to 'include') 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 + + 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 . +*/ + +/** + * @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 @@ -75,6 +63,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 */ -- cgit v1.2.3 From c974ec449f9f298ca8e02b9985ef7b9595607081 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 11 Jan 2013 14:39:27 +0100 Subject: tdisp update --- include/tdisp/tdisp.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/tdisp/tdisp.h b/include/tdisp/tdisp.h index 4641b269..58de7af2 100644 --- a/include/tdisp/tdisp.h +++ b/include/tdisp/tdisp.h @@ -45,11 +45,12 @@ * @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 +#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 /** @} */ /** -- cgit v1.2.3