Revision 217:d0ccc61c1fd4, committed 2014-05-27

Comitter:

mbed_official

Date:

Tue May 27 13:00:07 2014 +0100

Parent:

216:577900467c9e

Child:

218:44081b78fdc2

Commit message:

Synchronized with git revision bd83615ac55fe00f83e44dafc7ba017a3850f4e5

Full URL: https://github.com/mbedmicro/mbed/commit/bd83615ac55fe00f83e44dafc7ba017a3850f4e5/

[NRF51822] analog read - set channel

Changed in this revision

--- a/targets/cmsis/TARGET_STM/TARGET_NUCLEO_L053R8/stm32l0xx_hal_rcc.h	Tue May 27 10:00:08 2014 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_NUCLEO_L053R8/stm32l0xx_hal_rcc.h	Tue May 27 13:00:07 2014 +0100
@@ -1110,7 +1110,7 @@
   */
 
 /* Include RCC HAL Extension module */
-#include "stm32L0xx_hal_rcc_ex.h"
+#include "stm32l0xx_hal_rcc_ex.h"
 
 /* Exported functions --------------------------------------------------------*/
 /* Initialization and de-initialization methods  ******************************/

--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c	Tue May 27 10:00:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/analogin_api.c	Tue May 27 13:00:07 2014 +0100
@@ -48,6 +48,7 @@
         }
         map++;
     }
+    obj->adc_pin = (uint8_t)analogInputPin;
     
     NRF_ADC->ENABLE = ADC_ENABLE_ENABLE_Enabled; 
     NRF_ADC->CONFIG = (ADC_CONFIG_RES_10bit << ADC_CONFIG_RES_Pos) |
@@ -58,6 +59,8 @@
 }
 
 uint16_t analogin_read_u16(analogin_t *obj) {
+    NRF_ADC->CONFIG &= ~ADC_CONFIG_PSEL_Msk;
+    NRF_ADC->CONFIG |= obj->adc_pin << ADC_CONFIG_PSEL_Pos;
     NRF_ADC->TASKS_START = 1;
     while ( ( (NRF_ADC->BUSY & ADC_BUSY_BUSY_Msk) >> ADC_BUSY_BUSY_Pos) == ADC_BUSY_BUSY_Busy)
     {

--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/objects.h	Tue May 27 10:00:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/objects.h	Tue May 27 13:00:07 2014 +0100
@@ -57,6 +57,7 @@
 
 struct analogin_s {
     ADCName adc;
+    uint8_t adc_pin;
 };
 
 struct gpio_irq_s {

--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c	Tue May 27 10:00:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/analogin_api.c	Tue May 27 13:00:07 2014 +0100
@@ -95,7 +95,7 @@
 }
 
 static inline uint32_t adc_read(analogin_t *obj) {
-    volatile uint32_t channels;
+    uint32_t channels;
 
     __IO LPC_ADC0_Type *adc_reg = (obj->adc < ADC1_0) ? (__IO LPC_ADC0_Type*)(LPC_ADC0) : (__IO LPC_ADC0_Type*)(LPC_ADC1);
 

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c	Tue May 27 10:00:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/analogout_api.c	Tue May 27 13:00:07 2014 +0100
@@ -58,7 +58,7 @@
     pinmap_pinout(pin, PinMap_DAC);
 
     // Save the channel for future use
-    obj->channel = pin;
+    obj->pin = pin;
 
     // Enable DAC clock
     __DAC_CLK_ENABLE();
@@ -67,9 +67,7 @@
     sConfig.DAC_Trigger      = DAC_TRIGGER_NONE;
     sConfig.DAC_OutputBuffer = DAC_OUTPUTBUFFER_DISABLE;
 
-    //if (pin == PA_4) {
     HAL_DAC_ConfigChannel(&DacHandle, &sConfig, DAC_CHANNEL_1);
-    //}
 
     analogout_write_u16(obj, 0);
 }
@@ -81,20 +79,16 @@
     __DAC_CLK_DISABLE();
 
     // Configure GPIO
-    pin_function(obj->channel, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
 }
 
 static inline void dac_write(dac_t *obj, uint16_t value) {
-    //if (obj->channel == PA_4) {
     HAL_DAC_SetValue(&DacHandle, DAC_CHANNEL_1, DAC_ALIGN_12B_R, value);
     HAL_DAC_Start(&DacHandle, DAC_CHANNEL_1);
-    //}
 }
 
 static inline int dac_read(dac_t *obj) {
-    //if (obj->channel == PA_4) {
     return (int)HAL_DAC_GetValue(&DacHandle, DAC_CHANNEL_1);
-    //}
 }
 
 void analogout_write(dac_t *obj, float value) {

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/objects.h	Tue May 27 10:00:08 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_L053R8/objects.h	Tue May 27 13:00:07 2014 +0100
@@ -61,7 +61,7 @@
 
 struct dac_s {
     DACName dac;
-    PinName channel;
+    PinName pin;
 };
 
 struct serial_s {