diff options
author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-03-09 21:07:20 -0800 |
---|---|---|
committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-03-09 21:07:20 -0800 |
commit | 5fd7e423a2ff39d94689d2800aaface016e5c866 (patch) | |
tree | 0f43d60a85b17f3c5bfcaaf8b81e9d6fbd64bff2 | |
parent | ce5f3b3d701e7f6ac40fe5e06c5ac32562ba36c7 (diff) | |
parent | f5520981167ca8d5103a6dc8dd391a72c6ebeb60 (diff) | |
download | uGFX-5fd7e423a2ff39d94689d2800aaface016e5c866.tar.gz uGFX-5fd7e423a2ff39d94689d2800aaface016e5c866.tar.bz2 uGFX-5fd7e423a2ff39d94689d2800aaface016e5c866.zip |
Merge pull request #20 from Tectu/master
Merge Tectu Changes
-rw-r--r-- | drivers/gdisp/SSD2119/gdisp_lld.c | 4 | ||||
-rw-r--r-- | drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb.h (renamed from drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h) | 0 | ||||
-rw-r--r-- | drivers/ginput/touch/STMPE811/ginput_lld.mk | 5 | ||||
-rw-r--r-- | drivers/ginput/touch/STMPE811/ginput_lld_mouse.c | 144 | ||||
-rw-r--r-- | drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h | 93 | ||||
-rw-r--r-- | drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h | 88 | ||||
-rw-r--r-- | drivers/ginput/touch/STMPE811/ginput_lld_mouse_config.h | 45 | ||||
-rw-r--r-- | drivers/ginput/touch/STMPE811/readme.txt | 9 | ||||
-rw-r--r-- | drivers/ginput/touch/STMPE811/stmpe811.h | 101 | ||||
-rw-r--r-- | releases.txt | 6 |
10 files changed, 491 insertions, 4 deletions
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 index bf7b3890..bf7b3890 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h +++ b/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb.h 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..bacb1f1f --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse.c @@ -0,0 +1,144 @@ +/*
+ ChibiOS/GFX - Copyright (C) 2012, 2013
+ 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 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"
+
+#include "stmpe811.h"
+
+#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) /*|| defined(__DOXYGEN__)*/
+
+#include "ginput/lld/mouse.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;
+
+/**
+ * @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_dmstf4bb.h b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h new file mode 100644 index 00000000..fa43f4ac --- /dev/null +++ b/drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h @@ -0,0 +1,93 @@ +/*
+ ChibiOS/GFX - Copyright (C) 2012, 2013
+ 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 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); /* TP IRQ */
+ palSetPadMode(GPIOB, 10, PAL_MODE_ALTERNATE(4)); /* I2C2 SCL */
+ palSetPadMode(GPIOB, 11, PAL_MODE_ALTERNATE(4)); /* I2C2 SDA */
+
+ 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 <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 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 <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 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
+
diff --git a/drivers/ginput/touch/STMPE811/stmpe811.h b/drivers/ginput/touch/STMPE811/stmpe811.h new file mode 100644 index 00000000..8396a844 --- /dev/null +++ b/drivers/ginput/touch/STMPE811/stmpe811.h @@ -0,0 +1,101 @@ +/* + 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 drivers/ginput/touch/STMPE811/stmpe811.h + * @brief Register definition 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 // 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 + +// Temperature sensor registers +#define STMPE811_REG_TEMP_CTRL 0x60 +#define STMPE811_REG_TEMP_DATA 0x61 +#define STMPE811_REG_TEMP_TH 0x62 + +#endif /* _STMPE811_H */ +/** @} */ + 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 *** |