Browse Source

Merge pull request #14 from Tectu/master

Merge Tectu Changes
remotes/origin_old/ugfx_release_2.6
Andrew Hannam 10 years ago
parent
commit
7cce52d2f6
  1. 6
      demos/modules/console/main.c
  2. 0
      demos/modules/gdisp/gdisp_basics/gfxconf.h
  3. 0
      demos/modules/gdisp/gdisp_basics/main.c
  4. 0
      demos/modules/gdisp/gdisp_circles/gfxconf.h
  5. 0
      demos/modules/gdisp/gdisp_circles/main.c
  6. 0
      demos/modules/gdisp/gdisp_text/gfxconf.h
  7. 0
      demos/modules/gdisp/gdisp_text/main.c
  8. 55
      demos/modules/tdisp/gfxconf.h
  9. 67
      demos/modules/tdisp/main.c
  10. 2
      drivers/gdisp/ILI9320/gdisp_lld_board_example.h
  11. 4
      drivers/gdisp/S6D1121/gdisp_lld_board_example.h
  12. 2
      drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
  13. 4
      drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
  14. 120
      drivers/tdisp/HD44780/tdisp_lld.c
  15. 6
      drivers/tdisp/HD44780/tdisp_lld.mk
  16. 64
      drivers/tdisp/HD44780/tdisp_lld_board_example.h
  17. 45
      drivers/tdisp/HD44780/tdisp_lld_config.h
  18. 1
      gfx.mk
  19. 23
      gfxconf.example.h
  20. 26
      include/gdisp/lld/emulation.c
  21. 11
      include/gfx.h
  22. 56
      include/tdisp/lld/tdisp_lld.h
  23. 87
      include/tdisp/options.h
  24. 146
      include/tdisp/tdisp.h
  25. 2
      releases.txt
  26. 110
      src/tdisp/tdisp.c
  27. 2
      src/tdisp/tdisp.mk

6
demos/modules/console/main.c

@ -18,12 +18,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* The following stuff is optional in your gfxconf.h:
*
* #define GDISP_NEED_SCROLL TRUE (optional but recommended if your GDISP driver supports it)
*/
#include "ch.h"
#include "hal.h"
#include "chprintf.h"

0
demos/modules/gdisp_basics/gfxconf.h → demos/modules/gdisp/gdisp_basics/gfxconf.h

0
demos/modules/gdisp_basics/main.c → demos/modules/gdisp/gdisp_basics/main.c

0
demos/modules/gdisp_circles/gfxconf.h → demos/modules/gdisp/gdisp_circles/gfxconf.h

0
demos/modules/gdisp_circles/main.c → demos/modules/gdisp/gdisp_circles/main.c

0
demos/modules/gdisp_text/gfxconf.h → demos/modules/gdisp/gdisp_text/gfxconf.h

0
demos/modules/gdisp_text/main.c → demos/modules/gdisp/gdisp_text/main.c

55
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 */

67
demos/modules/tdisp/main.c

@ -0,0 +1,67 @@
/*
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/>.
*/
#include "ch.h"
#include "hal.h"
#include "gfx.h"
int main(void) {
char charmap[8];
halInit();
chSysInit();
tdispInit();
/* reset cursor position and clear the screen */
tdispHome();
tdispClear();
/* set cursor position and draw single characters */
tdispSetCursor(4, 0);
tdispDrawChar('H');
tdispDrawChar('D');
tdispDrawChar('4');
tdispDrawChar('4');
tdispDrawChar('7');
tdispDrawChar('8');
tdispDrawChar('0');
/* draw a string to a given location */
tdispDrawStringLocation(0, 1, "chibios-gfx.com");
/* create and display a custom made character */
charmap[0] = 0b00000;
charmap[1] = 0b00100;
charmap[2] = 0b00010;
charmap[3] = 0b11111;
charmap[4] = 0b00010;
charmap[5] = 0b00100;
charmap[6] = 0b00000;
charmap[7] = 0b00000;
tdispCreateChar(0, charmap);
tdispHome();
tdispDrawChar(0);
while(TRUE) {
chThdSleepMilliseconds(250);
}
}

2
drivers/gdisp/ILI9320/gdisp_lld_board_example.h

@ -19,7 +19,7 @@
*/
/**
* @file drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
* @file drivers/gdisp/ILI9320/gdisp_lld_board_example.h
* @brief GDISP Graphic Driver subsystem board interface for the ILI9320 display.
*
* @addtogroup GDISP

4
drivers/gdisp/S6D1121/gdisp_lld_board_example.h

@ -19,8 +19,8 @@
*/
/**
* @file drivers/gdisp/SSD1289/gdisp_lld_board_example.h
* @brief GDISP Graphic Driver subsystem board interface for the SSD1289 display.
* @file drivers/gdisp/S6D1121/gdisp_lld_board_example.h
* @brief GDISP Graphic Driver subsystem board interface for the S6D1121 display.
*
* @addtogroup GDISP
* @{

2
drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h

@ -20,7 +20,7 @@
/**
* @file drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
* @brief GDISP Graphic Driver subsystem board interface for the SSD1289 display.
* @brief GDISP Graphic Driver subsystem board interface for the S6D1121 display
*
* @addtogroup GDISP
* @{

4
drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h

@ -19,8 +19,8 @@
*/
/**
* @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
* @brief GINPUT Touch low level driver source for the ADS7843 on the example board.
* @file drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
* @brief GINPUT ouch low level driver source for the ADS7843 on the FireBull STM32F103-FB board.
*
* @defgroup Mouse Mouse
* @ingroup GINPUT

120
drivers/tdisp/HD44780/tdisp_lld.c

@ -0,0 +1,120 @@
/*
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);
}
#endif /* GFX_USE_TDISP */
/** @} */

6
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

64
drivers/tdisp/HD44780/tdisp_lld_board_example.h

@ -0,0 +1,64 @@
/*
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 */
/** @} */

45
drivers/tdisp/HD44780/tdisp_lld_config.h

@ -0,0 +1,45 @@
/*
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 */
/** @} */

1
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

23
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

26
include/gdisp/lld/emulation.c

@ -18,20 +18,23 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
Emulation routines included into gdisp_lld.c
*/
/*
Even though this is a software emulation of a low level driver
most validation doesn't need to happen here as eventually
we call a real low level driver routine and if validation is
required - it will do it.
*/
/**
* @file include/gdisp/lld/emulation.c
* @brief GDISP emulation routines for stuff the driver dosen't support
*
* @addtogroup GDISP
*
* @details Even though this is a software emulation of a low level driver
* most validation doesn't need to happen here as eventually
* we call a real low level driver routine and if validation is
* required - it will do it.
*
* @{
*/
#ifndef GDISP_EMULATION_C
#define GDISP_EMULATION_C
#if GFX_USE_GDISP || defined(__DOXYGEN__)
#if GFX_USE_GDISP /*|| defined(__DOXYGEN__) */
#ifndef GDISP_LLD_NO_STRUCT
static struct GDISPDriver {
@ -765,4 +768,5 @@ void *GDISP_LLD(query)(unsigned what) {
#endif /* GFX_USE_GDISP */
#endif /* GDISP_EMULATION_C */
/** @} */

11
include/gfx.h

@ -45,6 +45,15 @@
#ifndef GFX_USE_GDISP
#define GFX_USE_GDISP FALSE
#endif
/**
* @brief GFX Text Display Basic API
* @details Defaults to FALSE
* @note Also add the specific hardware driver to your makefile.
* Eg. include $(GFXLIB)/drivers/tdisp/HD44780/tdisp_lld.mk
*/
#ifndef GFX_USE_TDISP
#define GFX_USE_TDISP FALSE
#endif
/**
* @brief GFX Graphics Windowing API
* @details Defaults to FALSE
@ -94,6 +103,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 +119,7 @@
#include "gdisp/gdisp.h"
#include "gwin/gwin.h"
#include "ginput/ginput.h"
#include "tdisp/tdisp.h"
#endif /* _GFX_H */
/** @} */

56
include/tdisp/lld/tdisp_lld.h

@ -0,0 +1,56 @@
/*
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 void tdisp_lld_write_cmd(uint8_t data);
extern void tdisp_lld_write_data(uint8_t data);
extern bool_t tdisp_lld_init(void);
extern void tdisp_lld_set_cursor(coord_t col, coord_t row);
extern void tdisp_lld_create_char(uint8_t address, char *charmap);
extern void tdisp_lld_clear(void);
extern void tdisp_lld_home(void);
#ifdef __cplusplus
}
#endif
#endif /* GFX_USE_TDISP */
#endif /* _TDISP_LLD_H */
/** @} */

87
include/tdisp/options.h

@ -0,0 +1,87 @@
/*
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
#if GFX_USE_TDISP
/**
* @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 /* GFX_USE_TDISP */
#endif /* _TDISP_OPTIONS_H */
/** @} */

146
include/tdisp/tdisp.h

@ -0,0 +1,146 @@
/*
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.
* Due the TDISP module is completely encapsulated from the other modules, it's very fast and lightweight.
*
* @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: tdispSetAttributes(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 tdispSetCursor(coord_t col, coord_t row);
/**
* @brief Store a custom character in RAM
*
* @note This usually must be done after each power-up since most
* LCDs lose their RAM content.
*
* @param[in] address On which address to store the character (from 0 up to max)
* @param[in] charmap The character to be stored.
*/
void tdispCreateChar(uint8_t address, char *charmap);
/**
* @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 */
/** @} */

2
releases.txt

@ -4,6 +4,8 @@
current release: 1.5
FEATURE: Added ILI9325 driver - Thanks to Chris van Dongen aka _Sjaak
FEATURE: Added TDISP module
FIX: tdispGotoXY() renamed to tdispSetCursor()
*** changes after 1.4 ***

110
src/tdisp/tdisp.c

@ -0,0 +1,110 @@
/*
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 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__)
static uint8_t _displaycontrol;
bool_t tdispInit(void) {
bool_t ret;
ret = tdisp_lld_init();
return ret;
}
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_OFF:
_displaycontrol &=~ 0x00;
tdisp_lld_write_cmd(0x08 | _displaycontrol);
break;
}
}
void tdispClear(void) {
tdisp_lld_clear();
}
void tdispHome(void) {
tdisp_lld_home();
}
void tdispCreateChar(uint8_t address, char *charmap) {
tdisp_lld_create_char(address, charmap);
}
void tdispSetCursor(coord_t col, coord_t row) {
tdisp_lld_set_cursor(col, row);
}
void tdispDrawChar(char c) {
tdisp_lld_write_data(c);
}
void tdispDrawString(char *s) {
while(*s)
tdispDrawChar(*s++);
}
void tdispDrawCharLocation(coord_t col, coord_t row, char c) {
tdispSetCursor(col, row);
tdispDrawChar(c);
}
void tdispDrawStringLocation(coord_t col, coord_t row, char *s) {
tdispSetCursor(col, row);
tdispDrawString(s);
}
#endif /* GFX_USE_TDISP */
/** @} */

2
src/tdisp/tdisp.mk

@ -0,0 +1,2 @@
GFXSRC += $(GFXLIB)/src/tdisp/tdisp.c
Loading…
Cancel
Save