diff options
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/Documentation/.gitignore | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_adc.c | 14 |
3 files changed, 11 insertions, 8 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 6b71d23b6..a4722d2e1 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -4589,3 +4589,6 @@ * Documentation: The NuttX documentation now expects to find an auto-generated version of the configuration variable documentation at Documentation/NuttXConfigVariables.html (2014-4-22). + * arch/arm/src/lpc17xx/lpc17_adc.c: Only one ADC pin was configured. + Need to configure all that are in the ADC0 set. From MKannan + (2014-4-23). diff --git a/nuttx/Documentation/.gitignore b/nuttx/Documentation/.gitignore index b74e41a61..86d4e4ab8 100644 --- a/nuttx/Documentation/.gitignore +++ b/nuttx/Documentation/.gitignore @@ -1,3 +1,3 @@ TODO.txt ChangeLog.txt -NuttXConfigVariables.html +NuttXConfigVariables.* diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_adc.c b/nuttx/arch/arm/src/lpc17xx/lpc17_adc.c index ddf5b362f..8dbee61fd 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_adc.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_adc.c @@ -174,31 +174,31 @@ static void adc_reset(FAR struct adc_dev_s *dev) { lpc17_configgpio(GPIO_AD0p0); } - else if ((priv->mask & 0x02) != 0) + if ((priv->mask & 0x02) != 0) { lpc17_configgpio(GPIO_AD0p1); } - else if ((priv->mask & 0x04) != 0) + if ((priv->mask & 0x04) != 0) { lpc17_configgpio(GPIO_AD0p2); } - else if ((priv->mask & 0x08) != 0) + if ((priv->mask & 0x08) != 0) { lpc17_configgpio(GPIO_AD0p3); } - else if ((priv->mask & 0x10) != 0) + if ((priv->mask & 0x10) != 0) { lpc17_configgpio(GPIO_AD0p4); } - else if ((priv->mask & 0x20) != 0) + if ((priv->mask & 0x20) != 0) { lpc17_configgpio(GPIO_AD0p5); } - else if ((priv->mask & 0x40) != 0) + if ((priv->mask & 0x40) != 0) { lpc17_configgpio(GPIO_AD0p6); } - else if ((priv->mask & 0x80) != 0) + if ((priv->mask & 0x80) != 0) { lpc17_configgpio(GPIO_AD0p7); } |