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 --- drivers/tdisp/HD44780/tdisp_lld.c | 87 +++++++++++++++++++++++++ drivers/tdisp/HD44780/tdisp_lld.mk | 6 ++ drivers/tdisp/HD44780/tdisp_lld_board_example.h | 63 ++++++++++++++++++ drivers/tdisp/HD44780/tdisp_lld_config.h | 44 +++++++++++++ gfx.mk | 1 + include/gfx.h | 1 + include/tdisp/lld/tdisp_lld.h | 51 +++++++++++++++ include/tdisp/tdisp.h | 56 ++++++++++++++++ src/tdisp/tdisp.c | 78 ++++++++++++++++++++++ src/tdisp/tdisp.mk | 2 + 10 files changed, 389 insertions(+) create mode 100644 drivers/tdisp/HD44780/tdisp_lld.c create mode 100644 drivers/tdisp/HD44780/tdisp_lld.mk create mode 100644 drivers/tdisp/HD44780/tdisp_lld_board_example.h create mode 100644 drivers/tdisp/HD44780/tdisp_lld_config.h create mode 100644 include/tdisp/lld/tdisp_lld.h create mode 100644 include/tdisp/tdisp.h create mode 100644 src/tdisp/tdisp.c create mode 100644 src/tdisp/tdisp.mk diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c new file mode 100644 index 00000000..b830a7ca --- /dev/null +++ b/drivers/tdisp/HD44780/tdisp_lld.c @@ -0,0 +1,87 @@ +/* + 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 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__)*/ + +#ifndef TDISP_ROWS + #define TDISP_ROWS 16 +#endif +#ifndef TDISP_COLUMNS + #define TDISP_COLUMNS 2 +#endif + +#include "tdisp_lld_board_example.h" + +void TDISP_LLD(write_cmd)(uint8_t data) { + setpin_rs(FALSE); + setpin_rw(FALSE); + + write_bus(data); + + setpin_e(TRUE); + chThdSleepMicroseconds(1); + setpin_e(FALSE); + chThdSleepMicroseconds(5); +} + +void TDISP_LLD(write_data)(uint8_t data) { + setpin_rs(TRUE); + setpin_rw(FALSE); + + write_bus(data); + + setpin_e(TRUE); + chThdSleepMicroseconds(1); + setpin_e(FALSE); + chThdSleepMicroseconds(5); +} + +bool_t TDISP_LLD(init)(void) { + /* initialise hardware */ + init_board(); + + /* initialise controller */ + 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; +} + +#endif /* GFX_USE_TDISP */ + diff --git a/drivers/tdisp/HD44780/tdisp_lld.mk b/drivers/tdisp/HD44780/tdisp_lld.mk new file mode 100644 index 00000000..88780bea --- /dev/null +++ b/drivers/tdisp/HD44780/tdisp_lld.mk @@ -0,0 +1,6 @@ +# List the required driver. +GFXSRC += $(GFXLIB)/drivers/tdisp/HD44780/tdisp_lld.c + +# Required include directories +GFXINC += $(GFXLIB)/drivers/tdisp/HD44780 + diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_example.h b/drivers/tdisp/HD44780/tdisp_lld_board_example.h new file mode 100644 index 00000000..e07116d8 --- /dev/null +++ b/drivers/tdisp/HD44780/tdisp_lld_board_example.h @@ -0,0 +1,63 @@ +/* + 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 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(GPIOD, 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(GPIOD, data); +} + +#endif /* _TDISP_LLD_BOARD_H */ + diff --git a/drivers/tdisp/HD44780/tdisp_lld_config.h b/drivers/tdisp/HD44780/tdisp_lld_config.h new file mode 100644 index 00000000..7ea80ea2 --- /dev/null +++ b/drivers/tdisp/HD44780/tdisp_lld_config.h @@ -0,0 +1,44 @@ +/* + 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 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_LLD(x) tdisp_lld_##x##_HD44780 + +#endif /* GFX_USE_TDISP */ + +#endif /* _TDISP_LLD_CONFIG_H */ +/** @} */ diff --git a/gfx.mk b/gfx.mk index 545e3157..c4bb23b2 100644 --- a/gfx.mk +++ b/gfx.mk @@ -7,6 +7,7 @@ GFXINC += $(GFXLIB)/include GFXSRC += include $(GFXLIB)/src/gdisp/gdisp.mk +include $(GFXLIB)/src/tdisp/tdisp.mk include $(GFXLIB)/src/gevent/gevent.mk include $(GFXLIB)/src/gtimer/gtimer.mk include $(GFXLIB)/src/gwin/gwin.mk 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 */ + diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c new file mode 100644 index 00000000..73db93a1 --- /dev/null +++ b/src/tdisp/tdisp.c @@ -0,0 +1,78 @@ +/* + 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 src/tdisp/tdisp.c + * @brief TDISP Driver code. + * + * @addtogroup TDISP + * @{ + */ +#include "ch.h" +#include "hal.h" +#include "gfx.h" + +#if GFX_USE_TDISP || defined(__DOXYGEN__) + +bool_t tdispInit(void) { + bool_t ret; + + ret = TDISP_LLD(init)(); + + return ret; +} + +void tdispClear(void) { + TDISP_LLD(write_cmd)(0x01); +} + +void tdispHome(void) { + TDISP_LLD(write_cmd)(0x02); +} + +void tdispGotoXY(coord_t col, coord_t row) { + uint8_t row_offsets[] = { 0x00, 0x40, 0x14, 0x54 }; + + TDISP_LLD(write_cmd)(0x80 | (col + row_offsets[row])); +} + +void tdispDrawChar(char c) { + TDISP_LLD(write_data)(c); +} + +void tdispDrawString(char *s) { + char c; + + while(c = s++) + tdispDrawChar(c); +} + +void tdispDrawCharLocation(coord_t x, coord_t y, char c) { + tdispGotoXY(x, y); + tdispDrawChar(c); +} + +void tdispDrawStringLocation(coord_t x, coord_t y, char *s) { + tdispGotoXY(x, y); + tdispDrawString(s); +} + +#endif /* GFX_USE_TDISP */ + diff --git a/src/tdisp/tdisp.mk b/src/tdisp/tdisp.mk new file mode 100644 index 00000000..a33fa34a --- /dev/null +++ b/src/tdisp/tdisp.mk @@ -0,0 +1,2 @@ +GFXSRC += $(GFXLIB)/src/tdisp/tdisp.c + -- 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 --- drivers/tdisp/HD44780/tdisp_lld.c | 1 + drivers/tdisp/HD44780/tdisp_lld_board_example.h | 1 + include/tdisp/lld/tdisp_lld.h | 1 + include/tdisp/tdisp.h | 61 ++++++++++++++++++++++++- src/tdisp/tdisp.c | 5 +- 5 files changed, 65 insertions(+), 4 deletions(-) diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c index b830a7ca..0cbd414b 100644 --- a/drivers/tdisp/HD44780/tdisp_lld.c +++ b/drivers/tdisp/HD44780/tdisp_lld.c @@ -84,4 +84,5 @@ bool_t TDISP_LLD(init)(void) { } #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 e07116d8..de9e0b0b 100644 --- a/drivers/tdisp/HD44780/tdisp_lld_board_example.h +++ b/drivers/tdisp/HD44780/tdisp_lld_board_example.h @@ -60,4 +60,5 @@ void write_bus(uint8_t data) { } #endif /* _TDISP_LLD_BOARD_H */ +/** @} */ 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 */ +/** @} */ diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index 73db93a1..fe794140 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -64,15 +64,16 @@ void tdispDrawString(char *s) { tdispDrawChar(c); } -void tdispDrawCharLocation(coord_t x, coord_t y, char c) { +void tdispDrawCharLocation(coord_t col, coord_t row, char c) { tdispGotoXY(x, y); tdispDrawChar(c); } -void tdispDrawStringLocation(coord_t x, coord_t y, char *s) { +void tdispDrawStringLocation(coord_t col, coord_t row, char *s) { tdispGotoXY(x, y); tdispDrawString(s); } #endif /* GFX_USE_TDISP */ +/** @} */ -- 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 --- drivers/tdisp/HD44780/tdisp_lld.c | 35 ++++++++++++++++--------- drivers/tdisp/HD44780/tdisp_lld_board_example.h | 4 +-- include/tdisp/tdisp.h | 16 +++++++++++ src/tdisp/tdisp.c | 4 +-- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c index 0cbd414b..9644eaa8 100644 --- a/drivers/tdisp/HD44780/tdisp_lld.c +++ b/drivers/tdisp/HD44780/tdisp_lld.c @@ -41,42 +41,51 @@ #include "tdisp_lld_board_example.h" -void TDISP_LLD(write_cmd)(uint8_t data) { - setpin_rs(FALSE); - setpin_rw(FALSE); - +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); - write_bus(data); - - setpin_e(TRUE); - chThdSleepMicroseconds(1); - setpin_e(FALSE); - chThdSleepMicroseconds(5); + #if TDISP_NEED_4BIT_MODE + _writeData(data>>4); + #endif + _writeData(data); } bool_t TDISP_LLD(init)(void) { - /* initialise hardware */ + /* initialise MCU hardware */ init_board(); - /* initialise controller */ + /* 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); diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_example.h b/drivers/tdisp/HD44780/tdisp_lld_board_example.h index de9e0b0b..3f5c47d7 100644 --- a/drivers/tdisp/HD44780/tdisp_lld_board_example.h +++ b/drivers/tdisp/HD44780/tdisp_lld_board_example.h @@ -31,7 +31,7 @@ void init_board(void) { palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); - palSetGroupMode(GPIOD, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); + palSetGroupMode(GPIOG, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); } void setpin_e(bool_t state) { @@ -56,7 +56,7 @@ void setpin_rw(bool_t state) { } void write_bus(uint8_t data) { - palWritePort(GPIOD, data); + palWritePort(GPIOG, data); } #endif /* _TDISP_LLD_BOARD_H */ 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(). diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index fe794140..a6e5e2f5 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -65,12 +65,12 @@ void tdispDrawString(char *s) { } void tdispDrawCharLocation(coord_t col, coord_t row, char c) { - tdispGotoXY(x, y); + tdispGotoXY(col, row); tdispDrawChar(c); } void tdispDrawStringLocation(coord_t col, coord_t row, char *s) { - tdispGotoXY(x, y); + tdispGotoXY(col, row); tdispDrawString(s); } -- 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 --- drivers/tdisp/HD44780/tdisp_lld.c | 7 ------- include/tdisp/tdisp.h | 7 +++++++ src/tdisp/tdisp.c | 5 ++++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c index 9644eaa8..2e152977 100644 --- a/drivers/tdisp/HD44780/tdisp_lld.c +++ b/drivers/tdisp/HD44780/tdisp_lld.c @@ -32,13 +32,6 @@ #if GFX_USE_TDISP /*|| defined(__DOXYGEN__)*/ -#ifndef TDISP_ROWS - #define TDISP_ROWS 16 -#endif -#ifndef TDISP_COLUMNS - #define TDISP_COLUMNS 2 -#endif - #include "tdisp_lld_board_example.h" static void _writeData(uint8_t data) { 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 diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index a6e5e2f5..edd5b423 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -50,6 +50,9 @@ void tdispHome(void) { void tdispGotoXY(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])); } @@ -60,7 +63,7 @@ void tdispDrawChar(char c) { void tdispDrawString(char *s) { char c; - while(c = s++) + while(c = *s++) tdispDrawChar(c); } -- cgit v1.2.3 From 8da31d0c65e9f72d241cbb9013c0e0d38a34fb95 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Thu, 10 Jan 2013 15:09:35 +0100 Subject: updated gfxconf.h --- gfxconf.example.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/gfxconf.example.h b/gfxconf.example.h index 7bcdab43..82345c2d 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -14,14 +14,15 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -/* GFX sub-systems to turn on */ +/* GFX subsystems to turn on */ #define GFX_USE_GDISP FALSE +#define GFX_USE_TDISP FALSE #define GFX_USE_GWIN FALSE #define GFX_USE_GEVENT FALSE #define GFX_USE_GTIMER FALSE #define GFX_USE_GINPUT FALSE -/* Features for the GDISP sub-system. */ +/* Features for the GDISP subsystem */ #define GDISP_NEED_VALIDATION TRUE #define GDISP_NEED_CLIP TRUE #define GDISP_NEED_TEXT TRUE @@ -35,7 +36,7 @@ #define GDISP_NEED_ASYNC FALSE #define GDISP_NEED_MSGAPI FALSE -/* Builtin Fonts */ +/* GDISP - builtin fonts */ #define GDISP_OLD_FONT_DEFINITIONS FALSE #define GDISP_INCLUDE_FONT_SMALL TRUE #define GDISP_INCLUDE_FONT_LARGER TRUE @@ -43,24 +44,30 @@ #define GDISP_INCLUDE_FONT_UI2 TRUE #define GDISP_INCLUDE_FONT_LARGENUMBERS TRUE -/* Features for the GWIN sub-system. */ +/* TDISP options */ +#define TDISP_COLUMNS 16 +#define TDISP_ROWS 2 +#define TDISP_NEED_4BIT_MODE FALSE +#define TDISP_NEED_8BIT_MODE FALSE + +/* Features for the GWIN subsystem. */ #define GWIN_NEED_BUTTON FALSE #define GWIN_NEED_CONSOLE FALSE #define GWIN_NEED_GRAPH FALSE -/* Features for the GEVENT sub-system. */ +/* Features for the GEVENT subsystem. */ #define GEVENT_ASSERT_NO_RESOURCE FALSE -/* Features for the GTIMER sub-system. */ +/* Features for the GTIMER subsystem. */ /* NONE */ -/* Features for the GINPUT sub-system. */ +/* Features for the GINPUT subsystem. */ #define GINPUT_NEED_MOUSE FALSE #define GINPUT_NEED_KEYBOARD FALSE #define GINPUT_NEED_TOGGLE FALSE #define GINPUT_NEED_DIAL FALSE -/* Optional Parameters for various sub-systems */ +/* Optional Parameters for various subsystems */ /* #define GDISP_MAX_FONT_HEIGHT 16 #define GEVENT_MAXIMUM_SIZE 32 -- 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 +++++++++++------------- src/tdisp/tdisp.c | 15 +++++++++ 4 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 include/tdisp/options.h 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 */ 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); } -- 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 ++++++----- src/tdisp/tdisp.c | 20 ++++++++++++++++++-- 2 files changed, 24 insertions(+), 7 deletions(-) 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 /** @} */ /** diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index 807dd026..121ebcf5 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -31,10 +31,12 @@ #if GFX_USE_TDISP || defined(__DOXYGEN__) +static uint8_t _displaycontrol; + bool_t tdispInit(void) { bool_t ret; - ret = TDISP_LLD(init)(); + ret = TDIP_LLD(init)(); return ret; } @@ -42,14 +44,28 @@ bool_t tdispInit(void) { void tdispSetAttributes(uint8_t attributes) { 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: + case TDISP_CURSOR_BLINK_OFF: + _displaycontrol &=~ 0x00; + TDISP_LLD(write_cmd)(0x08 | _displaycontrol); break; } } -- cgit v1.2.3 From 249a1b345f1064957a6fd187fcdfbbcd3c1fecad Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 11 Jan 2013 15:04:33 +0100 Subject: added tdisp demo --- demos/modules/gdisp/gdisp_basics/gfxconf.h | 33 +++++++++++++ demos/modules/gdisp/gdisp_basics/main.c | 52 +++++++++++++++++++++ demos/modules/gdisp/gdisp_circles/gfxconf.h | 33 +++++++++++++ demos/modules/gdisp/gdisp_circles/main.c | 51 ++++++++++++++++++++ demos/modules/gdisp/gdisp_text/gfxconf.h | 33 +++++++++++++ demos/modules/gdisp/gdisp_text/main.c | 72 +++++++++++++++++++++++++++++ demos/modules/gdisp_basics/gfxconf.h | 33 ------------- demos/modules/gdisp_basics/main.c | 52 --------------------- demos/modules/gdisp_circles/gfxconf.h | 33 ------------- demos/modules/gdisp_circles/main.c | 51 -------------------- demos/modules/gdisp_text/gfxconf.h | 33 ------------- demos/modules/gdisp_text/main.c | 72 ----------------------------- demos/modules/tdisp/gfxconf.h | 55 ++++++++++++++++++++++ demos/modules/tdisp/main.c | 49 ++++++++++++++++++++ src/tdisp/tdisp.c | 2 +- 15 files changed, 379 insertions(+), 275 deletions(-) create mode 100644 demos/modules/gdisp/gdisp_basics/gfxconf.h create mode 100644 demos/modules/gdisp/gdisp_basics/main.c create mode 100644 demos/modules/gdisp/gdisp_circles/gfxconf.h create mode 100644 demos/modules/gdisp/gdisp_circles/main.c create mode 100644 demos/modules/gdisp/gdisp_text/gfxconf.h create mode 100644 demos/modules/gdisp/gdisp_text/main.c delete mode 100644 demos/modules/gdisp_basics/gfxconf.h delete mode 100644 demos/modules/gdisp_basics/main.c delete mode 100644 demos/modules/gdisp_circles/gfxconf.h delete mode 100644 demos/modules/gdisp_circles/main.c delete mode 100644 demos/modules/gdisp_text/gfxconf.h delete mode 100644 demos/modules/gdisp_text/main.c create mode 100644 demos/modules/tdisp/gfxconf.h create mode 100644 demos/modules/tdisp/main.c diff --git a/demos/modules/gdisp/gdisp_basics/gfxconf.h b/demos/modules/gdisp/gdisp_basics/gfxconf.h new file mode 100644 index 00000000..498046b4 --- /dev/null +++ b/demos/modules/gdisp/gdisp_basics/gfxconf.h @@ -0,0 +1,33 @@ +/** + * This file has a different license to the rest of the GFX system. + * You can copy, modify and distribute this file as you see fit. + * You do not need to publish your source modifications to this file. + * The only thing you are not permitted to do is to relicense it + * under a different license. + */ + +#ifndef _GFXCONF_H +#define _GFXCONF_H + +/* GFX sub-systems to turn on */ +#define GFX_USE_GDISP TRUE +#define GFX_USE_GWIN FALSE +#define GFX_USE_GEVENT FALSE +#define GFX_USE_GTIMER FALSE +#define GFX_USE_GINPUT FALSE + +/* Features for the GDISP sub-system. */ +#define GDISP_NEED_VALIDATION TRUE +#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_TEXT FALSE +#define GDISP_NEED_CIRCLE FALSE +#define GDISP_NEED_ELLIPSE FALSE +#define GDISP_NEED_ARC FALSE +#define GDISP_NEED_SCROLL FALSE +#define GDISP_NEED_PIXELREAD FALSE +#define GDISP_NEED_CONTROL FALSE +#define GDISP_NEED_MULTITHREAD FALSE +#define GDISP_NEED_ASYNC FALSE +#define GDISP_NEED_MSGAPI FALSE + +#endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/gdisp_basics/main.c b/demos/modules/gdisp/gdisp_basics/main.c new file mode 100644 index 00000000..fa0bef45 --- /dev/null +++ b/demos/modules/gdisp/gdisp_basics/main.c @@ -0,0 +1,52 @@ +/* + 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 . +*/ + +#include "ch.h" +#include "hal.h" +#include "gfx.h" + +int main(void) { + coord_t width, height; + coord_t i, j; + + halInit(); + chSysInit(); + + /* Initialize and clear the display */ + gdispInit(); + gdispClear(Black); + + // Get the screen size + width = gdispGetWidth(); + height = gdispGetHeight(); + + // Code Here + gdispDrawBox(10, 10, width/2, height/2, Yellow); + gdispFillArea(width/2, height/2, width/2-10, height/2-10, Blue); + gdispDrawLine(5, 30, width-50, height-40, Red); + + for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20) + gdispDrawPixel (i, j, White); + + while(TRUE) { + chThdSleepMilliseconds(500); + } +} + diff --git a/demos/modules/gdisp/gdisp_circles/gfxconf.h b/demos/modules/gdisp/gdisp_circles/gfxconf.h new file mode 100644 index 00000000..00d88e48 --- /dev/null +++ b/demos/modules/gdisp/gdisp_circles/gfxconf.h @@ -0,0 +1,33 @@ +/** + * This file has a different license to the rest of the GFX system. + * You can copy, modify and distribute this file as you see fit. + * You do not need to publish your source modifications to this file. + * The only thing you are not permitted to do is to relicense it + * under a different license. + */ + +#ifndef _GFXCONF_H +#define _GFXCONF_H + +/* GFX sub-systems to turn on */ +#define GFX_USE_GDISP TRUE +#define GFX_USE_GWIN FALSE +#define GFX_USE_GEVENT FALSE +#define GFX_USE_GTIMER FALSE +#define GFX_USE_GINPUT FALSE + +/* Features for the GDISP sub-system. */ +#define GDISP_NEED_VALIDATION TRUE +#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_TEXT FALSE +#define GDISP_NEED_CIRCLE TRUE +#define GDISP_NEED_ELLIPSE TRUE +#define GDISP_NEED_ARC TRUE +#define GDISP_NEED_SCROLL FALSE +#define GDISP_NEED_PIXELREAD FALSE +#define GDISP_NEED_CONTROL FALSE +#define GDISP_NEED_MULTITHREAD FALSE +#define GDISP_NEED_ASYNC FALSE +#define GDISP_NEED_MSGAPI FALSE + +#endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/gdisp_circles/main.c b/demos/modules/gdisp/gdisp_circles/main.c new file mode 100644 index 00000000..45764d4f --- /dev/null +++ b/demos/modules/gdisp/gdisp_circles/main.c @@ -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 . +*/ + +#include "ch.h" +#include "hal.h" +#include "gfx.h" + +int main(void) { + coord_t width, height; + + halInit(); + chSysInit(); + + /* Initialize and clear the display */ + gdispInit(); + gdispClear(Black); + + // Get the screen size + width = gdispGetWidth(); + height = gdispGetHeight(); + + // Code Here + gdispDrawCircle(width/2, height/2, 20, Yellow); + gdispFillCircle (width/4, height/4, 50, Blue); + gdispFillEllipse (width-100, height-100, 30, 60, Red); + gdispDrawEllipse (width-100, height-100, 50, 20, Yellow); + gdispDrawArc(width-width/8, height/8, 30, 10, 70, Gray); + gdispFillArc(width/8, height/8, 30, 10, 70, Gray); + + while(TRUE) { + chThdSleepMilliseconds(500); + } +} + diff --git a/demos/modules/gdisp/gdisp_text/gfxconf.h b/demos/modules/gdisp/gdisp_text/gfxconf.h new file mode 100644 index 00000000..a928806b --- /dev/null +++ b/demos/modules/gdisp/gdisp_text/gfxconf.h @@ -0,0 +1,33 @@ +/** + * This file has a different license to the rest of the GFX system. + * You can copy, modify and distribute this file as you see fit. + * You do not need to publish your source modifications to this file. + * The only thing you are not permitted to do is to relicense it + * under a different license. + */ + +#ifndef _GFXCONF_H +#define _GFXCONF_H + +/* GFX sub-systems to turn on */ +#define GFX_USE_GDISP TRUE +#define GFX_USE_GWIN FALSE +#define GFX_USE_GEVENT FALSE +#define GFX_USE_GTIMER FALSE +#define GFX_USE_GINPUT FALSE + +/* Features for the GDISP sub-system. */ +#define GDISP_NEED_VALIDATION TRUE +#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_CIRCLE FALSE +#define GDISP_NEED_ELLIPSE FALSE +#define GDISP_NEED_ARC FALSE +#define GDISP_NEED_SCROLL FALSE +#define GDISP_NEED_PIXELREAD FALSE +#define GDISP_NEED_CONTROL FALSE +#define GDISP_NEED_MULTITHREAD FALSE +#define GDISP_NEED_ASYNC FALSE +#define GDISP_NEED_MSGAPI FALSE + +#endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/gdisp_text/main.c b/demos/modules/gdisp/gdisp_text/main.c new file mode 100644 index 00000000..4dc45f71 --- /dev/null +++ b/demos/modules/gdisp/gdisp_text/main.c @@ -0,0 +1,72 @@ +/* + 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 . +*/ + +#include "ch.h" +#include "hal.h" +#include "gfx.h" + +int main(void) { + coord_t width, height; + font_t font1, font2, font3, font4; + const char *msg; + + halInit(); + chSysInit(); + + /* Initialize and clear the display */ + gdispInit(); + gdispClear(Black); + + // Get the screen size + width = gdispGetWidth(); + height = gdispGetHeight(); + + // Get the fonts we want to use + font1 = gdispOpenFont("UI2"); + font2 = gdispOpenFont("UI2 Double"); + font3 = gdispOpenFont("UI2 Narrow"); + font4 = gdispOpenFont("LargeNumbers"); + + // Display large numbers on the right (measuring the string) + msg = "123456"; + gdispDrawString(width-gdispGetStringWidth(msg, font4)-3, 3, msg, font4, Green); + + // Display the font name under it. + msg = gdispGetFontName(font4); + gdispDrawString(width-gdispGetStringWidth(msg, font1)-3, 20, msg, font1, Green); + + // Demonstrate our other fonts + gdispDrawString(10, 10, "Writing with Font 'UI2'", font1, Yellow); + gdispFillString(10, 35, "Writing with Font 'UI2 Double'", font2, Red, White); + gdispDrawStringBox(0, 50, width, 40, "Writing with Font 'UI2 Narrow'", font3, Red, justifyCenter); + gdispFillStringBox(0, 90, width, 40, "Filled Centered", font3, Pink, Gray, justifyCenter); + + // Clean up the fonts + gdispCloseFont(font1); + gdispCloseFont(font2); + gdispCloseFont(font3); + gdispCloseFont(font4); + + // Wait forever + while(TRUE) { + chThdSleepMilliseconds(500); + } +} + diff --git a/demos/modules/gdisp_basics/gfxconf.h b/demos/modules/gdisp_basics/gfxconf.h deleted file mode 100644 index 498046b4..00000000 --- a/demos/modules/gdisp_basics/gfxconf.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This file has a different license to the rest of the GFX system. - * You can copy, modify and distribute this file as you see fit. - * You do not need to publish your source modifications to this file. - * The only thing you are not permitted to do is to relicense it - * under a different license. - */ - -#ifndef _GFXCONF_H -#define _GFXCONF_H - -/* GFX sub-systems to turn on */ -#define GFX_USE_GDISP TRUE -#define GFX_USE_GWIN FALSE -#define GFX_USE_GEVENT FALSE -#define GFX_USE_GTIMER FALSE -#define GFX_USE_GINPUT FALSE - -/* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT FALSE -#define GDISP_NEED_CIRCLE FALSE -#define GDISP_NEED_ELLIPSE FALSE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_MULTITHREAD FALSE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE - -#endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp_basics/main.c b/demos/modules/gdisp_basics/main.c deleted file mode 100644 index fa0bef45..00000000 --- a/demos/modules/gdisp_basics/main.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - 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 . -*/ - -#include "ch.h" -#include "hal.h" -#include "gfx.h" - -int main(void) { - coord_t width, height; - coord_t i, j; - - halInit(); - chSysInit(); - - /* Initialize and clear the display */ - gdispInit(); - gdispClear(Black); - - // Get the screen size - width = gdispGetWidth(); - height = gdispGetHeight(); - - // Code Here - gdispDrawBox(10, 10, width/2, height/2, Yellow); - gdispFillArea(width/2, height/2, width/2-10, height/2-10, Blue); - gdispDrawLine(5, 30, width-50, height-40, Red); - - for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20) - gdispDrawPixel (i, j, White); - - while(TRUE) { - chThdSleepMilliseconds(500); - } -} - diff --git a/demos/modules/gdisp_circles/gfxconf.h b/demos/modules/gdisp_circles/gfxconf.h deleted file mode 100644 index 00d88e48..00000000 --- a/demos/modules/gdisp_circles/gfxconf.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This file has a different license to the rest of the GFX system. - * You can copy, modify and distribute this file as you see fit. - * You do not need to publish your source modifications to this file. - * The only thing you are not permitted to do is to relicense it - * under a different license. - */ - -#ifndef _GFXCONF_H -#define _GFXCONF_H - -/* GFX sub-systems to turn on */ -#define GFX_USE_GDISP TRUE -#define GFX_USE_GWIN FALSE -#define GFX_USE_GEVENT FALSE -#define GFX_USE_GTIMER FALSE -#define GFX_USE_GINPUT FALSE - -/* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT FALSE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE TRUE -#define GDISP_NEED_ARC TRUE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_MULTITHREAD FALSE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE - -#endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp_circles/main.c b/demos/modules/gdisp_circles/main.c deleted file mode 100644 index 45764d4f..00000000 --- a/demos/modules/gdisp_circles/main.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - 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 . -*/ - -#include "ch.h" -#include "hal.h" -#include "gfx.h" - -int main(void) { - coord_t width, height; - - halInit(); - chSysInit(); - - /* Initialize and clear the display */ - gdispInit(); - gdispClear(Black); - - // Get the screen size - width = gdispGetWidth(); - height = gdispGetHeight(); - - // Code Here - gdispDrawCircle(width/2, height/2, 20, Yellow); - gdispFillCircle (width/4, height/4, 50, Blue); - gdispFillEllipse (width-100, height-100, 30, 60, Red); - gdispDrawEllipse (width-100, height-100, 50, 20, Yellow); - gdispDrawArc(width-width/8, height/8, 30, 10, 70, Gray); - gdispFillArc(width/8, height/8, 30, 10, 70, Gray); - - while(TRUE) { - chThdSleepMilliseconds(500); - } -} - diff --git a/demos/modules/gdisp_text/gfxconf.h b/demos/modules/gdisp_text/gfxconf.h deleted file mode 100644 index a928806b..00000000 --- a/demos/modules/gdisp_text/gfxconf.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This file has a different license to the rest of the GFX system. - * You can copy, modify and distribute this file as you see fit. - * You do not need to publish your source modifications to this file. - * The only thing you are not permitted to do is to relicense it - * under a different license. - */ - -#ifndef _GFXCONF_H -#define _GFXCONF_H - -/* GFX sub-systems to turn on */ -#define GFX_USE_GDISP TRUE -#define GFX_USE_GWIN FALSE -#define GFX_USE_GEVENT FALSE -#define GFX_USE_GTIMER FALSE -#define GFX_USE_GINPUT FALSE - -/* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CIRCLE FALSE -#define GDISP_NEED_ELLIPSE FALSE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_MULTITHREAD FALSE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE - -#endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp_text/main.c b/demos/modules/gdisp_text/main.c deleted file mode 100644 index 4dc45f71..00000000 --- a/demos/modules/gdisp_text/main.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - 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 . -*/ - -#include "ch.h" -#include "hal.h" -#include "gfx.h" - -int main(void) { - coord_t width, height; - font_t font1, font2, font3, font4; - const char *msg; - - halInit(); - chSysInit(); - - /* Initialize and clear the display */ - gdispInit(); - gdispClear(Black); - - // Get the screen size - width = gdispGetWidth(); - height = gdispGetHeight(); - - // Get the fonts we want to use - font1 = gdispOpenFont("UI2"); - font2 = gdispOpenFont("UI2 Double"); - font3 = gdispOpenFont("UI2 Narrow"); - font4 = gdispOpenFont("LargeNumbers"); - - // Display large numbers on the right (measuring the string) - msg = "123456"; - gdispDrawString(width-gdispGetStringWidth(msg, font4)-3, 3, msg, font4, Green); - - // Display the font name under it. - msg = gdispGetFontName(font4); - gdispDrawString(width-gdispGetStringWidth(msg, font1)-3, 20, msg, font1, Green); - - // Demonstrate our other fonts - gdispDrawString(10, 10, "Writing with Font 'UI2'", font1, Yellow); - gdispFillString(10, 35, "Writing with Font 'UI2 Double'", font2, Red, White); - gdispDrawStringBox(0, 50, width, 40, "Writing with Font 'UI2 Narrow'", font3, Red, justifyCenter); - gdispFillStringBox(0, 90, width, 40, "Filled Centered", font3, Pink, Gray, justifyCenter); - - // Clean up the fonts - gdispCloseFont(font1); - gdispCloseFont(font2); - gdispCloseFont(font3); - gdispCloseFont(font4); - - // Wait forever - while(TRUE) { - chThdSleepMilliseconds(500); - } -} - diff --git a/demos/modules/tdisp/gfxconf.h b/demos/modules/tdisp/gfxconf.h new file mode 100644 index 00000000..5077e010 --- /dev/null +++ b/demos/modules/tdisp/gfxconf.h @@ -0,0 +1,55 @@ +/** + * This file has a different license to the rest of the GFX system. + * You can copy, modify and distribute this file as you see fit. + * You do not need to publish your source modifications to this file. + * The only thing you are not permitted to do is to relicense it + * under a different license. + */ + +#ifndef _GFXCONF_H +#define _GFXCONF_H + +/* GFX sub-systems to turn on */ +#define GFX_USE_TDISP TRUE +#define GFX_USE_GDISP FALSE +#define GFX_USE_GWIN FALSE +#define GFX_USE_GEVENT FALSE +#define GFX_USE_GTIMER FALSE +#define GFX_USE_GINPUT FALSE + +/* Features for the GDISP subsystem */ +#define GDISP_NEED_VALIDATION FALSE +#define GDISP_NEED_CLIP FALSE +#define GDISP_NEED_TEXT FALSE +#define GDISP_NEED_CIRCLE FALSE +#define GDISP_NEED_ELLIPSE FALSE +#define GDISP_NEED_ARC FALSE +#define GDISP_NEED_SCROLL FALSE +#define GDISP_NEED_PIXELREAD FALSE +#define GDISP_NEED_CONTROL FALSE +#define GDISP_NEED_MULTITHREAD FALSE +#define GDISP_NEED_ASYNC FALSE +#define GDISP_NEED_MSGAPI FALSE + +/* Features for the TDISP subsystem */ +#define TDISP_NEED_4BIT_MODE TRUE +#define TDISP_NEED_8BIT_MODE FALSE + +/* Builtin Fonts */ +#define GDISP_INCLUDE_FONT_SMALL FALSE +#define GDISP_INCLUDE_FONT_LARGER FALSE +#define GDISP_INCLUDE_FONT_UI1 FALSE +#define GDISP_INCLUDE_FONT_UI2 FALSE +#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE + +/* GWIN */ +#define GWIN_NEED_CONSOLE FALSE +#define GWIN_NEED_GRAPH FALSE +#define GWIN_NEED_BUTTON FALSE +#define GWIN_NEED_DIAL FALSE + +/* GINPUT */ +#define GINPUT_NEED_MOUSE FALSE + +#endif /* _GFXCONF_H */ + diff --git a/demos/modules/tdisp/main.c b/demos/modules/tdisp/main.c new file mode 100644 index 00000000..b67b3b8c --- /dev/null +++ b/demos/modules/tdisp/main.c @@ -0,0 +1,49 @@ +/* + 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 . +*/ + +#include "ch.h" +#include "hal.h" +#include "gfx.h" + +int main(void) { + halInit(); + chSysInit(); + + tdispInit(); + + tdispHome(); + tdispClear(); + + tdispGotoXY(4, 0); + tdispDrawChar('H'); + tdispDrawChar('D'); + tdispDrawChar('4'); + tdispDrawChar('4'); + tdispDrawChar('7'); + tdispDrawChar('8'); + tdispDrawChar('0'); + + tdispDrawStringLocation(0, 1, "chibios-gfx.com"); + + while(TRUE) { + chThdSleepMilliseconds(250); + } +} + diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index 121ebcf5..d57bae56 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -36,7 +36,7 @@ static uint8_t _displaycontrol; bool_t tdispInit(void) { bool_t ret; - ret = TDIP_LLD(init)(); + ret = TDISP_LLD(init)(); return ret; } -- cgit v1.2.3