From 27290b5f85594db4ba1b86b401840474be7ec15b Mon Sep 17 00:00:00 2001 From: Mateusz Tomaszkiewicz Date: Fri, 8 Mar 2013 02:02:18 +0100 Subject: STMPE811: added header with registers addresses Also changed filename of board file from *_embest_lcd.h to *_embest_dmstf4bb.h. --- drivers/ginput/touch/STMPE811/ginput_lld_mouse.c | 12 ++- .../ginput_lld_mouse_board_embest_dmstf4bb.h | 91 +++++++++++++++++++ .../STMPE811/ginput_lld_mouse_board_embest_lcd.h | 92 ------------------- drivers/ginput/touch/STMPE811/stmpe811.h | 100 +++++++++++++++++++++ 4 files changed, 200 insertions(+), 95 deletions(-) create mode 100644 drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h delete mode 100644 drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h create mode 100644 drivers/ginput/touch/STMPE811/stmpe811.h (limited to 'drivers') diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c index b83f0cf4..bacb1f1f 100644 --- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c @@ -31,12 +31,19 @@ #include "hal.h" #include "gfx.h" +#include "stmpe811.h" + #if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/ #include "ginput/lld/mouse.h" -//#include "ginput_lld_mouse_board_example.h" -#include "ginput_lld_mouse_board_embest_lcd.h" +#if defined(GINPUT_MOUSE_USE_CUSTOM_BOARD) && GINPUT_MOUSE_USE_CUSTOM_BOARD + #include "ginput_lld_mouse_board.h" +#elif defined(BOARD_EMBEST_DMSTF4BB) + #include "ginput_lld_mouse_board_embest_dmstf4bb.h" +#else + #include "ginput_lld_mouse_board_example.h" +#endif static uint16_t sampleBuf[7]; static coord_t lastx, lasty; @@ -135,4 +142,3 @@ void ginput_lld_mouse_get_reading(MouseReading *pt) { #endif /* GFX_USE_GINPUT && GINPUT_NEED_MOUSE */ /** @} */ - diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h new file mode 100644 index 00000000..0ffbec2a --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h @@ -0,0 +1,91 @@ +/* + ChibiOS/GFX - Copyright (C) 2012, 2013 + 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/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h + * @brief GINPUT Touch low level driver source for the STMPE811 on the Embest DM-STF4BB board. + * + * @defgroup Mouse Mouse + * @ingroup GINPUT + * @{ + */ + +#ifndef _GINPUT_LLD_MOUSE_BOARD_H +#define _GINPUT_LLD_MOUSE_BOARD_H + +static const I2CConfig i2ccfg2 = { + OPMODE_I2C, + 400000, + FAST_DUTY_CYCLE_2, +}; + +/** + * @brief Initialise the board for the touch. + * + * @notapi + */ +static inline void init_board(void) { + palSetPadMode(GPIOC, 13, PAL_MODE_INPUT); + + i2cStart(&I2CD2, &i2ccfg2); +} + +/** + * @brief Check whether the surface is currently touched + * @return TRUE if the surface is currently touched + * + * @notapi + */ +static inline bool_t getpin_pressed(void) { + return (!(palReadPad(GPIOC, 13))); +} + +/** + * @brief Aquire the bus ready for readings + * + * @notapi + */ +static inline void aquire_bus(void) { + i2cAcquireBus(&I2CD2); +} + +/** + * @brief Release the bus after readings + * + * @notapi + */ +static inline void release_bus(void) { + i2cReleaseBus(&I2CD2); +} + +/** + * @brief Read a value from touch controller + * @return The value read from the controller + * + * params[in] port The controller port to read. + * + * @notapi + */ +static inline uint16_t read_value(uint16_t port) { + #error "STMPE811: Implement this driver first!" +} + +#endif /* _GINPUT_LLD_MOUSE_BOARD_H */ +/** @} */ diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h deleted file mode 100644 index 8dd28a90..00000000 --- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - ChibiOS/GFX - Copyright (C) 2012, 2013 - 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/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h - * @brief GINPUT Touch low level driver source for the STMPE811 on the example board. - * - * @defgroup Mouse Mouse - * @ingroup GINPUT - * @{ - */ - -#ifndef _GINPUT_LLD_MOUSE_BOARD_H -#define _GINPUT_LLD_MOUSE_BOARD_H - -static const I2CConfig i2ccfg2 = { - OPMODE_I2C, - 400000, - FAST_DUTY_CYCLE_2, -}; - -/** - * @brief Initialise the board for the touch. - * - * @notapi - */ -static inline void init_board(void) { - palSetPadMode(GPIOC, 13, PAL_MODE_INPUT); - - i2cStart(&I2CD2, &i2ccfg2); -} - -/** - * @brief Check whether the surface is currently touched - * @return TRUE if the surface is currently touched - * - * @notapi - */ -static inline bool_t getpin_pressed(void) { - return (!(palReadPad(GPIOC, 13))); -} - -/** - * @brief Aquire the bus ready for readings - * - * @notapi - */ -static inline void aquire_bus(void) { - i2cAcquireBus(&I2CD2); -} - -/** - * @brief Release the bus after readings - * - * @notapi - */ -static inline void release_bus(void) { - i2cReleaseBus(&I2CD2); -} - -/** - * @brief Read a value from touch controller - * @return The value read from the controller - * - * params[in] port The controller port to read. - * - * @notapi - */ -static inline uint16_t read_value(uint16_t port) { - #error "STMPE811: Implement this driver first!" -} - -#endif /* _GINPUT_LLD_MOUSE_BOARD_H */ -/** @} */ - diff --git a/drivers/ginput/touch/STMPE811/stmpe811.h b/drivers/ginput/touch/STMPE811/stmpe811.h new file mode 100644 index 00000000..c2ec8ecf --- /dev/null +++ b/drivers/ginput/touch/STMPE811/stmpe811.h @@ -0,0 +1,100 @@ +/* + 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/ginput/touch/STMPE811/stmpe811.h + * @brief GINPUT Input Driver support header for the STMPE811 touch controller. + * + * @addtogroup GINPUT + * @{ + */ + +#ifndef _STMPE811_H +#define _STMPE811_H + +/* STMPE811 registers */ + +// Identification registers +#define STMPE811_REG_CHP_ID 0x00 // 16-bit +#define STMPE811_REG_ID_VER 0x02 + +// System registers +#define STMPE811_REG_SYS_CTRL1 0x03 +#define STMPE811_REG_SYS_CTRL2 0x04 +#define STMPE811_REG_SPI_CFG 0x08 + +// Interrupt control registers +#define STMPE811_REG_INT_CTRL 0x09 +#define STMPE811_REG_INT_EN 0x0A +#define STMPE811_REG_INT_STA 0x0B +#define STMPE811_REG_GPIO_INT_EN 0x0C +#define STMPE811_REG_GPIO_INT_STA 0x0D +#define STMPE811_REG_ADC_INT_EN 0x0E +#define STMPE811_REG_ADC_INT_STA 0x0F + +// GPIO registers +#define STMPE811_REG_GPIO_SET_PIN 0x10 +#define STMPE811_REG_GPIO_CLR_PIN 0x11 +#define STMPE811_REG_GPIO_MP_STA 0x12 +#define STMPE811_REG_GPIO_DIR 0x13 +#define STMPE811_REG_GPIO_ED 0x14 +#define STMPE811_REG_GPIO_RE 0x15 +#define STMPE811_REG_GPIO_FE 0x16 +#define STMPE811_REG_GPIO_AF 0x17 + +// ADC registers +#define STMPE811_REG_ADC_CTRL1 0x20 +#define STMPE811_REG_ADC_CTRL2 0x21 +#define STMPE811_REG_ADC_CAPT 0x22 +#define STMPE811_REG_ADC_DATA_CH0 0x30 // 16-bit +#define STMPE811_REG_ADC_DATA_CH1 0x32 // 16-bit +#define STMPE811_REG_ADC_DATA_CH2 0x34 // 16-bit +#define STMPE811_REG_ADC_DATA_CH3 0x36 // 16-bit +#define STMPE811_REG_ADC_DATA_CH4 0x38 // 16-bit +#define STMPE811_REG_ADC_DATA_CH5 0x3A // 16-bit +#define STMPE811_REG_ADC_DATA_CH6 0x3B // 16-bit +#define STMPE811_REG_ADC_DATA_CH7 0x3C // 16-bit + +// Touchscreen registers +#define STMPE811_REG_TSC_CTRL 0x40 +#define STMPE811_REG_TSC_CFG 0x41 +#define STMPE811_REG_WDW_TR_X 0x42 // 16-bit +#define STMPE811_REG_WDW_TR_Y 0x44 // 16-bit +#define STMPE811_REG_WDW_BL_X 0x46 // 16-bit +#define STMPE811_REG_WDW_BL_Y 0x48 // 16-bit +#define STMPE811_REG_FIFO_TH 0x4A +#define STMPE811_REG_FIFO_STA 0x4B +#define STMPE811_REG_FIFO_SIZE 0x4C +#define STMPE811_REG_TSC_DATA_X 0x4D // 16-bit +#define STMPE811_REG_TSC_DATA_Y 0x4F // 16-bit +#define STMPE811_REG_TSC_DATA_Z 0x51 +#define STMPE811_REG_TSC_DATA_XYZ 0x52 +#define STMPE811_REG_TSC_FRACT_XYZ 0x56 // 32-bit +#define STMPE811_REG_TSC_DATA 0x57 +#define STMPE811_REG_TSC_I_DRIVE 0x58 +#define STMPE811_REG_TSC_SHIELD 0x59 + +// Temperature sensor registers +#define STMPE811_REG_TEMP_CTRL 0x60 +#define STMPE811_REG_TEMP_DATA 0x61 +#define STMPE811_REG_TEMP_TH 0x62 + +#endif /* _STMPE811_H */ +/** @} */ -- cgit v1.2.3