diff options
author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-11 19:03:30 +1000 |
---|---|---|
committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-11-11 19:03:30 +1000 |
commit | 8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f (patch) | |
tree | a1058cc5b7a3331b57e0bf57fe171d44dca5ff48 /include | |
parent | e28a4dbd0e5306f40f2e778025fd0e4888d9d0ba (diff) | |
download | uGFX-8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f.tar.gz uGFX-8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f.tar.bz2 uGFX-8b51bcf46f97d7cd752f3b3d9b52b9f39051f60f.zip |
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.
Diffstat (limited to 'include')
-rw-r--r-- | include/console.h | 93 | ||||
-rw-r--r-- | include/touchscreen.h | 201 | ||||
-rw-r--r-- | include/touchscreen_lld.h | 277 |
3 files changed, 223 insertions, 348 deletions
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 <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/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 <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/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 <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/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 <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/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 <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/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 */
+/** @} */
+
|