diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-15 11:25:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-15 11:25:08 -0600 |
| commit | 869392869bf4dec4a58549d50ace330163d7269a (patch) | |
| tree | 90c9b24c3875e225c85b71c906eaf517232ba28a | |
| parent | fec28f1dcc924bf21a3847eedb1cd3c28470577f (diff) | |
| download | nuttx-869392869bf4dec4a58549d50ace330163d7269a.tar.gz nuttx-869392869bf4dec4a58549d50ace330163d7269a.tar.bz2 nuttx-869392869bf4dec4a58549d50ace330163d7269a.zip | |
Fix some naming and comments associated with the Open1788 touchscreen
| -rw-r--r-- | nuttx/configs/open1788/README.txt | 9 | ||||
| -rw-r--r-- | nuttx/drivers/input/ads7843e.c | 13 | ||||
| -rw-r--r-- | nuttx/drivers/input/ads7843e.h | 2 |
3 files changed, 16 insertions, 8 deletions
diff --git a/nuttx/configs/open1788/README.txt b/nuttx/configs/open1788/README.txt index 35d7cace4..f2f20810f 100644 --- a/nuttx/configs/open1788/README.txt +++ b/nuttx/configs/open1788/README.txt @@ -179,7 +179,7 @@ Serial Console CONFIG_UART1_2STOP=0 In this configuration using UART1, it is necessary to disable LED support - on the board. That is because UART1 RXD is set for pin p0.16, but so it + on the board. That is because UART1 RXD is set for pin p0.16, but so is LED2. If you do not disable LED support then no incoming serial data will be recevied. @@ -187,11 +187,12 @@ Serial Console CONFIG_ARCH_LEDS=n : Disable LED support You should also remove the LED2 jumper so that the RXD input does not - attempt to drive LED2 as well (this this does not seem to interfere with + attempt to drive LED2 as well (However, this does not seem to interfere with data receipt). - NOTE: If you intend to use LEDs, then you might want to redesign some of - the LED logic in the src/ subdirectory so that it does not use LED2. + NOTE: If you intend to use LEDs with UART1, then you might want to + redesign some ofthe LED logic in the src/ subdirectory so that it does not + attempt to use LED2. Using OpenOCD with the Olimex ARM-USB-OCD ========================================= diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c index 9b93ec93e..620b8faee 100644 --- a/nuttx/drivers/input/ads7843e.c +++ b/nuttx/drivers/input/ads7843e.c @@ -632,7 +632,9 @@ static void ads7843e_worker(FAR void *arg) } else { - /* Handle pen down events. First, sample positional values. */ + /* Handle pen down events. First, sample positional values. NOTE: + * that these commands have the side-effect of disabling the PENIRQ. + */ #ifdef CONFIG_ADS7843E_SWAPXY x = ads7843e_sendcmd(priv, ADS7843_CMD_YPOSITION); @@ -703,7 +705,12 @@ static void ads7843e_worker(FAR void *arg) ignored: - (void)ads7843e_sendcmd(priv, ADS7843_CMD_ENABPINIRQ); + /* Re-enable the PENIRQ interrupt at the ADS7843E */ + + (void)ads7843e_sendcmd(priv, ADS7843_CMD_ENABPENIRQ); + + /* Re-enable the PENIRQ interrupt at the MCU's interrupt controller */ + config->enable(config, true); /* Release our lock on the state structure and unlock the SPI bus */ @@ -1228,7 +1235,7 @@ int ads7843e_register(FAR struct spi_dev_s *spi, /* Enable the PEN IRQ */ - ads7843e_sendcmd(priv, ADS7843_CMD_ENABPINIRQ); + ads7843e_sendcmd(priv, ADS7843_CMD_ENABPENIRQ); /* Unlock the bus */ diff --git a/nuttx/drivers/input/ads7843e.h b/nuttx/drivers/input/ads7843e.h index b681ff1c3..bb3db5630 100644 --- a/nuttx/drivers/input/ads7843e.h +++ b/nuttx/drivers/input/ads7843e.h @@ -87,7 +87,7 @@ ((1 << ADS7843E_CMD_CHAN_SHIFT)| ADS7843E_CMD_START | ADS7843E_CMD_PD0 | ADS7843E_CMD_PD1) #define ADS7843_CMD_XPOSITION \ ((5 << ADS7843E_CMD_CHAN_SHIFT)| ADS7843E_CMD_START | ADS7843E_CMD_PD0 | ADS7843E_CMD_PD1) -#define ADS7843_CMD_ENABPINIRQ \ +#define ADS7843_CMD_ENABPENIRQ \ ((1 << ADS7843E_CMD_CHAN_SHIFT)| ADS7843E_CMD_START) /* Driver support **************************************************************************/ |