From 0400ba0e2d0e20ecf2dcf1081fbb30cee2140794 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 8 Mar 2013 00:56:59 +0100 Subject: [PATCH 1/6] added basic STMPE811 skeleton --- drivers/ginput/touch/STMPE811/ginput_lld.mk | 5 + .../ginput/touch/STMPE811/ginput_lld_mouse.c | 138 ++++++++++++++++++ .../ginput_lld_mouse_board_embest_lcd.h | 92 ++++++++++++ .../STMPE811/ginput_lld_mouse_board_example.h | 88 +++++++++++ .../touch/STMPE811/ginput_lld_mouse_config.h | 45 ++++++ drivers/ginput/touch/STMPE811/readme.txt | 9 ++ 6 files changed, 377 insertions(+) create mode 100644 drivers/ginput/touch/STMPE811/ginput_lld.mk create mode 100644 drivers/ginput/touch/STMPE811/ginput_lld_mouse.c create mode 100644 drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h create mode 100644 drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h create mode 100644 drivers/ginput/touch/STMPE811/ginput_lld_mouse_config.h create mode 100644 drivers/ginput/touch/STMPE811/readme.txt diff --git a/drivers/ginput/touch/STMPE811/ginput_lld.mk b/drivers/ginput/touch/STMPE811/ginput_lld.mk new file mode 100644 index 00000000..f6d77f1c --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld.mk @@ -0,0 +1,5 @@ +# List the required driver. +GFXSRC += $(GFXLIB)/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c + +# Required include directories +GFXINC += $(GFXLIB)/drivers/ginput/touch/STMPE811 diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c new file mode 100644 index 00000000..b83f0cf4 --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c @@ -0,0 +1,138 @@ +/* + 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.c + * @brief GINPUT Touch low level driver source for the STMPE811. + * + * @defgroup Mouse Mouse + * @ingroup GINPUT + * @{ + */ + +#include "ch.h" +#include "hal.h" +#include "gfx.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" + +static uint16_t sampleBuf[7]; +static coord_t lastx, lasty; + +/** + * @brief 7-point median filtering code for touch samples + * + * @note This is an internally used routine only. + * + * @notapi + */ +static void filter(void) { + uint16_t temp; + int i,j; + + for(i = 0; i < 4; i++) { + for(j = i; j < 7; j++) { + if(sampleBuf[i] > sampleBuf[j]) { + /* Swap the values */ + temp = sampleBuf[i]; + sampleBuf[i] = sampleBuf[j]; + sampleBuf[j] = temp; + } + } + } +} + +/** + * @brief Initialise the mouse/touch. + * + * @notapi + */ +void ginput_lld_mouse_init(void) { + init_board(); +} + +/** + * @brief Read the mouse/touch position. + * + * @param[in] pt A pointer to the structure to fill + * + * @note For drivers that don't support returning a position + * when the touch is up (most touch devices), it should + * return the previous position with the new Z value. + * The z value is the pressure for those touch devices + * that support it (-100 to 100 where > 0 is touched) + * or, 0 or 100 for those drivers that don't. + * + * @notapi + */ +void ginput_lld_mouse_get_reading(MouseReading *pt) { + uint16_t i; + + // If touch-off return the previous results + if (!getpin_pressed()) { + pt->x = lastx; + pt->y = lasty; + pt->z = 0; + pt->buttons = 0; + return; + } + + // Read the port to get the touch settings + aquire_bus(); + + /* Get the X value + * Discard the first conversion - very noisy and keep the ADC on hereafter + * till we are done with the sampling. Note that PENIRQ is disabled while reading. + * Finally switch on PENIRQ once again - perform a dummy read. + * Once we have the readings, find the medium using our filter function + */ + read_value(0xD1); + for(i = 0; i < 7; i++) + sampleBuf[i] = read_value(0xD1); + read_value(0xD0); + filter(); + lastx = (coord_t)sampleBuf[3]; + + /* Get the Y value using the same process as above */ + read_value(0x91); + for(i = 0; i < 7; i++) + sampleBuf[i] = read_value(0x91); + read_value(0x90); + filter(); + lasty = (coord_t)sampleBuf[3]; + + // Release the bus + release_bus(); + + // Return the results + pt->x = lastx; + pt->y = lasty; + pt->z = 100; + pt->buttons = GINPUT_TOUCH_PRESSED; +} + +#endif /* GFX_USE_GINPUT && GINPUT_NEED_MOUSE */ +/** @} */ + 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 new file mode 100644 index 00000000..8dd28a90 --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h @@ -0,0 +1,92 @@ +/* + 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/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h new file mode 100644 index 00000000..fbedcb60 --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h @@ -0,0 +1,88 @@ +/* + 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 + +/** + * @brief Initialise the board for the touch. + * + * @notapi + */ +static inline void init_board(void) { + /* Code here */ + #error "ginputSTMPE811: You must supply a definition for init_board for your board" +} + +/** + * @brief Check whether the surface is currently touched + * @return TRUE if the surface is currently touched + * + * @notapi + */ +static inline bool_t getpin_pressed(void) { + /* Code here */ + #error "ginputSTMPE811: You must supply a definition for getpin_pressed for your board" +} + +/** + * @brief Aquire the bus ready for readings + * + * @notapi + */ +static inline void aquire_bus(void) { + /* Code here */ + #error "ginputSTMPE811: You must supply a definition for aquire_bus for your board" +} + +/** + * @brief Release the bus after readings + * + * @notapi + */ +static inline void release_bus(void) { + /* Code here */ + #error "ginputSTMPE811: You must supply a definition for release_bus for your board" +} + +/** + * @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) { + /* Code here */ + #error "ginputSTMPE811: You must supply a definition for read_value for your board" +} + +#endif /* _GINPUT_LLD_MOUSE_BOARD_H */ +/** @} */ diff --git a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_config.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_config.h new file mode 100644 index 00000000..76224198 --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_config.h @@ -0,0 +1,45 @@ +/* + 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_config.h + * @brief GINPUT LLD header file for mouse/touch driver. + * + * @defgroup Mouse Mouse + * @ingroup GINPUT + * + * @{ + */ + +#ifndef _LLD_GINPUT_MOUSE_CONFIG_H +#define _LLD_GINPUT_MOUSE_CONFIG_H + +#define GINPUT_MOUSE_EVENT_TYPE GEVENT_TOUCH +#define GINPUT_MOUSE_NEED_CALIBRATION TRUE +#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE +#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 5 +#define GINPUT_MOUSE_READ_CYCLES 4 +#define GINPUT_MOUSE_POLL_PERIOD 25 +#define GINPUT_MOUSE_MAX_CLICK_JITTER 10 +#define GINPUT_MOUSE_MAX_MOVE_JITTER 2 +#define GINPUT_MOUSE_CLICK_TIME 500 + +#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */ +/** @} */ + diff --git a/drivers/ginput/touch/STMPE811/readme.txt b/drivers/ginput/touch/STMPE811/readme.txt new file mode 100644 index 00000000..1d7a8b4f --- /dev/null +++ b/drivers/ginput/touch/STMPE811/readme.txt @@ -0,0 +1,9 @@ +To use this driver: + +1. Add in your halconf.h: + a) #define GFX_USE_GINPUT TRUE + b) #define GINPUT_NEED_MOUSE TRUE + +2. To your makefile add the following lines: + include $(GFXLIB)/drivers/ginput/touch/STMPE811/ginput_lld.mk + From 27290b5f85594db4ba1b86b401840474be7ec15b Mon Sep 17 00:00:00 2001 From: Mateusz Tomaszkiewicz Date: Fri, 8 Mar 2013 02:02:18 +0100 Subject: [PATCH 2/6] STMPE811: added header with registers addresses Also changed filename of board file from *_embest_lcd.h to *_embest_dmstf4bb.h. --- .../ginput/touch/STMPE811/ginput_lld_mouse.c | 12 ++- ... ginput_lld_mouse_board_embest_dmstf4bb.h} | 5 +- drivers/ginput/touch/STMPE811/stmpe811.h | 100 ++++++++++++++++++ 3 files changed, 111 insertions(+), 6 deletions(-) rename drivers/ginput/touch/STMPE811/{ginput_lld_mouse_board_embest_lcd.h => ginput_lld_mouse_board_embest_dmstf4bb.h} (93%) create mode 100644 drivers/ginput/touch/STMPE811/stmpe811.h 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_lcd.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h similarity index 93% rename from drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h rename to drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h index 8dd28a90..0ffbec2a 100644 --- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_lcd.h +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h @@ -19,8 +19,8 @@ */ /** - * @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. + * @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 @@ -89,4 +89,3 @@ static inline uint16_t read_value(uint16_t port) { #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 */ +/** @} */ From 4a056ae25f9b80a311dce7154e8200cd4fc36c85 Mon Sep 17 00:00:00 2001 From: Mateusz Tomaszkiewicz Date: Fri, 8 Mar 2013 02:11:27 +0100 Subject: [PATCH 3/6] STMPE811: comment fix --- drivers/ginput/touch/STMPE811/stmpe811.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ginput/touch/STMPE811/stmpe811.h b/drivers/ginput/touch/STMPE811/stmpe811.h index c2ec8ecf..f17d395b 100644 --- a/drivers/ginput/touch/STMPE811/stmpe811.h +++ b/drivers/ginput/touch/STMPE811/stmpe811.h @@ -85,8 +85,8 @@ #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_XYZ 0x52 // 32-bit +#define STMPE811_REG_TSC_FRACT_XYZ 0x56 #define STMPE811_REG_TSC_DATA 0x57 #define STMPE811_REG_TSC_I_DRIVE 0x58 #define STMPE811_REG_TSC_SHIELD 0x59 From e5cee65d422a75f057a6bda7d5c34db3e662f4dc Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 8 Mar 2013 06:35:06 +0100 Subject: [PATCH 4/6] release.txt update --- releases.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/releases.txt b/releases.txt index 9ca6aaa2..c99d2b41 100644 --- a/releases.txt +++ b/releases.txt @@ -10,9 +10,11 @@ FEATURE: Addition of GADC, GMISC, GAUDIN, GAUDOUT subsystems FIX: Removal of the GDISP_LLD() macro DEPRECATE: Removal of the GDISP VMT FEATURE: Added SSD2119 GDISP driver -FEATRE: Added GWIN_BUTTON_LAZY_RELEASE macro to disable cancel feature of buttons +FEATURE: Added GWIN_BUTTON_LAZY_RELEASE macro to disable cancel feature of buttons +FEATURE: Implemented all four orientation modes for the ILI9320 GDISP driver FIX: Renamed every '__inline' macro to 'inline' for compiler compatibilities -FEATURE: Complete all standard functions in GDISP Nokia6610GE8 driver +FEATURE: Supporting all standard functions in GDISP Nokia6610GE8 driver +FEATURE: Added STMPE811 GINPUT driver *** changes after 1.4 *** From e9cb6aa17a053f5eb00b4a898c7f7748138503ae Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 8 Mar 2013 06:36:33 +0100 Subject: [PATCH 5/6] small cleanup --- drivers/ginput/touch/STMPE811/stmpe811.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ginput/touch/STMPE811/stmpe811.h b/drivers/ginput/touch/STMPE811/stmpe811.h index f17d395b..8396a844 100644 --- a/drivers/ginput/touch/STMPE811/stmpe811.h +++ b/drivers/ginput/touch/STMPE811/stmpe811.h @@ -20,7 +20,7 @@ /** * @file drivers/ginput/touch/STMPE811/stmpe811.h - * @brief GINPUT Input Driver support header for the STMPE811 touch controller. + * @brief Register definition header for the STMPE811 touch controller. * * @addtogroup GINPUT * @{ @@ -98,3 +98,4 @@ #endif /* _STMPE811_H */ /** @} */ + From f5520981167ca8d5103a6dc8dd391a72c6ebeb60 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 8 Mar 2013 09:20:51 +0100 Subject: [PATCH 6/6] embest DMSTF4BB board fix - removed FSMC suffix because only FSMC exists --- drivers/gdisp/SSD2119/gdisp_lld.c | 4 ++-- ...best_dmstf4bb_fsmc.h => gdisp_lld_board_embest_dmstf4bb.h} | 0 .../touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) rename drivers/gdisp/SSD2119/{gdisp_lld_board_embest_dmstf4bb_fsmc.h => gdisp_lld_board_embest_dmstf4bb.h} (100%) diff --git a/drivers/gdisp/SSD2119/gdisp_lld.c b/drivers/gdisp/SSD2119/gdisp_lld.c index b7550794..b8884e0f 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld.c +++ b/drivers/gdisp/SSD2119/gdisp_lld.c @@ -58,8 +58,8 @@ #if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD /* Include the user supplied board definitions */ #include "gdisp_lld_board.h" -#elif defined(BOARD_EMBEST_DMSTF4BB_FSMC) - #include "gdisp_lld_board_embest_dmstf4bb_fsmc.h" +#elif defined(BOARD_EMBEST_DMSTF4BB) + #include "gdisp_lld_board_embest_dmstf4bb.h" #else /* Include the user supplied board definitions */ #include "gdisp_lld_board.h" diff --git a/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h b/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb.h similarity index 100% rename from drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h rename to drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb.h 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 index 0ffbec2a..fa43f4ac 100644 --- a/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h @@ -42,7 +42,9 @@ static const I2CConfig i2ccfg2 = { * @notapi */ static inline void init_board(void) { - palSetPadMode(GPIOC, 13, PAL_MODE_INPUT); + palSetPadMode(GPIOC, 13, PAL_MODE_INPUT); /* TP IRQ */ + palSetPadMode(GPIOB, 10, PAL_MODE_ALTERNATE(4)); /* I2C2 SCL */ + palSetPadMode(GPIOB, 11, PAL_MODE_ALTERNATE(4)); /* I2C2 SDA */ i2cStart(&I2CD2, &i2ccfg2); }