From 8227c91f54d42e36529c6dde91be382030ac6ef8 Mon Sep 17 00:00:00 2001 From: akhilpanayam Date: Mon, 3 Aug 2015 14:58:55 +0530 Subject: [PATCH] * added pins for ADC as per pio_samr21g18a.h --- .../TARGET_SAM0/TARGET_SAMR21G18A/PeripheralNames.h | 7 ++++++- .../TARGET_SAM0/TARGET_SAMR21G18A/PeripheralPins.c | 5 +++++ .../targets/hal/TARGET_Atmel/TARGET_SAM0/analogin_api.c | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralNames.h index 22737a43c3..b549d22d70 100644 --- a/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralNames.h +++ b/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralNames.h @@ -45,14 +45,19 @@ typedef enum { } UARTName; typedef enum { // for each input control mux 4,5,6,7,16,17,10,11 used in R21 + ADC_2 = 0x2ul, + ADC_3 = 0x3ul, ADC_4 = 0x4ul, ADC_5 = 0x5ul, ADC_6 = 0x6ul, ADC_7 = 0x7ul, + ADC_8 = 0x8ul, ADC_10 = 0xAul, ADC_11 = 0xBul, ADC_16 = 0x10ul, - ADC_17 = 0x11ul + ADC_17 = 0x11ul, + ADC_18 = 0x12ul, + ADC_19 = 0x13ul } ADCName; typedef enum { // for each channel diff --git a/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralPins.c b/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralPins.c index 2623e6a78d..3b6aaac14c 100644 --- a/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralPins.c +++ b/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/TARGET_SAMR21G18A/PeripheralPins.c @@ -18,14 +18,19 @@ /************ADC***************/ const PinMap PinMap_ADC[] = { + {PB08, ADC_2, 1}, + {PB09, ADC_3, 1}, {PA04, ADC_4, 1}, {PA05, ADC_5, 1}, {PA06, ADC_6, 1}, {PA07, ADC_7, 1}, + {PB00, ADC_8, 1}, {PB02, ADC_10, 1}, {PB03, ADC_11, 1}, {PA08, ADC_16, 1}, {PA09, ADC_17, 1}, + {PA10, ADC_18, 1}, + {PA11, ADC_19, 1}, /* Not connected */ {NC , NC , NC} diff --git a/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/analogin_api.c index be1ccdabe2..8076d8d846 100644 --- a/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/analogin_api.c +++ b/libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM0/analogin_api.c @@ -76,15 +76,15 @@ void adc_configure_ain_pin(uint32_t pin) PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, #elif SAMR21G PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, - PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, + PIN_PB08B_ADC_AIN2, PIN_PB09B_ADC_AIN3, PIN_PA04B_ADC_AIN4, PIN_PA05B_ADC_AIN5, PIN_PA06B_ADC_AIN6, PIN_PA07B_ADC_AIN7, - PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, + PIN_PB00B_ADC_AIN8, PIN_INVALID_ADC_AIN, PIN_PB02B_ADC_AIN10, PIN_PB03B_ADC_AIN11, PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, PIN_PA08B_ADC_AIN16, PIN_PA09B_ADC_AIN17, - PIN_INVALID_ADC_AIN, PIN_INVALID_ADC_AIN, + PIN_PA10B_ADC_AIN18, PIN_PA11B_ADC_AIN19, #elif (SAMD10C | SAMD11C) PIN_PA02B_ADC_AIN0, PIN_INVALID_ADC_AIN, PIN_PA04B_ADC_AIN2, PIN_PA05B_ADC_AIN3,