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

Merge pull request #2947 from bcostm/adcintch_L4 

STM32L4xx - Add support of ADC internal channels
pull/2974/merge
Sam Grove 2016-10-10 10:35:18 -05:00 committed by GitHub
parent 4297042096 569f64a966
commit 8d6e358387
7 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/PeripheralPins.c
View File

@ -1,6 +1,6 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
******************************************************************************* *******************************************************************************
* Copyright (c) 2015, STMicroelectronics * Copyright (c) 2016, STMicroelectronics
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -55,6 +55,9 @@ const PinMap PinMap_ADC[] = {
{PC_3, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 4, 0)}, // IN4 {PC_3, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 4, 0)}, // IN4
{PC_4, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 13, 0)}, // IN13 {PC_4, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 13, 0)}, // IN13
{PC_5, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 14, 0)}, // IN14 {PC_5, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 14, 0)}, // IN14
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)},
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)},
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)},
{NC, NC, 0} {NC, NC, 0}
}; };

15
targets/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/PinNames.h
View File

@ -1,6 +1,6 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
******************************************************************************* *******************************************************************************
* Copyright (c) 2015, STMicroelectronics * Copyright (c) 2016, STMicroelectronics
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -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)
@ -166,6 +166,11 @@ typedef enum {
PH_0 = 0x70, // On P1/P2 connectors PH_0 = 0x70, // On P1/P2 connectors
PH_1 = 0x71, // On P1/P2 connectors PH_1 = 0x71, // On P1/P2 connectors
// ADC internal channels
ADC_TEMP = 0xF0,
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
// Generic signals namings // Generic signals namings
LED1 = PE_8, // LD5 Green LED1 = PE_8, // LD5 Green
LED2 = PB_2, // LD4 Red LED2 = PB_2, // LD4 Red

5
targets/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L432KC/PeripheralPins.c
View File

@ -1,5 +1,5 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
'******************************************************************************* *******************************************************************************
* Copyright (c) 2016, STMicroelectronics * Copyright (c) 2016, STMicroelectronics
* All rights reserved. * All rights reserved.
* *
@ -49,6 +49,9 @@ const PinMap PinMap_ADC[] = {
{PA_7, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12 {PA_7, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
{PB_0, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15 {PB_0, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
// {PB_1, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16 - does not support channel >= 16 // {PB_1, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 16, 0)}, // ADC1_IN16 - does not support channel >= 16
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)},
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)},
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)},
{NC, NC, 0} {NC, NC, 0}
}; };

15
targets/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L432KC/PinNames.h
View File

@ -1,6 +1,6 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
******************************************************************************* *******************************************************************************
* Copyright (c) 2015, STMicroelectronics * Copyright (c) 2016, STMicroelectronics
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -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)
@ -107,6 +107,11 @@ typedef enum {
PC_14 = 0x2E, PC_14 = 0x2E,
PC_15 = 0x2F, PC_15 = 0x2F,
// ADC internal channels
ADC_TEMP = 0xF0,
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
// Arduino connector namings // Arduino connector namings
A0 = PA_0, A0 = PA_0,
A1 = PA_1, A1 = PA_1,

5
targets/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/PeripheralPins.c
View File

@ -1,6 +1,6 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
******************************************************************************* *******************************************************************************
* Copyright (c) 2015, STMicroelectronics * Copyright (c) 2016, STMicroelectronics
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -55,6 +55,9 @@ const PinMap PinMap_ADC[] = {
{PC_3, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 4, 0)}, // IN4 {PC_3, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 4, 0)}, // IN4
{PC_4, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 13, 0)}, // IN13 {PC_4, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 13, 0)}, // IN13
{PC_5, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 14, 0)}, // IN14 {PC_5, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG_ADC_CONTROL, GPIO_NOPULL, 0, 14, 0)}, // IN14
{ADC_TEMP, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 17, 0)},
{ADC_VREF, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)},
{ADC_VBAT, ADC_1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 18, 0)},
{NC, NC, 0} {NC, NC, 0}
}; };

15
targets/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/PinNames.h
View File

@ -1,6 +1,6 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
******************************************************************************* *******************************************************************************
* Copyright (c) 2015, STMicroelectronics * Copyright (c) 2016, STMicroelectronics
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -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)
@ -134,6 +134,11 @@ typedef enum {
PH_0 = 0x70, PH_0 = 0x70,
PH_1 = 0x71, PH_1 = 0x71,
// ADC internal channels
ADC_TEMP = 0xF0,
ADC_VREF = 0xF1,
ADC_VBAT = 0xF2,
// Arduino connector namings // Arduino connector namings
A0 = PA_0, A0 = PA_0,
A1 = PA_1, A1 = PA_1,

12
targets/TARGET_STM/TARGET_STM32L4/analogin_api.c
View File

@ -1,5 +1,5 @@
/* mbed Microcontroller Library /* mbed Microcontroller Library
* Copyright (c) 2015, STMicroelectronics * Copyright (c) 2016, STMicroelectronics
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -51,8 +51,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, Vref, Vbat)
if ((obj->channel != 0) && (obj->channel != 17) && (obj->channel != 18)) {
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;
@ -99,7 +101,7 @@ static inline uint16_t adc_read(analogin_t *obj)
// Configure ADC channel // Configure ADC channel
switch (obj->channel) { switch (obj->channel) {
case 0: case 0:
sConfig.Channel = ADC_CHANNEL_0; sConfig.Channel = ADC_CHANNEL_VREFINT;
break; break;
case 1: case 1:
sConfig.Channel = ADC_CHANNEL_1; sConfig.Channel = ADC_CHANNEL_1;
@ -150,10 +152,10 @@ static inline uint16_t adc_read(analogin_t *obj)
sConfig.Channel = ADC_CHANNEL_16; sConfig.Channel = ADC_CHANNEL_16;
break; break;
case 17: case 17:
sConfig.Channel = ADC_CHANNEL_17; sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
break; break;
case 18: case 18:
sConfig.Channel = ADC_CHANNEL_18; sConfig.Channel = ADC_CHANNEL_VBAT;
break; break;
default: default:
return 0; return 0;