ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

STM32F2xx - Add support of ADC internal channels (temperature)

pull/2924/head
bcostm 2016-10-05 10:25:03 +02:00
parent 670b0984eb
commit ad431dc613
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
targets/TARGET_STM/TARGET_STM32F2/TARGET_NUCLEO_F207ZG/PeripheralPins.c
View File

@ -87,6 +87,7 @@ const PinMap PinMap_ADC[] = {
{PF_8, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6 {PF_8, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6
{PF_9, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7 {PF_9, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7
{PF_10, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 {PF_10, ADC_3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16
{NC, NC, 0} {NC, NC, 0}
}; };

11
targets/TARGET_STM/TARGET_STM32F2/TARGET_NUCLEO_F207ZG/PinNames.h
View File

@ -43,14 +43,14 @@ extern "C" {
#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((MODE & 0x0F) << 0) |\ #define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((MODE & 0x0F) << 0) |\
((PUPD & 0x07) << 4) |\ ((PUPD & 0x07) << 4) |\
((AFNUM & 0x0F) << 7) |\ ((AFNUM & 0x0F) << 7) |\
((CHANNEL & 0x0F) << 11) |\ ((CHANNEL & 0x1F) << 11) |\
((INVERTED & 0x01) << 15))) ((INVERTED & 0x01) << 16)))
#define STM_PIN_MODE(X) (((X) >> 0) & 0x0F) #define STM_PIN_MODE(X) (((X) >> 0) & 0x0F)
#define STM_PIN_PUPD(X) (((X) >> 4) & 0x07) #define STM_PIN_PUPD(X) (((X) >> 4) & 0x07)
#define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F) #define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F)
#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x0F) #define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x1F)
#define STM_PIN_INVERTED(X) (((X) >> 15) & 0x01) #define STM_PIN_INVERTED(X) (((X) >> 16) & 0x01)
#define STM_MODE_INPUT (0) #define STM_MODE_INPUT (0)
#define STM_MODE_OUTPUT_PP (1) #define STM_MODE_OUTPUT_PP (1)
@ -199,6 +199,9 @@ typedef enum {
PH_0 = 0x70, PH_0 = 0x70,
PH_1 = 0x71, PH_1 = 0x71,
// ADC internal channels
ADC_TEMP = 0xF0,
// Arduino connector namings // Arduino connector namings
A0 = PA_3, A0 = PA_3,
A1 = PC_0, A1 = PC_0,

7
targets/TARGET_STM/TARGET_STM32F2/analogin_api.c
View File

@ -58,8 +58,10 @@ void analogin_init(analogin_t *obj, PinName pin)
MBED_ASSERT(function != (uint32_t)NC); MBED_ASSERT(function != (uint32_t)NC);
obj->channel = STM_PIN_CHANNEL(function); obj->channel = STM_PIN_CHANNEL(function);
// Configure GPIO // Configure GPIO excepted for internal channels (Temperature)
if (obj->channel != 16) {
pinmap_pinout(pin, PinMap_ADC); pinmap_pinout(pin, PinMap_ADC);
}
// Save pin number for the read function // Save pin number for the read function
obj->pin = pin; obj->pin = pin;
@ -166,6 +168,9 @@ static inline uint16_t adc_read(analogin_t *obj)
case 15: case 15:
sConfig.Channel = ADC_CHANNEL_15; sConfig.Channel = ADC_CHANNEL_15;
break; break;
case 16:
sConfig.Channel = ADC_CHANNEL_16;
break;
default: default:
return 0; return 0;
} }