diff options
author | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-11-10 00:05:01 +0100 |
---|---|---|
committer | Joel Bodenmann <joel.bodenmann@hevs.ch> | 2012-11-10 00:05:01 +0100 |
commit | 87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57 (patch) | |
tree | 515085fe2b901604f1e88c6645583827ee3922b1 /include | |
parent | 995c9835c282e8904ff918e325f0491249bdcc89 (diff) | |
download | uGFX-87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57.tar.gz uGFX-87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57.tar.bz2 uGFX-87b6d98055afff7c46bd6bdd7db7ba7c1d8e7a57.zip |
renamed touchpad into touchscreen
Diffstat (limited to 'include')
-rw-r--r-- | include/touchpad.h | 100 | ||||
-rw-r--r-- | include/touchpad_lld.h | 155 |
2 files changed, 0 insertions, 255 deletions
diff --git a/include/touchpad.h b/include/touchpad.h deleted file mode 100644 index ec0ef049..00000000 --- a/include/touchpad.h +++ /dev/null @@ -1,100 +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/touchpad.h - * @brief TOUCHPAD Touchpad Driver subsystem header file. - * - * @addtogroup TOUCHPAD - * @{ - */ - -#ifndef _TOUCHPAD_H -#define _TOUCHPAD_H - -#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__) - -/** - * @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 "touchpad_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 tpInit(const TOUCHPADDriver *tp); -coord_t tpReadX(void); -coord_t tpReadY(void); -void tpCalibrate(void); - -#if TOUCHPAD_HAS_IRQ - bool_t tpIRQ(void); -#endif - -#if TOUCHPAD_HAS_PRESSURE - uint16_t tpReadZ(void); -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* GFX_USE_TOUCHPAD */ - -#endif /* _TOUCHPAD_H */ -/** @} */ - diff --git a/include/touchpad_lld.h b/include/touchpad_lld.h deleted file mode 100644 index 20411198..00000000 --- a/include/touchpad_lld.h +++ /dev/null @@ -1,155 +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/touchpad_lld.h - * @brief TOUCHPAD Driver subsystem low level driver header. - * - * @addtogroup TOUCHPAD - * @{ - */ - -#ifndef _TOUCHPAD_LLD_H -#define _TOUCHPAD_LLD_H - -#if GFX_USE_TOUCHPAD || defined(__DOXYGEN__) - -/*===========================================================================*/ -/* Include the low level driver configuration information */ -/*===========================================================================*/ - -#include "touchpad_lld_config.h" - -/*===========================================================================*/ -/* Error checks. */ -/*===========================================================================*/ - -#ifndef TOUCHPAD_NEED_MULTITHREAD - #define TOUCHPAD_NEED_MULTITHREAD FALSE -#endif - -#ifndef TOUCHPAD_XY_INVERTED - #define TOUCHPAD_XY_INVERTED FALSE -#endif - -#ifndef TOUCHPAD_STORE_CALIBRATION - #define TOUCHPAD_STORE_CALIBRATION FALSE -#endif - -#ifndef TOUCHPAD_VERIFY_CALIBRATION - #define TOUCHPAD_VERIFY_CALIBRATION FALSE -#endif - -#ifndef TOUCHPAD_HAS_IRQ - #define TOUCHPAD_HAS_IRQ FALSE -#endif - -#ifndef TOUCHPAD_HAS_PRESSURE - #define TOUCHPAD_HAS_PRESSURE FALSE -#endif - -#ifndef TOUCHPAD_SPI_PROLOGUE - #define TOUCHPAD_SPI_PROLOGUE() -#endif - -#ifndef TOUCHPAD_SPI_EPILOGUE - #define TOUCHPAD_SPI_EPILOGUE() -#endif - -/*===========================================================================*/ -/* Driver types. */ -/*===========================================================================*/ - -/** - * @brief Structure representing a Touchpad driver. - */ -typedef struct TOUCHPADDriver { - /* - * @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 tpIRQPort; - - /* - * @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 tpIRQPin; - - /* - * @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 TOUCHPAD_SPI_PROLOGUE() and TOUCHPAD_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; -} TOUCHPADDriver; - - -/*===========================================================================*/ -/* External declarations. */ -/*===========================================================================*/ - - -#ifdef __cplusplus -extern "C" { -#endif - - /* Core functions */ - void tp_lld_init(const TOUCHPADDriver *tp); - - uint16_t tp_lld_read_value(uint8_t cmd); - uint16_t tp_lld_read_x(void); - uint16_t tp_lld_read_y(void); - - #if TOUCHPAD_HAS_IRQ - uint8_t tp_lld_irq(void); - #endif - - #if TOUCHPAD_HAS_PRESSURE - uint16_t tp_lld_read_z(void); - #endif - -#ifdef __cplusplus -} -#endif - -#endif /* GFX_USE_TOUCHPAD */ - -#endif /* _TOUCHPAD_LLD_H */ -/** @} */ - |