From 8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f Mon Sep 17 00:00:00 2001 From: Andrew Hannam Date: Sun, 11 Nov 2012 19:03:30 +1000 Subject: Touch Fixes. Deprecate Console Touch: - Move defines that may be altered by the touch config file to the lld header file. - Move the definition of the Touch driver structure to the lld config file. - Changed CONVERSIONS macro to TOUCHSCREEN_CONVERSIONS - Replaced references to GDISP_SCREEN_WIDTH with gdispGetWidth - Renamed TOUCHSCREEN_HAS_IRQ to TOUCHSCREEN_HAS_PRESSED to match new function name. - Added prototypes for calibration storage functions to touchscreen_lld.h so that either the lld driver or the application can define the function. Console: -Deprecated into "old" directory. Functionality replaced by gwin. --- drivers/gdisp/Win32/touchscreen_lld_config.h | 9 +- drivers/touchscreen/ADS7843/touchscreen_lld.c | 2 +- .../touchscreen/ADS7843/touchscreen_lld_config.h | 41 ++- drivers/touchscreen/XPT2046/touchscreen_lld.c | 2 +- .../touchscreen/XPT2046/touchscreen_lld_config.h | 41 ++- gfx.mk | 1 - include/console.h | 93 ------- include/touchscreen.h | 201 +++++++-------- include/touchscreen_lld.h | 277 ++++++++++----------- old/console.c | 216 ++++++++++++++++ old/console.h | 93 +++++++ releases.txt | 3 + src/console.c | 216 ---------------- src/touchscreen.c | 19 +- 14 files changed, 628 insertions(+), 586 deletions(-) delete mode 100644 include/console.h create mode 100644 old/console.c create mode 100644 old/console.h delete mode 100644 src/console.c diff --git a/drivers/gdisp/Win32/touchscreen_lld_config.h b/drivers/gdisp/Win32/touchscreen_lld_config.h index de200ef9..ef5d5a27 100644 --- a/drivers/gdisp/Win32/touchscreen_lld_config.h +++ b/drivers/gdisp/Win32/touchscreen_lld_config.h @@ -19,7 +19,7 @@ */ /** - * @file drivers/touchscreen/ADS7843/touchscreen_lld_config.h + * @file drivers/gdisp/Win32/touchscreen_lld_config.h * @brief Touchscreen Driver subsystem low level driver. * * @addtogroup TOUCHSCREEN @@ -35,14 +35,13 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define TOUCHSCREEN_HAS_IRQ TRUE +#define TOUCHSCREEN_HAS_PRESSED TRUE #define TOUCHSCREEN_HAS_PRESSURE FALSE #define TOUCHSCREEN_XY_INVERTED FALSE #define TOUCHSCREEN_STORE_CALIBRATION TRUE +#define TOUCHSCREEN_CONVERSIONS 1 -/* Nasty stuff to fix SPI dependancy in driver structure (which doesn't exist in Win32) */ -typedef struct SPIDriver_t {} SPIDriver; -typedef struct SPIConfig_t {} SPIConfig; +struct TouchscreenDriver {}; #endif /* GFX_USE_TOUCHSCREEN */ diff --git a/drivers/touchscreen/ADS7843/touchscreen_lld.c b/drivers/touchscreen/ADS7843/touchscreen_lld.c index 15b1d907..9b5d4aa0 100644 --- a/drivers/touchscreen/ADS7843/touchscreen_lld.c +++ b/drivers/touchscreen/ADS7843/touchscreen_lld.c @@ -211,7 +211,7 @@ uint16_t ts_lld_read_y(void) { } /* ---- Optional Routines ---- */ -#if TOUCHSCREEN_HAS_IRQ || defined(__DOXYGEN__) +#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__) /* * @brief for checking if touchscreen is pressed or not. * diff --git a/drivers/touchscreen/ADS7843/touchscreen_lld_config.h b/drivers/touchscreen/ADS7843/touchscreen_lld_config.h index 5769c288..056c8d7a 100644 --- a/drivers/touchscreen/ADS7843/touchscreen_lld_config.h +++ b/drivers/touchscreen/ADS7843/touchscreen_lld_config.h @@ -35,9 +35,48 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define TOUCHSCREEN_HAS_IRQ TRUE +#define TOUCHSCREEN_HAS_PRESSED TRUE #define TOUCHSCREEN_HAS_PRESSURE FALSE +struct TouchscreenDriver { + /* + * @brief Pointer to SPI driver. + * @note SPI driver must be enabled in mcuconf.h and halconf.h + */ + SPIDriver *spip; + + /* + * @brief Pointer to the SPI configuration structure. + * @note The lowest possible speed ~ 1-2MHz is to be used, otherwise + * will result in a lot of noise + */ + const SPIConfig *spicfg; + + /* + * @brief Touchscreen controller TPIRQ pin GPIO port + */ + ioportid_t tsIRQPort; + + /* + * @brief Touchscreen controller TPIRQ GPIO pin + * @note The interface is polled as of now, interrupt support is + * to be implemented in the future. + */ + ioportmask_t tsIRQPin; + + /* + * @brief Initialize the SPI with the configuration struct given or not + * If TRUE, spiStart is called by the init, otherwise not + * @note This is provided in such a case when SPI port is being shared + * across multiple peripherals, so not to disturb the SPI bus. + * You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE() + * macros to change the SPI configuration or speed before and + * after using the touchpad. An example case would be sharing the + * bus with a fast flash memory chip. + */ + bool_t direct_init; +}; + #endif /* GFX_USE_TOUCHSCREEN */ #endif /* TOUCHSCREEN_LLD_CONFIG_H */ diff --git a/drivers/touchscreen/XPT2046/touchscreen_lld.c b/drivers/touchscreen/XPT2046/touchscreen_lld.c index ef410b0d..2d3689d4 100644 --- a/drivers/touchscreen/XPT2046/touchscreen_lld.c +++ b/drivers/touchscreen/XPT2046/touchscreen_lld.c @@ -211,7 +211,7 @@ uint16_t ts_lld_read_y(void) { } /* ---- Optional Routines ---- */ -#if TOUCHSCREEN_HAS_IRQ || defined(__DOXYGEN__) +#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__) /* * @brief for checking if touchscreen is pressed or not. * diff --git a/drivers/touchscreen/XPT2046/touchscreen_lld_config.h b/drivers/touchscreen/XPT2046/touchscreen_lld_config.h index 1bb8718e..3a030b5d 100644 --- a/drivers/touchscreen/XPT2046/touchscreen_lld_config.h +++ b/drivers/touchscreen/XPT2046/touchscreen_lld_config.h @@ -35,9 +35,48 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define TOUCHSCREEN_HAS_IRQ TRUE +#define TOUCHSCREEN_HAS_PRESSED TRUE #define TOUCHSCREEN_HAS_PRESSURE TRUE +struct TouchscreenDriver { + /* + * @brief Pointer to SPI driver. + * @note SPI driver must be enabled in mcuconf.h and halconf.h + */ + SPIDriver *spip; + + /* + * @brief Pointer to the SPI configuration structure. + * @note The lowest possible speed ~ 1-2MHz is to be used, otherwise + * will result in a lot of noise + */ + const SPIConfig *spicfg; + + /* + * @brief Touchscreen controller TPIRQ pin GPIO port + */ + ioportid_t tsIRQPort; + + /* + * @brief Touchscreen controller TPIRQ GPIO pin + * @note The interface is polled as of now, interrupt support is + * to be implemented in the future. + */ + ioportmask_t tsIRQPin; + + /* + * @brief Initialize the SPI with the configuration struct given or not + * If TRUE, spiStart is called by the init, otherwise not + * @note This is provided in such a case when SPI port is being shared + * across multiple peripherals, so not to disturb the SPI bus. + * You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE() + * macros to change the SPI configuration or speed before and + * after using the touchpad. An example case would be sharing the + * bus with a fast flash memory chip. + */ + bool_t direct_init; +}; + #endif /* GFX_USE_TOUCHSCREEN */ #endif /* TOUCHSCREEN_LLD_CONFIG_H */ diff --git a/gfx.mk b/gfx.mk index acf131d9..5a7e8610 100644 --- a/gfx.mk +++ b/gfx.mk @@ -7,7 +7,6 @@ GFXSRC += $(GFXLIB)/src/gdisp.c \ $(GFXLIB)/src/gdisp_fonts.c \ $(GFXLIB)/src/gwin.c \ $(GFXLIB)/src/touchscreen.c \ - $(GFXLIB)/src/console.c \ $(GFXLIB)/src/graph.c \ GFXINC += $(GFXLIB)/include diff --git a/include/console.h b/include/console.h deleted file mode 100644 index 224de096..00000000 --- a/include/console.h +++ /dev/null @@ -1,93 +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 . -*/ - -/** - * @file include/console.h - * @brief CONSOLE header file. - * - * @addtogroup CONSOLE - * @{ - */ - -#ifndef CONSOLE_H -#define CONSOLE_H - -#ifndef GFX_USE_CONSOLE - #define GFX_USE_CONSOLE FALSE -#endif - -#if GFX_USE_CONSOLE - -#include "gdisp.h" - - /** - * @extends BaseAsynchronousChannelVMT - * - * @brief @p GConsole virtual methods table. - */ -struct GConsoleVMT { - _base_asynchronous_channel_methods -}; - -/** - * @extends BaseAsynchronousChannel - * - * @brief GConsole class. - * @details This class extends @p BaseAsynchronousChannel by adding physical - * I/O queues. - */ -typedef struct _GConsole { - /** @brief Virtual Methods Table.*/ - const struct GConsoleVMT *vmt; - _base_asynchronous_channel_data - /* WARNING: Do not add any data to this struct above this comment, only below */ - /* font */ - font_t font; - /* lcd area to use */ - coord_t x0,y0; - /* current cursor position, in pixels */ - coord_t cx,cy; - /* console size in pixels */ - coord_t sx,sy; - /* foreground and background colour */ - color_t bkcolor, color; - /* font size in pixels */ - uint8_t fy; - /* font inter-character padding in pixels */ - uint8_t fp; -} GConsole; - -#ifdef __cplusplus -extern "C" { -#endif - -msg_t gfxConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color); -msg_t gfxConsolePut(GConsole *console, char c); -msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n); - -#ifdef __cplusplus -} -#endif - -#endif /* GFX_USE_CONSOLE */ - -#endif /* CONSOLE_H */ -/** @} */ - diff --git a/include/touchscreen.h b/include/touchscreen.h index a6673cbd..253855ca 100644 --- a/include/touchscreen.h +++ b/include/touchscreen.h @@ -1,108 +1,93 @@ -/* - 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/touchscreen.h - * @brief TOUCHSCREEN Touchscreen driver subsystem header file. - * - * @addtogroup TOUCHSCREEN - * @{ - */ - -#ifndef TOUCHSCREEN_H -#define TOUCHSCREEN_H - -#if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) - -#ifndef TOUCHSCREEN_STORE_CALIBRATION - #define TOUCHSCREEN_STORE_CALIBRATION FALSE -#endif - -#ifndef TOUCHSCREEN_VERIFY_CALIBRATION - #define TOUCHSCREEN_VERIFY_CALIBRATION FALSE -#endif - -/** - * @brief specifies how many conversions are made for a readout. - * - * @note higher is more accurate, but takes more time - */ -#define CONVERSIONS 3 - -/*===========================================================================*/ -/* Driver constants. */ -/*===========================================================================*/ - -/*===========================================================================*/ -/* Low Level Driver details and error checks. */ -/*===========================================================================*/ - -/* Include the low level driver information */ -#include "touchscreen_lld.h" - -/* For definitions of coord_t, we require gdisp.h */ -#include "gdisp.h" - -/*===========================================================================*/ -/* Type definitions */ -/*===========================================================================*/ - -/** - * @brief Struct used for calibration - */ -typedef struct cal_t { - float ax; - float bx; - float cx; - float ay; - float by; - float cy; -} cal_t; - -/*===========================================================================*/ -/* External declarations. */ -/*===========================================================================*/ - -#ifdef __cplusplus -extern "C" { -#endif - -void tsInit(const TouchscreenDriver *ts); -coord_t tsReadX(void); -coord_t tsReadY(void); -void tsCalibrate(void); - -#if TOUCHSCREEN_HAS_IRQ - bool_t tsPressed(void); -#endif - -#if TOUCHSCREEN_HAS_PRESSURE - uint16_t tsReadZ(void); -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* GFX_USE_TOUCHSCREEN */ - -#endif /* TOUCHSCREEN_H */ -/** @} */ - +/* + 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/touchscreen.h + * @brief TOUCHSCREEN Touchscreen driver subsystem header file. + * + * @addtogroup TOUCHSCREEN + * @{ + */ + +#ifndef TOUCHSCREEN_H +#define TOUCHSCREEN_H + +#if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) + +/*===========================================================================*/ +/* Driver constants. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Low Level Driver details and error checks. */ +/*===========================================================================*/ + +/* Include the low level driver information */ +#include "touchscreen_lld.h" + +/* For definitions of coord_t, we require gdisp.h */ +#include "gdisp.h" + +/*===========================================================================*/ +/* Type definitions */ +/*===========================================================================*/ + +/** + * @brief Struct used for calibration + */ +typedef struct cal_t { + float ax; + float bx; + float cx; + float ay; + float by; + float cy; +} cal_t; + +/*===========================================================================*/ +/* External declarations. */ +/*===========================================================================*/ + +#ifdef __cplusplus +extern "C" { +#endif + +void tsInit(const TouchscreenDriver *ts); +coord_t tsReadX(void); +coord_t tsReadY(void); +void tsCalibrate(void); + +#if TOUCHSCREEN_HAS_PRESSED + bool_t tsPressed(void); +#endif + +#if TOUCHSCREEN_HAS_PRESSURE + uint16_t tsReadZ(void); +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* GFX_USE_TOUCHSCREEN */ + +#endif /* TOUCHSCREEN_H */ +/** @} */ + diff --git a/include/touchscreen_lld.h b/include/touchscreen_lld.h index 3053b0e5..9dd29629 100644 --- a/include/touchscreen_lld.h +++ b/include/touchscreen_lld.h @@ -1,147 +1,130 @@ -/* - 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/touchscreen_lld.h - * @brief TOUCHSCREEN Driver subsystem low level driver header. - * - * @addtogroup TOUCHSCREEN - * @{ - */ - -#ifndef TOUCHSCREEN_LLD_H -#define TOUCHSCREEN_LLD_H - -#if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) - -/*===========================================================================*/ -/* Include the low level driver configuration information */ -/*===========================================================================*/ - -#include "touchscreen_lld_config.h" - -/*===========================================================================*/ -/* Error checks. */ -/*===========================================================================*/ - -#ifndef TOUCHSCREEN_NEED_MULTITHREAD - #define TOUCHSCREEN_NEED_MULTITHREAD FALSE -#endif - -#ifndef TOUCHSCREEN_XY_INVERTED - #define TOUCHSCREEN_XY_INVERTED FALSE -#endif - -#ifndef TOUCHSCREEN_HAS_IRQ - #define TOUCHSCREEN_HAS_IRQ FALSE -#endif - -#ifndef TOUCHSCREEN_HAS_PRESSURE - #define TOUCHSCREEN_HAS_PRESSURE FALSE -#endif - -#ifndef TOUCHSCREEN_SPI_PROLOGUE - #define TOUCHSCREEN_SPI_PROLOGUE() -#endif - -#ifndef TOUCHSCREEN_SPI_EPILOGUE - #define TOUCHSCREEN_SPI_EPILOGUE() -#endif - -/*===========================================================================*/ -/* Driver types. */ -/*===========================================================================*/ - -/** - * @brief Structure representing a touchscreen driver. - */ -typedef struct TouchscreenDriver { - /* - * @brief Pointer to SPI driver. - * @note SPI driver must be enabled in mcuconf.h and halconf.h - */ - SPIDriver *spip; - - /* - * @brief Pointer to the SPI configuration structure. - * @note The lowest possible speed ~ 1-2MHz is to be used, otherwise - * will result in a lot of noise - */ - const SPIConfig *spicfg; - - /* - * @brief Touchscreen controller TPIRQ pin GPIO port - */ - ioportid_t tsIRQPort; - - /* - * @brief Touchscreen controller TPIRQ GPIO pin - * @note The interface is polled as of now, interrupt support is - * to be implemented in the future. - */ - ioportmask_t tsIRQPin; - - /* - * @brief Initialize the SPI with the configuration struct given or not - * If TRUE, spiStart is called by the init, otherwise not - * @note This is provided in such a case when SPI port is being shared - * across multiple peripherals, so not to disturb the SPI bus. - * You can use TOUCHSCREEN_SPI_PROLOGUE() and TOUCHSCREEN_SPI_EPILOGUE() - * macros to change the SPI configuration or speed before and - * after using the touchpad. An example case would be sharing the - * bus with a fast flash memory chip. - */ - bool_t direct_init; -} TouchscreenDriver; - - -/*===========================================================================*/ -/* External declarations. */ -/*===========================================================================*/ - - -#ifdef __cplusplus -extern "C" { -#endif - - /* Core functions */ - void ts_lld_init(const TouchscreenDriver *ts); - - uint16_t ts_lld_read_value(uint8_t cmd); - uint16_t ts_lld_read_x(void); - uint16_t ts_lld_read_y(void); - - #if TOUCHSCREEN_HAS_IRQ - uint8_t ts_lld_pressed(void); - #endif - - #if TOUCHSCREEN_HAS_PRESSURE - uint16_t ts_lld_read_z(void); - #endif - -#ifdef __cplusplus -} -#endif - -#endif /* GFX_USE_TOUCHSCREEN */ - -#endif /* _TOUCHSCREEN_LLD_H */ -/** @} */ - +/* + 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/touchscreen_lld.h + * @brief TOUCHSCREEN Driver subsystem low level driver header. + * + * @addtogroup TOUCHSCREEN + * @{ + */ + +#ifndef TOUCHSCREEN_LLD_H +#define TOUCHSCREEN_LLD_H + +#if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) + +/*===========================================================================*/ +/* Include the low level driver configuration information */ +/*===========================================================================*/ + +#include "touchscreen_lld_config.h" + +/*===========================================================================*/ +/* Error checks. */ +/*===========================================================================*/ + +#ifndef TOUCHSCREEN_NEED_MULTITHREAD + #define TOUCHSCREEN_NEED_MULTITHREAD FALSE +#endif + +#ifndef TOUCHSCREEN_XY_INVERTED + #define TOUCHSCREEN_XY_INVERTED FALSE +#endif + +#ifndef TOUCHSCREEN_HAS_PRESSED + #define TOUCHSCREEN_HAS_PRESSED FALSE +#endif + +#ifndef TOUCHSCREEN_HAS_PRESSURE + #define TOUCHSCREEN_HAS_PRESSURE FALSE +#endif + +#ifndef TOUCHSCREEN_SPI_PROLOGUE + #define TOUCHSCREEN_SPI_PROLOGUE() +#endif + +#ifndef TOUCHSCREEN_SPI_EPILOGUE + #define TOUCHSCREEN_SPI_EPILOGUE() +#endif + +#ifndef TOUCHSCREEN_STORE_CALIBRATION + #define TOUCHSCREEN_STORE_CALIBRATION FALSE +#endif + +#ifndef TOUCHSCREEN_VERIFY_CALIBRATION + #define TOUCHSCREEN_VERIFY_CALIBRATION FALSE +#endif + +#ifndef TOUCHSCREEN_CONVERSIONS + #define TOUCHSCREEN_CONVERSIONS 3 +#endif + +/*===========================================================================*/ +/* Driver types. */ +/*===========================================================================*/ + +/** + * @brief Structure representing a touchscreen driver. Hardware dependant. + */ +typedef struct TouchscreenDriver TouchscreenDriver; + +// Forward declaration +struct cal_t; + +/*===========================================================================*/ +/* External declarations. */ +/*===========================================================================*/ + + +#ifdef __cplusplus +extern "C" { +#endif + + /* Core functions */ + void ts_lld_init(const TouchscreenDriver *ts); + + uint16_t ts_lld_read_value(uint8_t cmd); + uint16_t ts_lld_read_x(void); + uint16_t ts_lld_read_y(void); + + #if TOUCHSCREEN_HAS_PRESSED + uint8_t ts_lld_pressed(void); + #endif + + #if TOUCHSCREEN_HAS_PRESSURE + uint16_t ts_lld_read_z(void); + #endif + + #if TOUCHSCREEN_STORE_CALIBRATION + // These may be defined by the low level driver or by the application + void ts_store_calibration_lld(struct cal_t *cal); + struct cal_t *ts_restore_calibration_lld(void); + #endif + +#ifdef __cplusplus +} +#endif + +#endif /* GFX_USE_TOUCHSCREEN */ + +#endif /* _TOUCHSCREEN_LLD_H */ +/** @} */ + diff --git a/old/console.c b/old/console.c new file mode 100644 index 00000000..55549fd1 --- /dev/null +++ b/old/console.c @@ -0,0 +1,216 @@ +/* + 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/console.c + * @brief CONSOLE code. + * + * @addtogroup CONSOLE + * @{ + */ + +#include "ch.h" +#include "hal.h" +#include "console.h" + +#if GFX_USE_CONSOLE || defined(__DOXYGEN__) + +/* + * Interface implementation. The interface is write only + */ +static size_t write(void *ip, const uint8_t *bp, size_t n) { + return gfxConsoleWrite((GConsole *)ip, bp, n); +} + +static size_t read(void *ip, uint8_t *bp, size_t n) { + (void)ip; + (void)bp; + (void)n; + + return 0; +} + +static msg_t put(void *ip, uint8_t b) { + (void)ip; + + return gfxConsolePut((GConsole *)ip, (char)b); +} + +static msg_t get(void *ip) { + (void)ip; + + return RDY_OK; +} + +static msg_t putt(void *ip, uint8_t b, systime_t timeout) { + (void)timeout; + + /* TODO: handle timeout */ + + return gfxConsolePut((GConsole *)ip, (char)b); +} + +static msg_t gett(void *ip, systime_t timeout) { + (void)ip; + (void)timeout; + + return RDY_OK; +} + +static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) { + (void)time; + + return gfxConsoleWrite((GConsole *)ip, bp, n); +} + +static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) { + (void)ip; + (void)bp; + (void)n; + (void)time; + + return 0; +} + +static const struct GConsoleVMT vmt = { + write, read, put, get, + putt, gett, writet, readt +}; + +/** + * @brief Initializes a console. + * + * @param[in] console The console driver struct + * @param[in] x0,y0 The location of the upper left corner of the resulting window + * @param[in] width, height The width and height of the window + * @param[in] font The font to be used when printing to the console + * @param[in] bkcolor The background color + * @param[in] color The foreground / font color + * + * @return RDY_OK if done + */ +msg_t gfxConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) { + console->vmt = &vmt; + /* read font, get height & padding */ + console->fy = gdispGetFontMetric(font, fontHeight); + console->fp = gdispGetFontMetric(font, fontCharPadding); + + /* calculate the size of the console as an integer multiple of characters height*/ + console->sx = width; + console->sy = (((int16_t)(height/console->fy))-1)*console->fy; + + console->cx = 0; + console->cy = 0; + console->x0 = x0; + console->y0 = y0; + + console->bkcolor = bkcolor; + console->color = color; + + console->font = font; + + gdispFillArea(x0, y0, x0 + width, y0 + height, console->bkcolor); + return RDY_OK; +} + +/** + * @brief Write a single character to the console. + * + * @param[in] console The console driver struct + * @param[in] c The char to be written + * + * @return RDY_OK if done + */ +msg_t gfxConsolePut(GConsole *console, char c) { + uint8_t width; + + if(c == '\n') { + /* clear the text at the end of the line */ + if(console->cx < console->sx) + gdispFillArea(console->x0 + console->cx, console->y0 + console->cy, + console->sx - console->cx, console->fy, + console->bkcolor); + console->cx = 0; + console->cy += console->fy; + } else if(c == '\r') { + /* TODO: work backwards through the buffer to the start of the current line */ + //console->cx = 0; + } else { + width = gdispGetCharWidth(c, console->font) + console->fp; + if((console->cx + width) >= console->sx) { + /* clear the text at the end of the line */ + if (console->cy <= console->sy) + gdispFillArea(console->x0 + console->cx, console->y0 + console->cy, + console->sx - (console->cx + width), console->fy, + console->bkcolor); + console->cx = 0; + console->cy += console->fy; + } + + if((console->cy > console->sy)) { +#if GDISP_NEED_SCROLL + /* scroll the console */ + gdispVerticalScroll(console->x0, console->y0, console->sx, + console->sy + console->fy, console->fy, console->bkcolor); + /* reset the cursor to the start of the line */ + console->cx = 0; + console->cy = console->sy; +#else + /* clear the console */ + gdispFillArea(console->x0, console->y0, + console->sx, console->sy + console->fy, + console->bkcolor); + /* reset the cursor to the top of the console */ + console->cx = 0; + console->cy = 0; +#endif + } + + gdispDrawChar(console->x0 + console->cx, console->y0 + console->cy, c, + console->font, console->color); + + /* update cursor */ + console->cx += width; + } + return RDY_OK; +} + +/** + * @brief Write a string to the console. + * + * @param[in] console The console driver struct + * @param[in] bp The buffer / string + * @param[in] n The size of the buffer + * + * @return RDY_OK if done + * + * @api + */ +msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n) { + size_t i; + for(i = 0; i < n; i++) + gfxConsolePut(console, bp[i]); + + return RDY_OK; +} + +#endif /* GFX_USE_CONSOLE */ +/** @} */ + diff --git a/old/console.h b/old/console.h new file mode 100644 index 00000000..224de096 --- /dev/null +++ b/old/console.h @@ -0,0 +1,93 @@ +/* + 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/console.h + * @brief CONSOLE header file. + * + * @addtogroup CONSOLE + * @{ + */ + +#ifndef CONSOLE_H +#define CONSOLE_H + +#ifndef GFX_USE_CONSOLE + #define GFX_USE_CONSOLE FALSE +#endif + +#if GFX_USE_CONSOLE + +#include "gdisp.h" + + /** + * @extends BaseAsynchronousChannelVMT + * + * @brief @p GConsole virtual methods table. + */ +struct GConsoleVMT { + _base_asynchronous_channel_methods +}; + +/** + * @extends BaseAsynchronousChannel + * + * @brief GConsole class. + * @details This class extends @p BaseAsynchronousChannel by adding physical + * I/O queues. + */ +typedef struct _GConsole { + /** @brief Virtual Methods Table.*/ + const struct GConsoleVMT *vmt; + _base_asynchronous_channel_data + /* WARNING: Do not add any data to this struct above this comment, only below */ + /* font */ + font_t font; + /* lcd area to use */ + coord_t x0,y0; + /* current cursor position, in pixels */ + coord_t cx,cy; + /* console size in pixels */ + coord_t sx,sy; + /* foreground and background colour */ + color_t bkcolor, color; + /* font size in pixels */ + uint8_t fy; + /* font inter-character padding in pixels */ + uint8_t fp; +} GConsole; + +#ifdef __cplusplus +extern "C" { +#endif + +msg_t gfxConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color); +msg_t gfxConsolePut(GConsole *console, char c); +msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n); + +#ifdef __cplusplus +} +#endif + +#endif /* GFX_USE_CONSOLE */ + +#endif /* CONSOLE_H */ +/** @} */ + diff --git a/releases.txt b/releases.txt index 7002405d..a9f0ecc7 100644 --- a/releases.txt +++ b/releases.txt @@ -9,6 +9,9 @@ current stable: 1.4 FEATURE: Added three point calibration FIX: Touchpad renamed into Touchscreen FIX: tsIRQ() renamed into tsPressed() +FEATURE: Touchscreen support added to gdisp Win32 driver +FIX: gdisp Win32 driver fixes +DEPRECATE: console deprecated - replaced with gwin functionality *** changes after 1.3 *** diff --git a/src/console.c b/src/console.c deleted file mode 100644 index 55549fd1..00000000 --- a/src/console.c +++ /dev/null @@ -1,216 +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 . -*/ - -/** - * @file src/console.c - * @brief CONSOLE code. - * - * @addtogroup CONSOLE - * @{ - */ - -#include "ch.h" -#include "hal.h" -#include "console.h" - -#if GFX_USE_CONSOLE || defined(__DOXYGEN__) - -/* - * Interface implementation. The interface is write only - */ -static size_t write(void *ip, const uint8_t *bp, size_t n) { - return gfxConsoleWrite((GConsole *)ip, bp, n); -} - -static size_t read(void *ip, uint8_t *bp, size_t n) { - (void)ip; - (void)bp; - (void)n; - - return 0; -} - -static msg_t put(void *ip, uint8_t b) { - (void)ip; - - return gfxConsolePut((GConsole *)ip, (char)b); -} - -static msg_t get(void *ip) { - (void)ip; - - return RDY_OK; -} - -static msg_t putt(void *ip, uint8_t b, systime_t timeout) { - (void)timeout; - - /* TODO: handle timeout */ - - return gfxConsolePut((GConsole *)ip, (char)b); -} - -static msg_t gett(void *ip, systime_t timeout) { - (void)ip; - (void)timeout; - - return RDY_OK; -} - -static size_t writet(void *ip, const uint8_t *bp, size_t n, systime_t time) { - (void)time; - - return gfxConsoleWrite((GConsole *)ip, bp, n); -} - -static size_t readt(void *ip, uint8_t *bp, size_t n, systime_t time) { - (void)ip; - (void)bp; - (void)n; - (void)time; - - return 0; -} - -static const struct GConsoleVMT vmt = { - write, read, put, get, - putt, gett, writet, readt -}; - -/** - * @brief Initializes a console. - * - * @param[in] console The console driver struct - * @param[in] x0,y0 The location of the upper left corner of the resulting window - * @param[in] width, height The width and height of the window - * @param[in] font The font to be used when printing to the console - * @param[in] bkcolor The background color - * @param[in] color The foreground / font color - * - * @return RDY_OK if done - */ -msg_t gfxConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) { - console->vmt = &vmt; - /* read font, get height & padding */ - console->fy = gdispGetFontMetric(font, fontHeight); - console->fp = gdispGetFontMetric(font, fontCharPadding); - - /* calculate the size of the console as an integer multiple of characters height*/ - console->sx = width; - console->sy = (((int16_t)(height/console->fy))-1)*console->fy; - - console->cx = 0; - console->cy = 0; - console->x0 = x0; - console->y0 = y0; - - console->bkcolor = bkcolor; - console->color = color; - - console->font = font; - - gdispFillArea(x0, y0, x0 + width, y0 + height, console->bkcolor); - return RDY_OK; -} - -/** - * @brief Write a single character to the console. - * - * @param[in] console The console driver struct - * @param[in] c The char to be written - * - * @return RDY_OK if done - */ -msg_t gfxConsolePut(GConsole *console, char c) { - uint8_t width; - - if(c == '\n') { - /* clear the text at the end of the line */ - if(console->cx < console->sx) - gdispFillArea(console->x0 + console->cx, console->y0 + console->cy, - console->sx - console->cx, console->fy, - console->bkcolor); - console->cx = 0; - console->cy += console->fy; - } else if(c == '\r') { - /* TODO: work backwards through the buffer to the start of the current line */ - //console->cx = 0; - } else { - width = gdispGetCharWidth(c, console->font) + console->fp; - if((console->cx + width) >= console->sx) { - /* clear the text at the end of the line */ - if (console->cy <= console->sy) - gdispFillArea(console->x0 + console->cx, console->y0 + console->cy, - console->sx - (console->cx + width), console->fy, - console->bkcolor); - console->cx = 0; - console->cy += console->fy; - } - - if((console->cy > console->sy)) { -#if GDISP_NEED_SCROLL - /* scroll the console */ - gdispVerticalScroll(console->x0, console->y0, console->sx, - console->sy + console->fy, console->fy, console->bkcolor); - /* reset the cursor to the start of the line */ - console->cx = 0; - console->cy = console->sy; -#else - /* clear the console */ - gdispFillArea(console->x0, console->y0, - console->sx, console->sy + console->fy, - console->bkcolor); - /* reset the cursor to the top of the console */ - console->cx = 0; - console->cy = 0; -#endif - } - - gdispDrawChar(console->x0 + console->cx, console->y0 + console->cy, c, - console->font, console->color); - - /* update cursor */ - console->cx += width; - } - return RDY_OK; -} - -/** - * @brief Write a string to the console. - * - * @param[in] console The console driver struct - * @param[in] bp The buffer / string - * @param[in] n The size of the buffer - * - * @return RDY_OK if done - * - * @api - */ -msg_t gfxConsoleWrite(GConsole *console, const uint8_t *bp, size_t n) { - size_t i; - for(i = 0; i < n; i++) - gfxConsolePut(console, bp[i]); - - return RDY_OK; -} - -#endif /* GFX_USE_CONSOLE */ -/** @} */ - diff --git a/src/touchscreen.c b/src/touchscreen.c index 4e90f3e4..fe51db5c 100644 --- a/src/touchscreen.c +++ b/src/touchscreen.c @@ -32,11 +32,6 @@ #if GFX_USE_TOUCHSCREEN || defined(__DOXYGEN__) -#if TOUCHSCREEN_STORE_CALIBRATION -extern void ts_store_calibration_lld(struct cal_t *cal); -extern struct cal_t *ts_restore_calibration_lld(void); -#endif - /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ @@ -59,12 +54,12 @@ static coord_t _tsReadRealX(void) { int16_t i; coord_t x; - for(i = 0; i < CONVERSIONS; i++) { + for(i = 0; i < TOUCHSCREEN_CONVERSIONS; i++) { results += ts_lld_read_x(); } /* Take the average of the readings */ - x = results / CONVERSIONS; + x = results / TOUCHSCREEN_CONVERSIONS; return x; } @@ -74,12 +69,12 @@ static coord_t _tsReadRealY(void) { int16_t i; coord_t y; - for(i = 0; i < CONVERSIONS; i++) { + for(i = 0; i < TOUCHSCREEN_CONVERSIONS; i++) { results += ts_lld_read_y(); } /* Take the average of the readings */ - y = results / CONVERSIONS; + y = results / TOUCHSCREEN_CONVERSIONS; return y; } @@ -237,9 +232,9 @@ coord_t tsReadY(void) { case GDISP_ROTATE_0: return y; case GDISP_ROTATE_90: - return GDISP_SCREEN_WIDTH - x - 1; + return gdispGetWidth() - x - 1; case GDISP_ROTATE_180: - return GDISP_SCREEN_HEIGHT - y - 1; + return gdispGetHeight() - y - 1; case GDISP_ROTATE_270: return x; } @@ -268,7 +263,7 @@ coord_t tsReadY(void) { * * @api */ -#if TOUCHSCREEN_HAS_IRQ || defined(__DOXYGEN__) +#if TOUCHSCREEN_HAS_PRESSED || defined(__DOXYGEN__) bool_t tsPressed(void) { return ts_lld_pressed(); } -- cgit v1.2.3