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

STM32: analogin: adc struct member not needed anymore 

The adc in analogin_t has the same value as the Instance member of
ADC_HandleTypeDef. So we can only rely on the later one.
pull/4889/head
Laurent MEUNIER 2017-06-19 13:03:07 +02:00 committed by adbridge
parent d79014f35a
commit fc6cbe9909
17 changed files with 50 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,8 +40,8 @@ int adc_inited = 0;
void analogin_init(analogin_t *obj, PinName pin) { void analogin_init(analogin_t *obj, PinName pin) {
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
// Get the functions (adc channel) from the pin and assign it to the object // Get the functions (adc channel) from the pin and assign it to the object
uint32_t function = pinmap_function(pin, PinMap_ADC); uint32_t function = pinmap_function(pin, PinMap_ADC);
@ -65,7 +65,6 @@ void analogin_init(analogin_t *obj, PinName pin) {
__ADC1_CLK_ENABLE(); __ADC1_CLK_ENABLE();
// Configure ADC // Configure ADC
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4; obj->handle.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
obj->handle.Init.Resolution = ADC_RESOLUTION12b; obj->handle.Init.Resolution = ADC_RESOLUTION12b;
@ -93,8 +92,6 @@ void analogin_init(analogin_t *obj, PinName pin) {
static inline uint16_t adc_read(analogin_t *obj) { static inline uint16_t adc_read(analogin_t *obj) {
ADC_ChannelConfTypeDef sConfig; ADC_ChannelConfTypeDef sConfig;
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
sConfig.Rank = ADC_RANK_CHANNEL_NUMBER; sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
#if defined (TARGET_STM32F091RC) #if defined (TARGET_STM32F091RC)

1
targets/TARGET_STM/TARGET_STM32F0/common_objects.h
View File

@ -112,7 +112,6 @@ struct i2c_s {
}; };
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;

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

@ -42,8 +42,8 @@ void analogin_init(analogin_t *obj, PinName pin)
RCC_PeriphCLKInitTypeDef PeriphClkInit; RCC_PeriphCLKInitTypeDef PeriphClkInit;
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
// Get the functions (adc channel) from the pin and assign it to the object // Get the functions (adc channel) from the pin and assign it to the object
uint32_t function = pinmap_function(pin, PinMap_ADC); uint32_t function = pinmap_function(pin, PinMap_ADC);
@ -77,7 +77,6 @@ void analogin_init(analogin_t *obj, PinName pin)
HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit); HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
// Configure ADC // Configure ADC
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.DataAlign = ADC_DATAALIGN_RIGHT; obj->handle.Init.DataAlign = ADC_DATAALIGN_RIGHT;
obj->handle.Init.ScanConvMode = DISABLE; obj->handle.Init.ScanConvMode = DISABLE;
@ -94,8 +93,6 @@ static inline uint16_t adc_read(analogin_t *obj)
{ {
ADC_ChannelConfTypeDef sConfig; ADC_ChannelConfTypeDef sConfig;
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
sConfig.Rank = 1; sConfig.Rank = 1;
sConfig.SamplingTime = ADC_SAMPLETIME_7CYCLES_5; sConfig.SamplingTime = ADC_SAMPLETIME_7CYCLES_5;

1
targets/TARGET_STM/TARGET_STM32F1/common_objects.h
View File

@ -111,7 +111,6 @@ struct i2c_s {
}; };
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;

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

@ -39,7 +39,6 @@
void analogin_init(analogin_t *obj, PinName pin) void analogin_init(analogin_t *obj, PinName pin)
{ {
uint32_t function = (uint32_t)NC; uint32_t function = (uint32_t)NC;
obj->adc = (ADCName)NC;
#if defined(ADC1) #if defined(ADC1)
static int adc1_inited = 0; static int adc1_inited = 0;
@ -56,18 +55,18 @@ void analogin_init(analogin_t *obj, PinName pin)
if ((pin < 0xF0) || (pin >= 0x100)) { if ((pin < 0xF0) || (pin >= 0x100)) {
// Normal channels // Normal channels
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
// Get the functions (adc channel) from the pin and assign it to the object // Get the functions (adc channel) from the pin and assign it to the object
function = pinmap_function(pin, PinMap_ADC); function = pinmap_function(pin, PinMap_ADC);
// Configure GPIO // Configure GPIO
pinmap_pinout(pin, PinMap_ADC); pinmap_pinout(pin, PinMap_ADC);
} else { } else {
// Internal channels // Internal channels
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC_Internal); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
function = pinmap_function(pin, PinMap_ADC_Internal); function = pinmap_function(pin, PinMap_ADC_Internal);
// No GPIO configuration for internal channels // No GPIO configuration for internal channels
} }
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
MBED_ASSERT(function != (uint32_t)NC); MBED_ASSERT(function != (uint32_t)NC);
obj->channel = STM_PIN_CHANNEL(function); obj->channel = STM_PIN_CHANNEL(function);
@ -78,28 +77,27 @@ void analogin_init(analogin_t *obj, PinName pin)
// Check if ADC is already initialized // Check if ADC is already initialized
// Enable ADC clock // Enable ADC clock
#if defined(ADC1) #if defined(ADC1)
if ((obj->adc == ADC_1) && adc1_inited) return; if (((ADCName)obj->handle.Instance == ADC_1) && adc1_inited) return;
if (obj->adc == ADC_1) { if ((ADCName)obj->handle.Instance == ADC_1) {
__ADC1_CLK_ENABLE(); __ADC1_CLK_ENABLE();
adc1_inited = 1; adc1_inited = 1;
} }
#endif #endif
#if defined(ADC2) #if defined(ADC2)
if ((obj->adc == ADC_2) && adc2_inited) return; if (((ADCName)obj->handle.Instance == ADC_2) && adc2_inited) return;
if (obj->adc == ADC_2) { if ((ADCName)obj->handle.Instance == ADC_2) {
__ADC2_CLK_ENABLE(); __ADC2_CLK_ENABLE();
adc2_inited = 1; adc2_inited = 1;
} }
#endif #endif
#if defined(ADC3) #if defined(ADC3)
if ((obj->adc == ADC_3) && adc3_inited) return; if (((ADCName)obj->handle.Instance == ADC_3) && adc3_inited) return;
if (obj->adc == ADC_3) { if ((ADCName)obj->handle.Instance == ADC_3) {
__ADC3_CLK_ENABLE(); __ADC3_CLK_ENABLE();
adc3_inited = 1; adc3_inited = 1;
} }
#endif #endif
// Configure ADC // Configure ADC
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2; obj->handle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2;
obj->handle.Init.Resolution = ADC_RESOLUTION12b; obj->handle.Init.Resolution = ADC_RESOLUTION12b;

23
targets/TARGET_STM/TARGET_STM32F3/analogin_api.c
View File

@ -53,8 +53,8 @@ void analogin_init(analogin_t *obj, PinName pin)
#endif #endif
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
// Get the pin function and assign the used channel to the object // Get the pin function and assign the used channel to the object
uint32_t function = pinmap_function(pin, PinMap_ADC); uint32_t function = pinmap_function(pin, PinMap_ADC);
@ -73,36 +73,35 @@ void analogin_init(analogin_t *obj, PinName pin)
// Check if ADC is already initialized // Check if ADC is already initialized
// Enable ADC clock // Enable ADC clock
#if defined(ADC1) #if defined(ADC1)
if ((obj->adc == ADC_1) && adc1_inited) return; if (((ADCName)obj->handle.Instance == ADC_1) && adc1_inited) return;
if (obj->adc == ADC_1) { if ((ADCName)obj->handle.Instance == ADC_1) {
__ADC1_CLK_ENABLE(); __ADC1_CLK_ENABLE();
adc1_inited = 1; adc1_inited = 1;
} }
#endif #endif
#if defined(ADC2) #if defined(ADC2)
if ((obj->adc == ADC_2) && adc2_inited) return; if (((ADCName)obj->handle.Instance == ADC_2) && adc2_inited) return;
if (obj->adc == ADC_2) { if ((ADCName)obj->handle.Instance == ADC_2) {
__ADC2_CLK_ENABLE(); __ADC2_CLK_ENABLE();
adc2_inited = 1; adc2_inited = 1;
} }
#endif #endif
#if defined(ADC3) #if defined(ADC3)
if ((obj->adc == ADC_3) && adc3_inited) return; if (((ADCName)obj->handle.Instance == ADC_3) && adc3_inited) return;
if (obj->adc == ADC_3) { if ((ADCName)obj->handle.Instance == ADC_3) {
__ADC34_CLK_ENABLE(); __ADC34_CLK_ENABLE();
adc3_inited = 1; adc3_inited = 1;
} }
#endif #endif
#if defined(ADC4) #if defined(ADC4)
if ((obj->adc == ADC_4) && adc4_inited) return; if (((ADCName)obj->handle.Instance == ADC_4) && adc4_inited) return;
if (obj->adc == ADC_4) { if ((ADCName)obj->handle.Instance == ADC_4) {
__ADC34_CLK_ENABLE(); __ADC34_CLK_ENABLE();
adc4_inited = 1; adc4_inited = 1;
} }
#endif #endif
// Configure ADC // Configure ADC
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2; obj->handle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV2;
obj->handle.Init.Resolution = ADC_RESOLUTION12b; obj->handle.Init.Resolution = ADC_RESOLUTION12b;
@ -128,8 +127,6 @@ static inline uint16_t adc_read(analogin_t *obj)
{ {
ADC_ChannelConfTypeDef sConfig = {0}; ADC_ChannelConfTypeDef sConfig = {0};
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
sConfig.Rank = ADC_REGULAR_RANK_1; sConfig.Rank = ADC_REGULAR_RANK_1;
sConfig.SamplingTime = ADC_SAMPLETIME_19CYCLES_5; sConfig.SamplingTime = ADC_SAMPLETIME_19CYCLES_5;

1
targets/TARGET_STM/TARGET_STM32F3/common_objects.h
View File

@ -119,7 +119,6 @@ struct dac_s {
}; };
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;

22
targets/TARGET_STM/TARGET_STM32F4/analogin_api.c
View File

@ -39,7 +39,6 @@
void analogin_init(analogin_t *obj, PinName pin) void analogin_init(analogin_t *obj, PinName pin)
{ {
uint32_t function = (uint32_t)NC; uint32_t function = (uint32_t)NC;
obj->adc = (ADCName)NC;
#if defined(ADC1) #if defined(ADC1)
static int adc1_inited = 0; static int adc1_inited = 0;
@ -56,18 +55,18 @@ void analogin_init(analogin_t *obj, PinName pin)
if (pin < 0xF0) { if (pin < 0xF0) {
// Normal channels // Normal channels
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
// Get the functions (adc channel) from the pin and assign it to the object // Get the functions (adc channel) from the pin and assign it to the object
function = pinmap_function(pin, PinMap_ADC); function = pinmap_function(pin, PinMap_ADC);
// Configure GPIO // Configure GPIO
pinmap_pinout(pin, PinMap_ADC); pinmap_pinout(pin, PinMap_ADC);
} else { } else {
// Internal channels // Internal channels
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC_Internal); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
function = pinmap_function(pin, PinMap_ADC_Internal); function = pinmap_function(pin, PinMap_ADC_Internal);
// No GPIO configuration for internal channels // No GPIO configuration for internal channels
} }
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
MBED_ASSERT(function != (uint32_t)NC); MBED_ASSERT(function != (uint32_t)NC);
obj->channel = STM_PIN_CHANNEL(function); obj->channel = STM_PIN_CHANNEL(function);
@ -78,28 +77,27 @@ void analogin_init(analogin_t *obj, PinName pin)
// Check if ADC is already initialized // Check if ADC is already initialized
// Enable ADC clock // Enable ADC clock
#if defined(ADC1) #if defined(ADC1)
if ((obj->adc == ADC_1) && adc1_inited) return; if (((ADCName)obj->handle.Instance == ADC_1) && adc1_inited) return;
if (obj->adc == ADC_1) { if ((ADCName)obj->handle.Instance == ADC_1) {
__HAL_RCC_ADC1_CLK_ENABLE(); __HAL_RCC_ADC1_CLK_ENABLE();
adc1_inited = 1; adc1_inited = 1;
} }
#endif #endif
#if defined(ADC2) #if defined(ADC2)
if ((obj->adc == ADC_2) && adc2_inited) return; if (((ADCName)obj->handle.Instance == ADC_2) && adc2_inited) return;
if (obj->adc == ADC_2) { if ((ADCName)obj->handle.Instance == ADC_2) {
__HAL_RCC_ADC2_CLK_ENABLE(); __HAL_RCC_ADC2_CLK_ENABLE();
adc2_inited = 1; adc2_inited = 1;
} }
#endif #endif
#if defined(ADC3) #if defined(ADC3)
if ((obj->adc == ADC_3) && adc3_inited) return; if (((ADCName)obj->handle.Instance == ADC_3) && adc3_inited) return;
if (obj->adc == ADC_3) { if ((ADCName)obj->handle.Instance == ADC_3) {
__HAL_RCC_ADC3_CLK_ENABLE(); __HAL_RCC_ADC3_CLK_ENABLE();
adc3_inited = 1; adc3_inited = 1;
} }
#endif #endif
// Configure ADC // Configure ADC
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2; obj->handle.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2;
obj->handle.Init.Resolution = ADC_RESOLUTION_12B; obj->handle.Init.Resolution = ADC_RESOLUTION_12B;
@ -123,8 +121,6 @@ static inline uint16_t adc_read(analogin_t *obj)
{ {
ADC_ChannelConfTypeDef sConfig = {0}; ADC_ChannelConfTypeDef sConfig = {0};
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
sConfig.Rank = 1; sConfig.Rank = 1;
sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES; sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;

1
targets/TARGET_STM/TARGET_STM32F4/common_objects.h
View File

@ -117,7 +117,6 @@ struct flash_s {
#endif #endif
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;

23
targets/TARGET_STM/TARGET_STM32F7/analogin_api.c
View File

@ -39,7 +39,6 @@
void analogin_init(analogin_t *obj, PinName pin) void analogin_init(analogin_t *obj, PinName pin)
{ {
uint32_t function = (uint32_t)NC; uint32_t function = (uint32_t)NC;
obj->adc = (ADCName)NC;
#if defined(ADC1) #if defined(ADC1)
static int adc1_inited = 0; static int adc1_inited = 0;
@ -56,18 +55,17 @@ void analogin_init(analogin_t *obj, PinName pin)
if (pin < 0xF0) { if (pin < 0xF0) {
// Normal channels // Normal channels
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
// Get the functions (adc channel) from the pin and assign it to the object
function = pinmap_function(pin, PinMap_ADC); function = pinmap_function(pin, PinMap_ADC);
// Configure GPIO // Configure GPIO
pinmap_pinout(pin, PinMap_ADC); pinmap_pinout(pin, PinMap_ADC);
} else { } else {
// Internal channels // Internal channels
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC_Internal); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
function = pinmap_function(pin, PinMap_ADC_Internal); function = pinmap_function(pin, PinMap_ADC_Internal);
// No GPIO configuration for internal channels // No GPIO configuration for internal channels
} }
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
MBED_ASSERT(function != (uint32_t)NC); MBED_ASSERT(function != (uint32_t)NC);
obj->channel = STM_PIN_CHANNEL(function); obj->channel = STM_PIN_CHANNEL(function);
@ -78,29 +76,28 @@ void analogin_init(analogin_t *obj, PinName pin)
// Check if ADC is already initialized // Check if ADC is already initialized
// Enable ADC clock // Enable ADC clock
#if defined(ADC1) #if defined(ADC1)
if ((obj->adc == ADC_1) && adc1_inited) return; if (((ADCName)obj->handle.Instance == ADC_1) && adc1_inited) return;
if (obj->adc == ADC_1) { if ((ADCName)obj->handle.Instance == ADC_1) {
__HAL_RCC_ADC1_CLK_ENABLE(); __HAL_RCC_ADC1_CLK_ENABLE();
adc1_inited = 1; adc1_inited = 1;
} }
#endif #endif
#if defined(ADC2) #if defined(ADC2)
if ((obj->adc == ADC_2) && adc2_inited) return; if (((ADCName)obj->handle.Instance == ADC_2) && adc2_inited) return;
if (obj->adc == ADC_2) { if ((ADCName)obj->handle.Instance == ADC_2) {
__HAL_RCC_ADC2_CLK_ENABLE(); __HAL_RCC_ADC2_CLK_ENABLE();
adc2_inited = 1; adc2_inited = 1;
} }
#endif #endif
#if defined(ADC3) #if defined(ADC3)
if ((obj->adc == ADC_3) && adc3_inited) return; if (((ADCName)obj->handle.Instance == ADC_3) && adc3_inited) return;
if (obj->adc == ADC_3) { if ((ADCName)obj->handle.Instance == ADC_3) {
__HAL_RCC_ADC3_CLK_ENABLE(); __HAL_RCC_ADC3_CLK_ENABLE();
adc3_inited = 1; adc3_inited = 1;
} }
#endif #endif
// Configure ADC // Configure ADC
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV4; obj->handle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV4;
obj->handle.Init.Resolution = ADC_RESOLUTION_12B; obj->handle.Init.Resolution = ADC_RESOLUTION_12B;
@ -124,8 +121,6 @@ static inline uint16_t adc_read(analogin_t *obj)
{ {
ADC_ChannelConfTypeDef sConfig = {0}; ADC_ChannelConfTypeDef sConfig = {0};
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
sConfig.Rank = 1; sConfig.Rank = 1;
sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES; sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;

1
targets/TARGET_STM/TARGET_STM32F7/common_objects.h
View File

@ -112,7 +112,6 @@ struct i2c_s {
}; };
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;

10
targets/TARGET_STM/TARGET_STM32L0/analogin_api.c
View File

@ -49,18 +49,18 @@ void analogin_init(analogin_t *obj, PinName pin)
if (pin < 0xF0) { if (pin < 0xF0) {
// Normal channels // Normal channels
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *)pinmap_peripheral(pin, PinMap_ADC);
// Get the functions (adc channel) from the pin and assign it to the object // Get the functions (adc channel) from the pin and assign it to the object
function = pinmap_function(pin, PinMap_ADC); function = pinmap_function(pin, PinMap_ADC);
// Configure GPIO // Configure GPIO
pinmap_pinout(pin, PinMap_ADC); pinmap_pinout(pin, PinMap_ADC);
} else { } else {
// Internal channels // Internal channels
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC_Internal); obj->handle.Instance = (ADC_TypeDef *)pinmap_peripheral(pin, PinMap_ADC_Internal);
function = pinmap_function(pin, PinMap_ADC_Internal); function = pinmap_function(pin, PinMap_ADC_Internal);
// No GPIO configuration for internal channels // No GPIO configuration for internal channels
} }
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
MBED_ASSERT(function != (uint32_t)NC); MBED_ASSERT(function != (uint32_t)NC);
obj->channel = STM_PIN_CHANNEL(function); obj->channel = STM_PIN_CHANNEL(function);
@ -72,9 +72,7 @@ void analogin_init(analogin_t *obj, PinName pin)
if (adc_inited == 0) { if (adc_inited == 0) {
adc_inited = 1; adc_inited = 1;
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
// Enable ADC clock // Enable ADC clock
__ADC1_CLK_ENABLE(); __ADC1_CLK_ENABLE();
@ -111,8 +109,6 @@ static inline uint16_t adc_read(analogin_t *obj)
{ {
ADC_ChannelConfTypeDef sConfig = {0}; ADC_ChannelConfTypeDef sConfig = {0};
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
sConfig.Rank = ADC_RANK_CHANNEL_NUMBER; sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
switch (obj->channel) { switch (obj->channel) {

1
targets/TARGET_STM/TARGET_STM32L0/common_objects.h
View File

@ -117,7 +117,6 @@ struct flash_s {
}; };
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;

8
targets/TARGET_STM/TARGET_STM32L1/analogin_api.c
View File

@ -43,8 +43,8 @@ void analogin_init(analogin_t *obj, PinName pin)
RCC_OscInitTypeDef RCC_OscInitStruct; RCC_OscInitTypeDef RCC_OscInitStruct;
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
// Get the pin function and assign the used channel to the object // Get the pin function and assign the used channel to the object
uint32_t function = pinmap_function(pin, PinMap_ADC); uint32_t function = pinmap_function(pin, PinMap_ADC);
@ -71,9 +71,7 @@ void analogin_init(analogin_t *obj, PinName pin)
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
HAL_RCC_OscConfig(&RCC_OscInitStruct); HAL_RCC_OscConfig(&RCC_OscInitStruct);
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
// Enable ADC clock // Enable ADC clock
__ADC1_CLK_ENABLE(); __ADC1_CLK_ENABLE();
@ -104,8 +102,6 @@ static inline uint16_t adc_read(analogin_t *obj)
{ {
ADC_ChannelConfTypeDef sConfig = {0}; ADC_ChannelConfTypeDef sConfig = {0};
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
switch (obj->channel) { switch (obj->channel) {
case 0: case 0:

1
targets/TARGET_STM/TARGET_STM32L1/common_objects.h
View File

@ -123,7 +123,6 @@ struct dac_s {
}; };
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;

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

@ -41,7 +41,6 @@ int adc_inited = 0;
void analogin_init(analogin_t *obj, PinName pin) void analogin_init(analogin_t *obj, PinName pin)
{ {
uint32_t function = (uint32_t)NC; uint32_t function = (uint32_t)NC;
obj->adc = (ADCName)NC;
// ADC Internal Channels "pins" (Temperature, Vref, Vbat, ...) // ADC Internal Channels "pins" (Temperature, Vref, Vbat, ...)
// are described in PinNames.h and PeripheralPins.c // are described in PinNames.h and PeripheralPins.c
@ -49,18 +48,18 @@ void analogin_init(analogin_t *obj, PinName pin)
if ((pin < 0xF0) || (pin >= 0x100)) { if ((pin < 0xF0) || (pin >= 0x100)) {
// Normal channels // Normal channels
// Get the peripheral name from the pin and assign it to the object // Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
// Get the functions (adc channel) from the pin and assign it to the object // Get the functions (adc channel) from the pin and assign it to the object
function = pinmap_function(pin, PinMap_ADC); function = pinmap_function(pin, PinMap_ADC);
// Configure GPIO // Configure GPIO
pinmap_pinout(pin, PinMap_ADC); pinmap_pinout(pin, PinMap_ADC);
} else { } else {
// Internal channels // Internal channels
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC_Internal); obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
function = pinmap_function(pin, PinMap_ADC_Internal); function = pinmap_function(pin, PinMap_ADC_Internal);
// No GPIO configuration for internal channels // No GPIO configuration for internal channels
} }
MBED_ASSERT(obj->adc != (ADCName)NC); MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);
MBED_ASSERT(function != (uint32_t)NC); MBED_ASSERT(function != (uint32_t)NC);
obj->channel = STM_PIN_CHANNEL(function); obj->channel = STM_PIN_CHANNEL(function);
@ -76,9 +75,7 @@ void analogin_init(analogin_t *obj, PinName pin)
__HAL_RCC_ADC_CLK_ENABLE(); __HAL_RCC_ADC_CLK_ENABLE();
__HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK); __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
obj->handle.State = HAL_ADC_STATE_RESET; obj->handle.State = HAL_ADC_STATE_RESET;
// Configure ADC // Configure ADC
obj->handle.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV2; // Asynchronous clock mode, input ADC clock obj->handle.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV2; // Asynchronous clock mode, input ADC clock
obj->handle.Init.Resolution = ADC_RESOLUTION_12B; obj->handle.Init.Resolution = ADC_RESOLUTION_12B;
@ -106,8 +103,6 @@ static inline uint16_t adc_read(analogin_t *obj)
{ {
ADC_ChannelConfTypeDef sConfig = {0}; ADC_ChannelConfTypeDef sConfig = {0};
obj->handle.Instance = (ADC_TypeDef *)(obj->adc);
// Configure ADC channel // Configure ADC channel
switch (obj->channel) { switch (obj->channel) {
case 0: case 0:

1
targets/TARGET_STM/TARGET_STM32L4/common_objects.h
View File

@ -117,7 +117,6 @@ struct flash_s {
}; };
struct analogin_s { struct analogin_s {
ADCName adc;
ADC_HandleTypeDef handle; ADC_HandleTypeDef handle;
PinName pin; PinName pin;
uint8_t channel; uint8_t channel;