Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Massive naming fix: STMPE11->STMPE811

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4782 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-05-29 00:54:22 +00:00
parent 9bf02b2921
commit 5c50b456af
15 changed files with 305 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/README.txt
+19 -19
View File
@@ -784,41 +784,41 @@ defconfig -- This is a configuration file similar to the Linux
there are multiple TSC2007 touchscreens, this setting will enable there are multiple TSC2007 touchscreens, this setting will enable
multiple touchscreens with the same driver. multiple touchscreens with the same driver.
CONFIG_INPUT_STMPE11 CONFIG_INPUT_STMPE811
Enables support for the STMPE11 driver (Needs CONFIG_INPUT) Enables support for the STMPE811 driver (Needs CONFIG_INPUT)
CONFIG_STMPE11_SPI CONFIG_STMPE811_SPI
Enables support for the SPI interface (not currenly supported) Enables support for the SPI interface (not currenly supported)
CONFIG_STMPE11_I2C CONFIG_STMPE811_I2C
Enables support for the I2C interface Enables support for the I2C interface
CONFIG_STMPE11_MULTIPLE CONFIG_STMPE811_MULTIPLE
Can be defined to support multiple STMPE11 devices on board. Can be defined to support multiple STMPE811 devices on board.
CONFIG_STMPE11_ACTIVELOW CONFIG_STMPE811_ACTIVELOW
Interrupt is generated by an active low signal (or falling edge). Interrupt is generated by an active low signal (or falling edge).
CONFIG_STMPE11_EDGE CONFIG_STMPE811_EDGE
Interrupt is generated on an edge (vs. on the active level) Interrupt is generated on an edge (vs. on the active level)
CONFIG_STMPE11_NPOLLWAITERS CONFIG_STMPE811_NPOLLWAITERS
Maximum number of threads that can be waiting on poll() (ignored if Maximum number of threads that can be waiting on poll() (ignored if
CONFIG_DISABLE_POLL is set). CONFIG_DISABLE_POLL is set).
CONFIG_STMPE11_TSC_DISABLE CONFIG_STMPE811_TSC_DISABLE
Disable driver touchscreen functionality. Disable driver touchscreen functionality.
CONFIG_STMPE11_ADC_DISABLE CONFIG_STMPE811_ADC_DISABLE
Disable driver ADC functionality. Disable driver ADC functionality.
CONFIG_STMPE11_GPIO_DISABLE CONFIG_STMPE811_GPIO_DISABLE
Disable driver GPIO functionlaity. Disable driver GPIO functionlaity.
CONFIG_STMPE11_GPIOINT_DISABLE CONFIG_STMPE811_GPIOINT_DISABLE
Disable driver GPIO interrupt functionality (ignored if GPIO Disable driver GPIO interrupt functionality (ignored if GPIO
functionality is disabled). functionality is disabled).
CONFIG_STMPE11_SWAPXY CONFIG_STMPE811_SWAPXY
Reverse the meaning of X and Y to handle different LCD orientations. Reverse the meaning of X and Y to handle different LCD orientations.
CONFIG_STMPE11_TEMP_DISABLE CONFIG_STMPE811_TEMP_DISABLE
Disable driver temperature sensor functionality. Disable driver temperature sensor functionality.
CONFIG_STMPE11_REGDEBUG CONFIG_STMPE811_REGDEBUG
Enabled very low register-level debug output. Requires CONFIG_DEBUG. Enabled very low register-level debug output. Requires CONFIG_DEBUG.
CONFIG_STMPE11_THRESHX and CONFIG_STMPE11_THRESHY CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
STMPE11 touchscreen data comes in a a very high rate. New touch positions STMPE811 touchscreen data comes in a a very high rate. New touch positions
will only be reported when the X or Y data changes by these thresholds. will only be reported when the X or Y data changes by these thresholds.
This trades reduces data rate for some loss in dragging accuracy. The This trades reduces data rate for some loss in dragging accuracy. The
STMPE11 is configure for 12-bit values so the raw ranges are 0-4095. So STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So
for example, if your display is 320x240, then THRESHX=13 and THRESHY=17 for example, if your display is 320x240, then THRESHX=13 and THRESHY=17
would correspond to one pixel. Default: 12 would correspond to one pixel. Default: 12
configs/stm3220g-eval/README.txt
+3 -3
View File
@@ -386,10 +386,10 @@ There are 2 possible SRAM configurations:
I/O Expanders I/O Expanders
============= =============
The STM3220G-EVAL has two STMPE11QTR I/O expanders on board both connected to The STM3220G-EVAL has two STMPE811QTR I/O expanders on board both connected to
the STM32 via I2C1. They share a common interrupt line: PI2. the STM32 via I2C1. They share a common interrupt line: PI2.
STMPE11 U24, I2C address 0x41 (7-bit) STMPE811 U24, I2C address 0x41 (7-bit)
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
STPE11 PIN BOARD SIGNAL BOARD CONNECTION STPE11 PIN BOARD SIGNAL BOARD CONNECTION
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
@@ -402,7 +402,7 @@ STPE11 PIN BOARD SIGNAL BOARD CONNECTION
IN1 EXP_IO11 IN1 EXP_IO11
IN0 EXP_IO12 IN0 EXP_IO12
STMPE11 U29, I2C address 0x44 (7-bit) STMPE811 U29, I2C address 0x44 (7-bit)
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
STPE11 PIN BOARD SIGNAL BOARD CONNECTION STPE11 PIN BOARD SIGNAL BOARD CONNECTION
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
configs/stm3220g-eval/nsh/appconfig
+1 -1
View File
@@ -80,7 +80,7 @@ ifeq ($(CONFIG_WATCHDOG),y)
CONFIGURED_APPS += examples/watchdog CONFIGURED_APPS += examples/watchdog
endif endif
ifeq ($(CONFIG_INPUT_STMPE11),y) ifeq ($(CONFIG_INPUT_STMPE811),y)
CONFIGURED_APPS += examples/touchscreen CONFIGURED_APPS += examples/touchscreen
endif endif
configs/stm3220g-eval/nsh/defconfig
+36 -36
View File
@@ -944,66 +944,66 @@ CONFIG_INPUT=n
CONFIG_INPUT_TSC2007=n CONFIG_INPUT_TSC2007=n
# #
# STMPE11 input device configuration # STMPE811 input device configuration
# #
# Prerequisites: CONFIG_INPUT=y # Prerequisites: CONFIG_INPUT=y
# Other settings that effect the driver: CONFIG_DISABLE_POLL # Other settings that effect the driver: CONFIG_DISABLE_POLL
# #
# CONFIG_INPUT_STMPE11 # CONFIG_INPUT_STMPE811
# Enables support for the STMPE11 driver (Needs CONFIG_INPUT) # Enables support for the STMPE811 driver (Needs CONFIG_INPUT)
# CONFIG_STMPE11_SPI # CONFIG_STMPE811_SPI
# Enables support for the SPI interface (not currenly supported) # Enables support for the SPI interface (not currenly supported)
# CONFIG_STMPE11_I2C # CONFIG_STMPE811_I2C
# Enables support for the I2C interface # Enables support for the I2C interface
# CONFIG_STMPE11_MULTIPLE # CONFIG_STMPE811_MULTIPLE
# Can be defined to support multiple STMPE11 devices on board. # Can be defined to support multiple STMPE811 devices on board.
# CONFIG_STMPE11_ACTIVELOW # CONFIG_STMPE811_ACTIVELOW
# Interrupt is generated by an active low signal (or falling edge). # Interrupt is generated by an active low signal (or falling edge).
# CONFIG_STMPE11_EDGE # CONFIG_STMPE811_EDGE
# Interrupt is generated on an edge (vs. on the active level) # Interrupt is generated on an edge (vs. on the active level)
# CONFIG_STMPE11_NPOLLWAITERS # CONFIG_STMPE811_NPOLLWAITERS
# Maximum number of threads that can be waiting on poll() (ignored if # Maximum number of threads that can be waiting on poll() (ignored if
# CONFIG_DISABLE_POLL is set). # CONFIG_DISABLE_POLL is set).
# CONFIG_STMPE11_TSC_DISABLE # CONFIG_STMPE811_TSC_DISABLE
# Disable driver touchscreen functionality. # Disable driver touchscreen functionality.
# CONFIG_STMPE11_ADC_DISABLE # CONFIG_STMPE811_ADC_DISABLE
# Disable driver ADC functionality. # Disable driver ADC functionality.
# CONFIG_STMPE11_GPIO_DISABLE # CONFIG_STMPE811_GPIO_DISABLE
# Disable driver GPIO functionality. # Disable driver GPIO functionality.
# CONFIG_STMPE11_GPIOINT_DISABLE # CONFIG_STMPE811_GPIOINT_DISABLE
# Disable driver GPIO interrupt functionality (ignored if GPIO functionality is # Disable driver GPIO interrupt functionality (ignored if GPIO functionality is
# disabled). # disabled).
# CONFIG_STMPE11_SWAPXY # CONFIG_STMPE811_SWAPXY
# Reverse the meaning of X and Y to handle different LCD orientations. # Reverse the meaning of X and Y to handle different LCD orientations.
# For the STM3220G-EVAL, X and Y should be swapped in PORTRAIT modes # For the STM3220G-EVAL, X and Y should be swapped in PORTRAIT modes
# CONFIG_STMPE11_TEMP_DISABLE # CONFIG_STMPE811_TEMP_DISABLE
# Disable driver temperature sensor functionality. # Disable driver temperature sensor functionality.
# CONFIG_STMPE11_REGDBUG # CONFIG_STMPE811_REGDBUG
# Enabled very low register-level debug output. Requires CONFIG_DEBUG. # Enabled very low register-level debug output. Requires CONFIG_DEBUG.
# CONFIG_STMPE11_THRESHX and CONFIG_STMPE11_THRESHY # CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
# STMPE11 touchscreen data comes in a a very high rate. New touch positions # STMPE811 touchscreen data comes in a a very high rate. New touch positions
# will only be reported when the X or Y data changes by these thresholds. # will only be reported when the X or Y data changes by these thresholds.
# This trades reduces data rate for some loss in dragging accuracy. The # This trades reduces data rate for some loss in dragging accuracy. The
# STMPE11 is configure for 12-bit values so the raw ranges are 0-4095. So # STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So
# for example, if your display is 320x240, then THRESHX=13 and THRESHY=17 # for example, if your display is 320x240, then THRESHX=13 and THRESHY=17
# would correspond to one pixel. Default: 12 # would correspond to one pixel. Default: 12
# #
CONFIG_INPUT_STMPE11=n CONFIG_INPUT_STMPE811=n
CONFIG_STMPE11_SPI=n CONFIG_STMPE811_SPI=n
CONFIG_STMPE11_I2C=y CONFIG_STMPE811_I2C=y
CONFIG_STMPE11_MULTIPLE=y CONFIG_STMPE811_MULTIPLE=y
CONFIG_STMPE11_ACTIVELOW=y CONFIG_STMPE811_ACTIVELOW=y
CONFIG_STMPE11_EDGE=y CONFIG_STMPE811_EDGE=y
#CONFIG_STMPE11_NPOLLWAITERS #CONFIG_STMPE811_NPOLLWAITERS
CONFIG_STMPE11_TSC_DISABLE=n CONFIG_STMPE811_TSC_DISABLE=n
CONFIG_STMPE11_ADC_DISABLE=y CONFIG_STMPE811_ADC_DISABLE=y
CONFIG_STMPE11_GPIO_DISABLE=y CONFIG_STMPE811_GPIO_DISABLE=y
CONFIG_STMPE11_GPIOINT_DISABLE=y CONFIG_STMPE811_GPIOINT_DISABLE=y
CONFIG_STMPE11_SWAPXY=y CONFIG_STMPE811_SWAPXY=y
CONFIG_STMPE11_TEMP_DISABLE=y CONFIG_STMPE811_TEMP_DISABLE=y
CONFIG_STMPE11_REGDEBUG=n CONFIG_STMPE811_REGDEBUG=n
CONFIG_STMPE11_THRESHX=26 CONFIG_STMPE811_THRESHX=26
CONFIG_STMPE11_THRESHY=34 CONFIG_STMPE811_THRESHY=34
# #
# USB Device Configuration # USB Device Configuration
configs/stm3220g-eval/nxwm/defconfig
+36 -36
View File
@@ -945,66 +945,66 @@ CONFIG_INPUT=y
CONFIG_INPUT_TSC2007=n CONFIG_INPUT_TSC2007=n
# #
# STMPE11 input device configuration # STMPE811 input device configuration
# #
# Prerequisites: CONFIG_INPUT=y # Prerequisites: CONFIG_INPUT=y
# Other settings that effect the driver: CONFIG_DISABLE_POLL # Other settings that effect the driver: CONFIG_DISABLE_POLL
# #
# CONFIG_INPUT_STMPE11 # CONFIG_INPUT_STMPE811
# Enables support for the STMPE11 driver (Needs CONFIG_INPUT) # Enables support for the STMPE811 driver (Needs CONFIG_INPUT)
# CONFIG_STMPE11_SPI # CONFIG_STMPE811_SPI
# Enables support for the SPI interface (not currenly supported) # Enables support for the SPI interface (not currenly supported)
# CONFIG_STMPE11_I2C # CONFIG_STMPE811_I2C
# Enables support for the I2C interface # Enables support for the I2C interface
# CONFIG_STMPE11_MULTIPLE # CONFIG_STMPE811_MULTIPLE
# Can be defined to support multiple STMPE11 devices on board. # Can be defined to support multiple STMPE811 devices on board.
# CONFIG_STMPE11_ACTIVELOW # CONFIG_STMPE811_ACTIVELOW
# Interrupt is generated by an active low signal (or falling edge). # Interrupt is generated by an active low signal (or falling edge).
# CONFIG_STMPE11_EDGE # CONFIG_STMPE811_EDGE
# Interrupt is generated on an edge (vs. on the active level) # Interrupt is generated on an edge (vs. on the active level)
# CONFIG_STMPE11_NPOLLWAITERS # CONFIG_STMPE811_NPOLLWAITERS
# Maximum number of threads that can be waiting on poll() (ignored if # Maximum number of threads that can be waiting on poll() (ignored if
# CONFIG_DISABLE_POLL is set). # CONFIG_DISABLE_POLL is set).
# CONFIG_STMPE11_TSC_DISABLE # CONFIG_STMPE811_TSC_DISABLE
# Disable driver touchscreen functionality. # Disable driver touchscreen functionality.
# CONFIG_STMPE11_ADC_DISABLE # CONFIG_STMPE811_ADC_DISABLE
# Disable driver ADC functionality. # Disable driver ADC functionality.
# CONFIG_STMPE11_GPIO_DISABLE # CONFIG_STMPE811_GPIO_DISABLE
# Disable driver GPIO functionality. # Disable driver GPIO functionality.
# CONFIG_STMPE11_GPIOINT_DISABLE # CONFIG_STMPE811_GPIOINT_DISABLE
# Disable driver GPIO interrupt functionality (ignored if GPIO functionality is # Disable driver GPIO interrupt functionality (ignored if GPIO functionality is
# disabled). # disabled).
# CONFIG_STMPE11_SWAPXY # CONFIG_STMPE811_SWAPXY
# Reverse the meaning of X and Y to handle different LCD orientations. # Reverse the meaning of X and Y to handle different LCD orientations.
# For the STM3220G-EVAL, X and Y should be swapped in PORTRAIT modes # For the STM3220G-EVAL, X and Y should be swapped in PORTRAIT modes
# CONFIG_STMPE11_TEMP_DISABLE # CONFIG_STMPE811_TEMP_DISABLE
# Disable driver temperature sensor functionality. # Disable driver temperature sensor functionality.
# CONFIG_STMPE11_REGDBUG # CONFIG_STMPE811_REGDBUG
# Enabled very low register-level debug output. Requires CONFIG_DEBUG. # Enabled very low register-level debug output. Requires CONFIG_DEBUG.
# CONFIG_STMPE11_THRESHX and CONFIG_STMPE11_THRESHY # CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
# STMPE11 touchscreen data comes in a a very high rate. New touch positions # STMPE811 touchscreen data comes in a a very high rate. New touch positions
# will only be reported when the X or Y data changes by these thresholds. # will only be reported when the X or Y data changes by these thresholds.
# This trades reduces data rate for some loss in dragging accuracy. The # This trades reduces data rate for some loss in dragging accuracy. The
# STMPE11 is configure for 12-bit values so the raw ranges are 0-4095. So # STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So
# for example, if your display is 320x240, then THRESHX=13 and THRESHY=17 # for example, if your display is 320x240, then THRESHX=13 and THRESHY=17
# would correspond to one pixel. Default: 12 # would correspond to one pixel. Default: 12
# #
CONFIG_INPUT_STMPE11=y CONFIG_INPUT_STMPE811=y
CONFIG_STMPE11_SPI=n CONFIG_STMPE811_SPI=n
CONFIG_STMPE11_I2C=y CONFIG_STMPE811_I2C=y
CONFIG_STMPE11_MULTIPLE=y CONFIG_STMPE811_MULTIPLE=y
CONFIG_STMPE11_ACTIVELOW=y CONFIG_STMPE811_ACTIVELOW=y
CONFIG_STMPE11_EDGE=y CONFIG_STMPE811_EDGE=y
#CONFIG_STMPE11_NPOLLWAITERS #CONFIG_STMPE811_NPOLLWAITERS
CONFIG_STMPE11_TSC_DISABLE=n CONFIG_STMPE811_TSC_DISABLE=n
CONFIG_STMPE11_ADC_DISABLE=y CONFIG_STMPE811_ADC_DISABLE=y
CONFIG_STMPE11_GPIO_DISABLE=y CONFIG_STMPE811_GPIO_DISABLE=y
CONFIG_STMPE11_GPIOINT_DISABLE=y CONFIG_STMPE811_GPIOINT_DISABLE=y
CONFIG_STMPE11_SWAPXY=n CONFIG_STMPE811_SWAPXY=n
CONFIG_STMPE11_TEMP_DISABLE=y CONFIG_STMPE811_TEMP_DISABLE=y
CONFIG_STMPE11_REGDEBUG=n CONFIG_STMPE811_REGDEBUG=n
CONFIG_STMPE11_THRESHX=39 CONFIG_STMPE811_THRESHX=39
CONFIG_STMPE11_THRESHY=51 CONFIG_STMPE811_THRESHY=51
# #
# USB Device Configuration # USB Device Configuration
configs/stm3220g-eval/src/Makefile
+2 -2
View File
@@ -84,8 +84,8 @@ ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += up_watchdog.c CSRCS += up_watchdog.c
endif endif
ifeq ($(CONFIG_INPUT_STMPE11),y) ifeq ($(CONFIG_INPUT_STMPE811),y)
CSRCS += up_stmpe11.c CSRCS += up_stmpe811.c
endif endif
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
configs/stm3220g-eval/src/stm3220g-internal.h
+5 -5
View File
@@ -138,10 +138,10 @@
#define GPIO_OTGFS_PWRON (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTH|GPIO_PIN5) #define GPIO_OTGFS_PWRON (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTH|GPIO_PIN5)
#define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11) #define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11)
/* The STM3220G-EVAL has two STMPE11QTR I/O expanders on board both connected /* The STM3220G-EVAL has two STMPE811QTR I/O expanders on board both connected
* to the STM32 via I2C1. They share a common interrupt line: PI2. * to the STM32 via I2C1. They share a common interrupt line: PI2.
* *
* STMPE11 U24, I2C address 0x41 (7-bit) * STMPE811 U24, I2C address 0x41 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -154,7 +154,7 @@
* IN1 EXP_IO11 * IN1 EXP_IO11
* IN0 EXP_IO12 * IN0 EXP_IO12
* *
* STMPE11 U29, I2C address 0x44 (7-bit) * STMPE811 U29, I2C address 0x44 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -168,8 +168,8 @@
* IN0 EXP_IO8 * IN0 EXP_IO8
*/ */
#define STMPE11_ADDR1 0x41 #define STMPE811_ADDR1 0x41
#define STMPE11_ADDR2 0x44 #define STMPE811_ADDR2 0x44
#define GPIO_IO_EXPANDER (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTI|GPIO_PIN2) #define GPIO_IO_EXPANDER (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTI|GPIO_PIN2)
configs/stm3220g-eval/src/up_stmpe11.c → configs/stm3220g-eval/src/up_stmpe811.c
+60 -60
View File
@@ -47,7 +47,7 @@
#include <nuttx/i2c.h> #include <nuttx/i2c.h>
#include <nuttx/input/touchscreen.h> #include <nuttx/input/touchscreen.h>
#include <nuttx/input/stmpe11.h> #include <nuttx/input/stmpe811.h>
#include <arch/irq.h> #include <arch/irq.h>
@@ -59,44 +59,44 @@
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifdef CONFIG_INPUT_STMPE11 #ifdef CONFIG_INPUT_STMPE811
#ifndef CONFIG_INPUT #ifndef CONFIG_INPUT
# error "STMPE11 support requires CONFIG_INPUT" # error "STMPE811 support requires CONFIG_INPUT"
#endif #endif
#ifndef CONFIG_STM32_I2C1 #ifndef CONFIG_STM32_I2C1
# error "STMPE11 support requires CONFIG_STM32_I2C1" # error "STMPE811 support requires CONFIG_STM32_I2C1"
#endif #endif
#ifndef CONFIG_STMPE11_I2C #ifndef CONFIG_STMPE811_I2C
# error "Only the STMPE11 I2C interface is supported" # error "Only the STMPE811 I2C interface is supported"
#endif #endif
#ifdef CONFIG_STMPE11_SPI #ifdef CONFIG_STMPE811_SPI
# error "Only the STMPE11 SPI interface is supported" # error "Only the STMPE811 SPI interface is supported"
#endif #endif
#ifndef CONFIG_STMPE11_FREQUENCY #ifndef CONFIG_STMPE811_FREQUENCY
# define CONFIG_STMPE11_FREQUENCY 100000 # define CONFIG_STMPE811_FREQUENCY 100000
#endif #endif
#ifndef CONFIG_STMPE11_I2CDEV #ifndef CONFIG_STMPE811_I2CDEV
# define CONFIG_STMPE11_I2CDEV 1 # define CONFIG_STMPE811_I2CDEV 1
#endif #endif
#if CONFIG_STMPE11_I2CDEV != 1 #if CONFIG_STMPE811_I2CDEV != 1
# error "CONFIG_STMPE11_I2CDEV must be one" # error "CONFIG_STMPE811_I2CDEV must be one"
#endif #endif
#ifndef CONFIG_STMPE11_DEVMINOR #ifndef CONFIG_STMPE811_DEVMINOR
# define CONFIG_STMPE11_DEVMINOR 0 # define CONFIG_STMPE811_DEVMINOR 0
#endif #endif
/* Board definitions ********************************************************/ /* Board definitions ********************************************************/
/* The STM3220G-EVAL has two STMPE11QTR I/O expanders on board both connected /* The STM3220G-EVAL has two STMPE811QTR I/O expanders on board both connected
* to the STM32 via I2C1. They share a common interrupt line: PI2. * to the STM32 via I2C1. They share a common interrupt line: PI2.
* *
* STMPE11 U24, I2C address 0x41 (7-bit) * STMPE811 U24, I2C address 0x41 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -109,7 +109,7 @@
* IN1 EXP_IO11 * IN1 EXP_IO11
* IN0 EXP_IO12 * IN0 EXP_IO12
* *
* STMPE11 U29, I2C address 0x44 (7-bit) * STMPE811 U29, I2C address 0x44 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -127,16 +127,16 @@
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
struct stm32_stmpe11config_s struct stm32_stmpe811config_s
{ {
/* Configuration structure as seen by the STMPE11 driver */ /* Configuration structure as seen by the STMPE811 driver */
struct stmpe11_config_s config; struct stmpe811_config_s config;
/* Additional private definitions only known to this driver */ /* Additional private definitions only known to this driver */
STMPE11_HANDLE handle; /* The STMPE11 driver handle */ STMPE811_HANDLE handle; /* The STMPE811 driver handle */
xcpt_t handler; /* The STMPE11 interrupt handler */ xcpt_t handler; /* The STMPE811 interrupt handler */
}; };
/**************************************************************************** /****************************************************************************
@@ -144,25 +144,25 @@ struct stm32_stmpe11config_s
****************************************************************************/ ****************************************************************************/
/* IRQ/GPIO access callbacks. These operations all hidden behind callbacks /* IRQ/GPIO access callbacks. These operations all hidden behind callbacks
* to isolate the STMPE11 driver from differences in GPIO * to isolate the STMPE811 driver from differences in GPIO
* interrupt handling by varying boards and MCUs.* so that contact and loss-of-contact events can be detected. * interrupt handling by varying boards and MCUs.* so that contact and loss-of-contact events can be detected.
* *
* attach - Attach the STMPE11 interrupt handler to the GPIO interrupt * attach - Attach the STMPE811 interrupt handler to the GPIO interrupt
* enable - Enable or disable the GPIO interrupt * enable - Enable or disable the GPIO interrupt
* clear - Acknowledge/clear any pending GPIO interrupt * clear - Acknowledge/clear any pending GPIO interrupt
*/ */
static int stmpe11_attach(FAR struct stmpe11_config_s *state, xcpt_t isr); static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr);
static void stmpe11_enable(FAR struct stmpe11_config_s *state, bool enable); static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable);
static void stmpe11_clear(FAR struct stmpe11_config_s *state); static void stmpe811_clear(FAR struct stmpe811_config_s *state);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
/* A reference to a structure of this type must be passed to the STMPE11 /* A reference to a structure of this type must be passed to the STMPE811
* driver. This structure provides information about the configuration * driver. This structure provides information about the configuration
* of the STMPE11 and provides some board-specific hooks. * of the STMPE811 and provides some board-specific hooks.
* *
* Memory for this structure is provided by the caller. It is not copied * Memory for this structure is provided by the caller. It is not copied
* by the driver and is presumed to persist while the driver is active. The * by the driver and is presumed to persist while the driver is active. The
@@ -170,25 +170,25 @@ static void stmpe11_clear(FAR struct stmpe11_config_s *state);
* may modify frequency or X plate resistance values. * may modify frequency or X plate resistance values.
*/ */
#ifndef CONFIG_STMPE11_TSC_DISABLE #ifndef CONFIG_STMPE811_TSC_DISABLE
static struct stm32_stmpe11config_s g_stmpe11config = static struct stm32_stmpe811config_s g_stmpe811config =
{ {
.config = .config =
{ {
#ifdef CONFIG_STMPE11_I2C #ifdef CONFIG_STMPE811_I2C
.address = STMPE11_ADDR1, .address = STMPE811_ADDR1,
#endif #endif
.frequency = CONFIG_STMPE11_FREQUENCY, .frequency = CONFIG_STMPE811_FREQUENCY,
#ifdef CONFIG_STMPE11_MULTIPLE #ifdef CONFIG_STMPE811_MULTIPLE
.irq = STM32_IRQ_EXTI2, .irq = STM32_IRQ_EXTI2,
#endif #endif
.ctrl1 = (ADC_CTRL1_SAMPLE_TIME_80 | ADC_CTRL1_MOD_12B), .ctrl1 = (ADC_CTRL1_SAMPLE_TIME_80 | ADC_CTRL1_MOD_12B),
.ctrl2 = ADC_CTRL2_ADC_FREQ_3p25, .ctrl2 = ADC_CTRL2_ADC_FREQ_3p25,
.attach = stmpe11_attach, .attach = stmpe811_attach,
.enable = stmpe11_enable, .enable = stmpe811_enable,
.clear = stmpe11_clear, .clear = stmpe811_clear,
}, },
.handler = NULL, .handler = NULL,
}; };
@@ -199,17 +199,17 @@ static struct stm32_stmpe11config_s g_stmpe11config =
****************************************************************************/ ****************************************************************************/
/* IRQ/GPIO access callbacks. These operations all hidden behind /* IRQ/GPIO access callbacks. These operations all hidden behind
* callbacks to isolate the STMPE11 driver from differences in GPIO * callbacks to isolate the STMPE811 driver from differences in GPIO
* interrupt handling by varying boards and MCUs. * interrupt handling by varying boards and MCUs.
* *
* attach - Attach the STMPE11 interrupt handler to the GPIO interrupt * attach - Attach the STMPE811 interrupt handler to the GPIO interrupt
* enable - Enable or disable the GPIO interrupt * enable - Enable or disable the GPIO interrupt
* clear - Acknowledge/clear any pending GPIO interrupt * clear - Acknowledge/clear any pending GPIO interrupt
*/ */
static int stmpe11_attach(FAR struct stmpe11_config_s *state, xcpt_t isr) static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr)
{ {
FAR struct stm32_stmpe11config_s *priv = (FAR struct stm32_stmpe11config_s *)state; FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state;
ivdbg("Saving handler %p\n", isr); ivdbg("Saving handler %p\n", isr);
DEBUGASSERT(priv); DEBUGASSERT(priv);
@@ -220,9 +220,9 @@ static int stmpe11_attach(FAR struct stmpe11_config_s *state, xcpt_t isr)
return OK; return OK;
} }
static void stmpe11_enable(FAR struct stmpe11_config_s *state, bool enable) static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable)
{ {
FAR struct stm32_stmpe11config_s *priv = (FAR struct stm32_stmpe11config_s *)state; FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state;
irqstate_t flags; irqstate_t flags;
/* Attach and enable, or detach and disable. Enabling and disabling GPIO /* Attach and enable, or detach and disable. Enabling and disabling GPIO
@@ -246,7 +246,7 @@ static void stmpe11_enable(FAR struct stmpe11_config_s *state, bool enable)
irqrestore(flags); irqrestore(flags);
} }
static void stmpe11_clear(FAR struct stmpe11_config_s *state) static void stmpe811_clear(FAR struct stmpe811_config_s *state)
{ {
/* Does nothing */ /* Does nothing */
} }
@@ -275,7 +275,7 @@ static void stmpe11_clear(FAR struct stmpe11_config_s *state)
int arch_tcinitialize(int minor) int arch_tcinitialize(int minor)
{ {
#ifndef CONFIG_STMPE11_TSC_DISABLE #ifndef CONFIG_STMPE811_TSC_DISABLE
FAR struct i2c_dev_s *dev; FAR struct i2c_dev_s *dev;
int ret; int ret;
@@ -284,36 +284,36 @@ int arch_tcinitialize(int minor)
/* Check if we are already initialized */ /* Check if we are already initialized */
if (!g_stmpe11config.handle) if (!g_stmpe811config.handle)
{ {
ivdbg("Initializing\n"); ivdbg("Initializing\n");
/* Configure the STMPE11 interrupt pin as an input */ /* Configure the STMPE811 interrupt pin as an input */
(void)stm32_configgpio(GPIO_IO_EXPANDER); (void)stm32_configgpio(GPIO_IO_EXPANDER);
/* Get an instance of the I2C interface */ /* Get an instance of the I2C interface */
dev = up_i2cinitialize(CONFIG_STMPE11_I2CDEV); dev = up_i2cinitialize(CONFIG_STMPE811_I2CDEV);
if (!dev) if (!dev)
{ {
idbg("Failed to initialize I2C bus %d\n", CONFIG_STMPE11_I2CDEV); idbg("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
return -ENODEV; return -ENODEV;
} }
/* Instantiate the STMPE11 driver */ /* Instantiate the STMPE811 driver */
g_stmpe11config.handle = g_stmpe811config.handle =
stmpe11_instantiate(dev, (FAR struct stmpe11_config_s *)&g_stmpe11config); stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config);
if (!g_stmpe11config.handle) if (!g_stmpe811config.handle)
{ {
idbg("Failed to instantiate the STMPE11 driver\n"); idbg("Failed to instantiate the STMPE811 driver\n");
return -ENODEV; return -ENODEV;
} }
/* Initialize and register the I2C touchscreen device */ /* Initialize and register the I2C touchscreen device */
ret = stmpe11_register(g_stmpe11config.handle, CONFIG_STMPE11_DEVMINOR); ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR);
if (ret < 0) if (ret < 0)
{ {
idbg("Failed to register STMPE driver: %d\n", ret); idbg("Failed to register STMPE driver: %d\n", ret);
@@ -346,8 +346,8 @@ int arch_tcinitialize(int minor)
void arch_tcuninitialize(void) void arch_tcuninitialize(void)
{ {
/* No support for un-initializing the touchscreen STMPE11 device yet */ /* No support for un-initializing the touchscreen STMPE811 device yet */
} }
#endif /* CONFIG_INPUT_STMPE11 */ #endif /* CONFIG_INPUT_STMPE811 */
configs/stm3240g-eval/README.txt
+3 -3
View File
@@ -500,10 +500,10 @@ There are 4 possible SRAM configurations:
I/O Expanders I/O Expanders
============= =============
The STM3240G-EVAL has two STMPE11QTR I/O expanders on board both connected to The STM3240G-EVAL has two STMPE811QTR I/O expanders on board both connected to
the STM32 via I2C1. They share a common interrupt line: PI2. the STM32 via I2C1. They share a common interrupt line: PI2.
STMPE11 U24, I2C address 0x41 (7-bit) STMPE811 U24, I2C address 0x41 (7-bit)
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
STPE11 PIN BOARD SIGNAL BOARD CONNECTION STPE11 PIN BOARD SIGNAL BOARD CONNECTION
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
@@ -516,7 +516,7 @@ STPE11 PIN BOARD SIGNAL BOARD CONNECTION
IN1 EXP_IO11 IN1 EXP_IO11
IN0 EXP_IO12 IN0 EXP_IO12
STMPE11 U29, I2C address 0x44 (7-bit) STMPE811 U29, I2C address 0x44 (7-bit)
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
STPE11 PIN BOARD SIGNAL BOARD CONNECTION STPE11 PIN BOARD SIGNAL BOARD CONNECTION
------ ---- ---------------- -------------------------------------------- ------ ---- ---------------- --------------------------------------------
configs/stm3240g-eval/nsh/appconfig
+1 -1
View File
@@ -80,7 +80,7 @@ ifeq ($(CONFIG_WATCHDOG),y)
CONFIGURED_APPS += examples/watchdog CONFIGURED_APPS += examples/watchdog
endif endif
ifeq ($(CONFIG_INPUT_STMPE11),y) ifeq ($(CONFIG_INPUT_STMPE811),y)
CONFIGURED_APPS += examples/touchscreen CONFIGURED_APPS += examples/touchscreen
endif endif
configs/stm3240g-eval/nsh/defconfig
+36 -36
View File
@@ -954,66 +954,66 @@ CONFIG_INPUT=n
CONFIG_INPUT_TSC2007=n CONFIG_INPUT_TSC2007=n
# #
# STMPE11 input device configuration # STMPE811 input device configuration
# #
# Prerequisites: CONFIG_INPUT=y # Prerequisites: CONFIG_INPUT=y
# Other settings that effect the driver: CONFIG_DISABLE_POLL # Other settings that effect the driver: CONFIG_DISABLE_POLL
# #
# CONFIG_INPUT_STMPE11 # CONFIG_INPUT_STMPE811
# Enables support for the STMPE11 driver (Needs CONFIG_INPUT) # Enables support for the STMPE811 driver (Needs CONFIG_INPUT)
# CONFIG_STMPE11_SPI # CONFIG_STMPE811_SPI
# Enables support for the SPI interface (not currenly supported) # Enables support for the SPI interface (not currenly supported)
# CONFIG_STMPE11_I2C # CONFIG_STMPE811_I2C
# Enables support for the I2C interface # Enables support for the I2C interface
# CONFIG_STMPE11_MULTIPLE # CONFIG_STMPE811_MULTIPLE
# Can be defined to support multiple STMPE11 devices on board. # Can be defined to support multiple STMPE811 devices on board.
# CONFIG_STMPE11_ACTIVELOW # CONFIG_STMPE811_ACTIVELOW
# Interrupt is generated by an active low signal (or falling edge). # Interrupt is generated by an active low signal (or falling edge).
# CONFIG_STMPE11_EDGE # CONFIG_STMPE811_EDGE
# Interrupt is generated on an edge (vs. on the active level) # Interrupt is generated on an edge (vs. on the active level)
# CONFIG_STMPE11_NPOLLWAITERS # CONFIG_STMPE811_NPOLLWAITERS
# Maximum number of threads that can be waiting on poll() (ignored if # Maximum number of threads that can be waiting on poll() (ignored if
# CONFIG_DISABLE_POLL is set). # CONFIG_DISABLE_POLL is set).
# CONFIG_STMPE11_TSC_DISABLE # CONFIG_STMPE811_TSC_DISABLE
# Disable driver touchscreen functionality. # Disable driver touchscreen functionality.
# CONFIG_STMPE11_ADC_DISABLE # CONFIG_STMPE811_ADC_DISABLE
# Disable driver ADC functionality. # Disable driver ADC functionality.
# CONFIG_STMPE11_GPIO_DISABLE # CONFIG_STMPE811_GPIO_DISABLE
# Disable driver GPIO functionality. # Disable driver GPIO functionality.
# CONFIG_STMPE11_GPIOINT_DISABLE # CONFIG_STMPE811_GPIOINT_DISABLE
# Disable driver GPIO interrupt functionality (ignored if GPIO functionality is # Disable driver GPIO interrupt functionality (ignored if GPIO functionality is
# disabled). # disabled).
# CONFIG_STMPE11_SWAPXY # CONFIG_STMPE811_SWAPXY
# Reverse the meaning of X and Y to handle different LCD orientations. # Reverse the meaning of X and Y to handle different LCD orientations.
# For the STM3240G-EVAL, X and Y should be swapped in PORTRAIT modes # For the STM3240G-EVAL, X and Y should be swapped in PORTRAIT modes
# CONFIG_STMPE11_TEMP_DISABLE # CONFIG_STMPE811_TEMP_DISABLE
# Disable driver temperature sensor functionality. # Disable driver temperature sensor functionality.
# CONFIG_STMPE11_REGDBUG # CONFIG_STMPE811_REGDBUG
# Enabled very low register-level debug output. Requires CONFIG_DEBUG. # Enabled very low register-level debug output. Requires CONFIG_DEBUG.
# CONFIG_STMPE11_THRESHX and CONFIG_STMPE11_THRESHY # CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
# STMPE11 touchscreen data comes in a a very high rate. New touch positions # STMPE811 touchscreen data comes in a a very high rate. New touch positions
# will only be reported when the X or Y data changes by these thresholds. # will only be reported when the X or Y data changes by these thresholds.
# This trades reduces data rate for some loss in dragging accuracy. The # This trades reduces data rate for some loss in dragging accuracy. The
# STMPE11 is configure for 12-bit values so the raw ranges are 0-4095. So # STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So
# for example, if your display is 320x240, then THRESHX=13 and THRESHY=17 # for example, if your display is 320x240, then THRESHX=13 and THRESHY=17
# would correspond to one pixel. Default: 12 # would correspond to one pixel. Default: 12
# #
CONFIG_INPUT_STMPE11=n CONFIG_INPUT_STMPE811=n
CONFIG_STMPE11_SPI=n CONFIG_STMPE811_SPI=n
CONFIG_STMPE11_I2C=y CONFIG_STMPE811_I2C=y
CONFIG_STMPE11_MULTIPLE=y CONFIG_STMPE811_MULTIPLE=y
CONFIG_STMPE11_ACTIVELOW=y CONFIG_STMPE811_ACTIVELOW=y
CONFIG_STMPE11_EDGE=y CONFIG_STMPE811_EDGE=y
#CONFIG_STMPE11_NPOLLWAITERS #CONFIG_STMPE811_NPOLLWAITERS
CONFIG_STMPE11_TSC_DISABLE=n CONFIG_STMPE811_TSC_DISABLE=n
CONFIG_STMPE11_ADC_DISABLE=y CONFIG_STMPE811_ADC_DISABLE=y
CONFIG_STMPE11_GPIO_DISABLE=y CONFIG_STMPE811_GPIO_DISABLE=y
CONFIG_STMPE11_GPIOINT_DISABLE=y CONFIG_STMPE811_GPIOINT_DISABLE=y
CONFIG_STMPE11_SWAPXY=y CONFIG_STMPE811_SWAPXY=y
CONFIG_STMPE11_TEMP_DISABLE=y CONFIG_STMPE811_TEMP_DISABLE=y
CONFIG_STMPE11_REGDEBUG=n CONFIG_STMPE811_REGDEBUG=n
CONFIG_STMPE11_THRESHX=26 CONFIG_STMPE811_THRESHX=26
CONFIG_STMPE11_THRESHY=34 CONFIG_STMPE811_THRESHY=34
# #
# USB Device Configuration # USB Device Configuration
configs/stm3240g-eval/nxwm/defconfig
+36 -36
View File
@@ -956,66 +956,66 @@ CONFIG_INPUT=y
CONFIG_INPUT_TSC2007=n CONFIG_INPUT_TSC2007=n
# #
# STMPE11 input device configuration # STMPE811 input device configuration
# #
# Prerequisites: CONFIG_INPUT=y # Prerequisites: CONFIG_INPUT=y
# Other settings that effect the driver: CONFIG_DISABLE_POLL # Other settings that effect the driver: CONFIG_DISABLE_POLL
# #
# CONFIG_INPUT_STMPE11 # CONFIG_INPUT_STMPE811
# Enables support for the STMPE11 driver (Needs CONFIG_INPUT) # Enables support for the STMPE811 driver (Needs CONFIG_INPUT)
# CONFIG_STMPE11_SPI # CONFIG_STMPE811_SPI
# Enables support for the SPI interface (not currenly supported) # Enables support for the SPI interface (not currenly supported)
# CONFIG_STMPE11_I2C # CONFIG_STMPE811_I2C
# Enables support for the I2C interface # Enables support for the I2C interface
# CONFIG_STMPE11_MULTIPLE # CONFIG_STMPE811_MULTIPLE
# Can be defined to support multiple STMPE11 devices on board. # Can be defined to support multiple STMPE811 devices on board.
# CONFIG_STMPE11_ACTIVELOW # CONFIG_STMPE811_ACTIVELOW
# Interrupt is generated by an active low signal (or falling edge). # Interrupt is generated by an active low signal (or falling edge).
# CONFIG_STMPE11_EDGE # CONFIG_STMPE811_EDGE
# Interrupt is generated on an edge (vs. on the active level) # Interrupt is generated on an edge (vs. on the active level)
# CONFIG_STMPE11_NPOLLWAITERS # CONFIG_STMPE811_NPOLLWAITERS
# Maximum number of threads that can be waiting on poll() (ignored if # Maximum number of threads that can be waiting on poll() (ignored if
# CONFIG_DISABLE_POLL is set). # CONFIG_DISABLE_POLL is set).
# CONFIG_STMPE11_TSC_DISABLE # CONFIG_STMPE811_TSC_DISABLE
# Disable driver touchscreen functionality. # Disable driver touchscreen functionality.
# CONFIG_STMPE11_ADC_DISABLE # CONFIG_STMPE811_ADC_DISABLE
# Disable driver ADC functionality. # Disable driver ADC functionality.
# CONFIG_STMPE11_GPIO_DISABLE # CONFIG_STMPE811_GPIO_DISABLE
# Disable driver GPIO functionality. # Disable driver GPIO functionality.
# CONFIG_STMPE11_GPIOINT_DISABLE # CONFIG_STMPE811_GPIOINT_DISABLE
# Disable driver GPIO interrupt functionality (ignored if GPIO functionality is # Disable driver GPIO interrupt functionality (ignored if GPIO functionality is
# disabled). # disabled).
# CONFIG_STMPE11_SWAPXY # CONFIG_STMPE811_SWAPXY
# Reverse the meaning of X and Y to handle different LCD orientations. # Reverse the meaning of X and Y to handle different LCD orientations.
# For the STM3240G-EVAL, X and Y should be swapped in PORTRAIT modes # For the STM3240G-EVAL, X and Y should be swapped in PORTRAIT modes
# CONFIG_STMPE11_TEMP_DISABLE # CONFIG_STMPE811_TEMP_DISABLE
# Disable driver temperature sensor functionality. # Disable driver temperature sensor functionality.
# CONFIG_STMPE11_REGDBUG # CONFIG_STMPE811_REGDBUG
# Enabled very low register-level debug output. Requires CONFIG_DEBUG. # Enabled very low register-level debug output. Requires CONFIG_DEBUG.
# CONFIG_STMPE11_THRESHX and CONFIG_STMPE11_THRESHY # CONFIG_STMPE811_THRESHX and CONFIG_STMPE811_THRESHY
# STMPE11 touchscreen data comes in a a very high rate. New touch positions # STMPE811 touchscreen data comes in a a very high rate. New touch positions
# will only be reported when the X or Y data changes by these thresholds. # will only be reported when the X or Y data changes by these thresholds.
# This trades reduces data rate for some loss in dragging accuracy. The # This trades reduces data rate for some loss in dragging accuracy. The
# STMPE11 is configure for 12-bit values so the raw ranges are 0-4095. So # STMPE811 is configure for 12-bit values so the raw ranges are 0-4095. So
# for example, if your display is 320x240, then THRESHX=13 and THRESHY=17 # for example, if your display is 320x240, then THRESHX=13 and THRESHY=17
# would correspond to one pixel. Default: 12 # would correspond to one pixel. Default: 12
# #
CONFIG_INPUT_STMPE11=y CONFIG_INPUT_STMPE811=y
CONFIG_STMPE11_SPI=n CONFIG_STMPE811_SPI=n
CONFIG_STMPE11_I2C=y CONFIG_STMPE811_I2C=y
CONFIG_STMPE11_MULTIPLE=y CONFIG_STMPE811_MULTIPLE=y
CONFIG_STMPE11_ACTIVELOW=y CONFIG_STMPE811_ACTIVELOW=y
CONFIG_STMPE11_EDGE=y CONFIG_STMPE811_EDGE=y
#CONFIG_STMPE11_NPOLLWAITERS #CONFIG_STMPE811_NPOLLWAITERS
CONFIG_STMPE11_TSC_DISABLE=n CONFIG_STMPE811_TSC_DISABLE=n
CONFIG_STMPE11_ADC_DISABLE=y CONFIG_STMPE811_ADC_DISABLE=y
CONFIG_STMPE11_GPIO_DISABLE=y CONFIG_STMPE811_GPIO_DISABLE=y
CONFIG_STMPE11_GPIOINT_DISABLE=y CONFIG_STMPE811_GPIOINT_DISABLE=y
CONFIG_STMPE11_SWAPXY=n CONFIG_STMPE811_SWAPXY=n
CONFIG_STMPE11_TEMP_DISABLE=y CONFIG_STMPE811_TEMP_DISABLE=y
CONFIG_STMPE11_REGDEBUG=n CONFIG_STMPE811_REGDEBUG=n
CONFIG_STMPE11_THRESHX=39 CONFIG_STMPE811_THRESHX=39
CONFIG_STMPE11_THRESHY=51 CONFIG_STMPE811_THRESHY=51
# #
# USB Device Configuration # USB Device Configuration
configs/stm3240g-eval/src/Makefile
+2 -2
View File
@@ -88,8 +88,8 @@ ifeq ($(CONFIG_WATCHDOG),y)
CSRCS += up_watchdog.c CSRCS += up_watchdog.c
endif endif
ifeq ($(CONFIG_INPUT_STMPE11),y) ifeq ($(CONFIG_INPUT_STMPE811),y)
CSRCS += up_stmpe11.c CSRCS += up_stmpe811.c
endif endif
COBJS = $(CSRCS:.c=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT))
configs/stm3240g-eval/src/stm3240g-internal.h
+5 -5
View File
@@ -138,10 +138,10 @@
#define GPIO_OTGFS_PWRON (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTH|GPIO_PIN5) #define GPIO_OTGFS_PWRON (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTH|GPIO_PIN5)
#define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11) #define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11)
/* The STM3240G-EVAL has two STMPE11QTR I/O expanders on board both connected /* The STM3240G-EVAL has two STMPE811QTR I/O expanders on board both connected
* to the STM32 via I2C1. They share a common interrupt line: PI2. * to the STM32 via I2C1. They share a common interrupt line: PI2.
* *
* STMPE11 U24, I2C address 0x41 (7-bit) * STMPE811 U24, I2C address 0x41 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -154,7 +154,7 @@
* IN1 EXP_IO11 * IN1 EXP_IO11
* IN0 EXP_IO12 * IN0 EXP_IO12
* *
* STMPE11 U29, I2C address 0x44 (7-bit) * STMPE811 U29, I2C address 0x44 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -168,8 +168,8 @@
* IN0 EXP_IO8 * IN0 EXP_IO8
*/ */
#define STMPE11_ADDR1 0x41 #define STMPE811_ADDR1 0x41
#define STMPE11_ADDR2 0x44 #define STMPE811_ADDR2 0x44
#define GPIO_IO_EXPANDER (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTI|GPIO_PIN2) #define GPIO_IO_EXPANDER (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTI|GPIO_PIN2)
configs/stm3240g-eval/src/up_stmpe11.c → configs/stm3240g-eval/src/up_stmpe811.c
+60 -60
View File
@@ -47,7 +47,7 @@
#include <nuttx/i2c.h> #include <nuttx/i2c.h>
#include <nuttx/input/touchscreen.h> #include <nuttx/input/touchscreen.h>
#include <nuttx/input/stmpe11.h> #include <nuttx/input/stmpe811.h>
#include <arch/irq.h> #include <arch/irq.h>
@@ -59,44 +59,44 @@
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
#ifdef CONFIG_INPUT_STMPE11 #ifdef CONFIG_INPUT_STMPE811
#ifndef CONFIG_INPUT #ifndef CONFIG_INPUT
# error "STMPE11 support requires CONFIG_INPUT" # error "STMPE811 support requires CONFIG_INPUT"
#endif #endif
#ifndef CONFIG_STM32_I2C1 #ifndef CONFIG_STM32_I2C1
# error "STMPE11 support requires CONFIG_STM32_I2C1" # error "STMPE811 support requires CONFIG_STM32_I2C1"
#endif #endif
#ifndef CONFIG_STMPE11_I2C #ifndef CONFIG_STMPE811_I2C
# error "Only the STMPE11 I2C interface is supported" # error "Only the STMPE811 I2C interface is supported"
#endif #endif
#ifdef CONFIG_STMPE11_SPI #ifdef CONFIG_STMPE811_SPI
# error "Only the STMPE11 SPI interface is supported" # error "Only the STMPE811 SPI interface is supported"
#endif #endif
#ifndef CONFIG_STMPE11_FREQUENCY #ifndef CONFIG_STMPE811_FREQUENCY
# define CONFIG_STMPE11_FREQUENCY 100000 # define CONFIG_STMPE811_FREQUENCY 100000
#endif #endif
#ifndef CONFIG_STMPE11_I2CDEV #ifndef CONFIG_STMPE811_I2CDEV
# define CONFIG_STMPE11_I2CDEV 1 # define CONFIG_STMPE811_I2CDEV 1
#endif #endif
#if CONFIG_STMPE11_I2CDEV != 1 #if CONFIG_STMPE811_I2CDEV != 1
# error "CONFIG_STMPE11_I2CDEV must be one" # error "CONFIG_STMPE811_I2CDEV must be one"
#endif #endif
#ifndef CONFIG_STMPE11_DEVMINOR #ifndef CONFIG_STMPE811_DEVMINOR
# define CONFIG_STMPE11_DEVMINOR 0 # define CONFIG_STMPE811_DEVMINOR 0
#endif #endif
/* Board definitions ********************************************************/ /* Board definitions ********************************************************/
/* The STM3240G-EVAL has two STMPE11QTR I/O expanders on board both connected /* The STM3240G-EVAL has two STMPE811QTR I/O expanders on board both connected
* to the STM32 via I2C1. They share a common interrupt line: PI2. * to the STM32 via I2C1. They share a common interrupt line: PI2.
* *
* STMPE11 U24, I2C address 0x41 (7-bit) * STMPE811 U24, I2C address 0x41 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -109,7 +109,7 @@
* IN1 EXP_IO11 * IN1 EXP_IO11
* IN0 EXP_IO12 * IN0 EXP_IO12
* *
* STMPE11 U29, I2C address 0x44 (7-bit) * STMPE811 U29, I2C address 0x44 (7-bit)
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
* STPE11 PIN BOARD SIGNAL BOARD CONNECTION * STPE11 PIN BOARD SIGNAL BOARD CONNECTION
* ------ ---- ---------------- -------------------------------------------- * ------ ---- ---------------- --------------------------------------------
@@ -127,16 +127,16 @@
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
struct stm32_stmpe11config_s struct stm32_stmpe811config_s
{ {
/* Configuration structure as seen by the STMPE11 driver */ /* Configuration structure as seen by the STMPE811 driver */
struct stmpe11_config_s config; struct stmpe811_config_s config;
/* Additional private definitions only known to this driver */ /* Additional private definitions only known to this driver */
STMPE11_HANDLE handle; /* The STMPE11 driver handle */ STMPE811_HANDLE handle; /* The STMPE811 driver handle */
xcpt_t handler; /* The STMPE11 interrupt handler */ xcpt_t handler; /* The STMPE811 interrupt handler */
}; };
/**************************************************************************** /****************************************************************************
@@ -144,25 +144,25 @@ struct stm32_stmpe11config_s
****************************************************************************/ ****************************************************************************/
/* IRQ/GPIO access callbacks. These operations all hidden behind callbacks /* IRQ/GPIO access callbacks. These operations all hidden behind callbacks
* to isolate the STMPE11 driver from differences in GPIO * to isolate the STMPE811 driver from differences in GPIO
* interrupt handling by varying boards and MCUs.* so that contact and loss-of-contact events can be detected. * interrupt handling by varying boards and MCUs.* so that contact and loss-of-contact events can be detected.
* *
* attach - Attach the STMPE11 interrupt handler to the GPIO interrupt * attach - Attach the STMPE811 interrupt handler to the GPIO interrupt
* enable - Enable or disable the GPIO interrupt * enable - Enable or disable the GPIO interrupt
* clear - Acknowledge/clear any pending GPIO interrupt * clear - Acknowledge/clear any pending GPIO interrupt
*/ */
static int stmpe11_attach(FAR struct stmpe11_config_s *state, xcpt_t isr); static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr);
static void stmpe11_enable(FAR struct stmpe11_config_s *state, bool enable); static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable);
static void stmpe11_clear(FAR struct stmpe11_config_s *state); static void stmpe811_clear(FAR struct stmpe811_config_s *state);
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
/* A reference to a structure of this type must be passed to the STMPE11 /* A reference to a structure of this type must be passed to the STMPE811
* driver. This structure provides information about the configuration * driver. This structure provides information about the configuration
* of the STMPE11 and provides some board-specific hooks. * of the STMPE811 and provides some board-specific hooks.
* *
* Memory for this structure is provided by the caller. It is not copied * Memory for this structure is provided by the caller. It is not copied
* by the driver and is presumed to persist while the driver is active. The * by the driver and is presumed to persist while the driver is active. The
@@ -170,25 +170,25 @@ static void stmpe11_clear(FAR struct stmpe11_config_s *state);
* may modify frequency or X plate resistance values. * may modify frequency or X plate resistance values.
*/ */
#ifndef CONFIG_STMPE11_TSC_DISABLE #ifndef CONFIG_STMPE811_TSC_DISABLE
static struct stm32_stmpe11config_s g_stmpe11config = static struct stm32_stmpe811config_s g_stmpe811config =
{ {
.config = .config =
{ {
#ifdef CONFIG_STMPE11_I2C #ifdef CONFIG_STMPE811_I2C
.address = STMPE11_ADDR1, .address = STMPE811_ADDR1,
#endif #endif
.frequency = CONFIG_STMPE11_FREQUENCY, .frequency = CONFIG_STMPE811_FREQUENCY,
#ifdef CONFIG_STMPE11_MULTIPLE #ifdef CONFIG_STMPE811_MULTIPLE
.irq = STM32_IRQ_EXTI2, .irq = STM32_IRQ_EXTI2,
#endif #endif
.ctrl1 = (ADC_CTRL1_SAMPLE_TIME_80 | ADC_CTRL1_MOD_12B), .ctrl1 = (ADC_CTRL1_SAMPLE_TIME_80 | ADC_CTRL1_MOD_12B),
.ctrl2 = ADC_CTRL2_ADC_FREQ_3p25, .ctrl2 = ADC_CTRL2_ADC_FREQ_3p25,
.attach = stmpe11_attach, .attach = stmpe811_attach,
.enable = stmpe11_enable, .enable = stmpe811_enable,
.clear = stmpe11_clear, .clear = stmpe811_clear,
}, },
.handler = NULL, .handler = NULL,
}; };
@@ -199,17 +199,17 @@ static struct stm32_stmpe11config_s g_stmpe11config =
****************************************************************************/ ****************************************************************************/
/* IRQ/GPIO access callbacks. These operations all hidden behind /* IRQ/GPIO access callbacks. These operations all hidden behind
* callbacks to isolate the STMPE11 driver from differences in GPIO * callbacks to isolate the STMPE811 driver from differences in GPIO
* interrupt handling by varying boards and MCUs. * interrupt handling by varying boards and MCUs.
* *
* attach - Attach the STMPE11 interrupt handler to the GPIO interrupt * attach - Attach the STMPE811 interrupt handler to the GPIO interrupt
* enable - Enable or disable the GPIO interrupt * enable - Enable or disable the GPIO interrupt
* clear - Acknowledge/clear any pending GPIO interrupt * clear - Acknowledge/clear any pending GPIO interrupt
*/ */
static int stmpe11_attach(FAR struct stmpe11_config_s *state, xcpt_t isr) static int stmpe811_attach(FAR struct stmpe811_config_s *state, xcpt_t isr)
{ {
FAR struct stm32_stmpe11config_s *priv = (FAR struct stm32_stmpe11config_s *)state; FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state;
ivdbg("Saving handler %p\n", isr); ivdbg("Saving handler %p\n", isr);
DEBUGASSERT(priv); DEBUGASSERT(priv);
@@ -220,9 +220,9 @@ static int stmpe11_attach(FAR struct stmpe11_config_s *state, xcpt_t isr)
return OK; return OK;
} }
static void stmpe11_enable(FAR struct stmpe11_config_s *state, bool enable) static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable)
{ {
FAR struct stm32_stmpe11config_s *priv = (FAR struct stm32_stmpe11config_s *)state; FAR struct stm32_stmpe811config_s *priv = (FAR struct stm32_stmpe811config_s *)state;
irqstate_t flags; irqstate_t flags;
/* Attach and enable, or detach and disable. Enabling and disabling GPIO /* Attach and enable, or detach and disable. Enabling and disabling GPIO
@@ -246,7 +246,7 @@ static void stmpe11_enable(FAR struct stmpe11_config_s *state, bool enable)
irqrestore(flags); irqrestore(flags);
} }
static void stmpe11_clear(FAR struct stmpe11_config_s *state) static void stmpe811_clear(FAR struct stmpe811_config_s *state)
{ {
/* Does nothing */ /* Does nothing */
} }
@@ -275,7 +275,7 @@ static void stmpe11_clear(FAR struct stmpe11_config_s *state)
int arch_tcinitialize(int minor) int arch_tcinitialize(int minor)
{ {
#ifndef CONFIG_STMPE11_TSC_DISABLE #ifndef CONFIG_STMPE811_TSC_DISABLE
FAR struct i2c_dev_s *dev; FAR struct i2c_dev_s *dev;
int ret; int ret;
@@ -284,36 +284,36 @@ int arch_tcinitialize(int minor)
/* Check if we are already initialized */ /* Check if we are already initialized */
if (!g_stmpe11config.handle) if (!g_stmpe811config.handle)
{ {
ivdbg("Initializing\n"); ivdbg("Initializing\n");
/* Configure the STMPE11 interrupt pin as an input */ /* Configure the STMPE811 interrupt pin as an input */
(void)stm32_configgpio(GPIO_IO_EXPANDER); (void)stm32_configgpio(GPIO_IO_EXPANDER);
/* Get an instance of the I2C interface */ /* Get an instance of the I2C interface */
dev = up_i2cinitialize(CONFIG_STMPE11_I2CDEV); dev = up_i2cinitialize(CONFIG_STMPE811_I2CDEV);
if (!dev) if (!dev)
{ {
idbg("Failed to initialize I2C bus %d\n", CONFIG_STMPE11_I2CDEV); idbg("Failed to initialize I2C bus %d\n", CONFIG_STMPE811_I2CDEV);
return -ENODEV; return -ENODEV;
} }
/* Instantiate the STMPE11 driver */ /* Instantiate the STMPE811 driver */
g_stmpe11config.handle = g_stmpe811config.handle =
stmpe11_instantiate(dev, (FAR struct stmpe11_config_s *)&g_stmpe11config); stmpe811_instantiate(dev, (FAR struct stmpe811_config_s *)&g_stmpe811config);
if (!g_stmpe11config.handle) if (!g_stmpe811config.handle)
{ {
idbg("Failed to instantiate the STMPE11 driver\n"); idbg("Failed to instantiate the STMPE811 driver\n");
return -ENODEV; return -ENODEV;
} }
/* Initialize and register the I2C touchscreen device */ /* Initialize and register the I2C touchscreen device */
ret = stmpe11_register(g_stmpe11config.handle, CONFIG_STMPE11_DEVMINOR); ret = stmpe811_register(g_stmpe811config.handle, CONFIG_STMPE811_DEVMINOR);
if (ret < 0) if (ret < 0)
{ {
idbg("Failed to register STMPE driver: %d\n", ret); idbg("Failed to register STMPE driver: %d\n", ret);
@@ -346,8 +346,8 @@ int arch_tcinitialize(int minor)
void arch_tcuninitialize(void) void arch_tcuninitialize(void)
{ {
/* No support for un-initializing the touchscreen STMPE11 device yet */ /* No support for un-initializing the touchscreen STMPE811 device yet */
} }
#endif /* CONFIG_INPUT_STMPE11 */ #endif /* CONFIG_INPUT_STMPE811 */