Skip to content

Improve management handling of multiple instances of analogin ojects #4623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 31, 2017
Merged

Improve management handling of multiple instances of analogin ojects #4623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8540e8a
STM32: Analogin - define handle in object not as a global
LMESTM Jun 19, 2017
efbeb0d
STM32: analogin: adc struct member not needed anymore
LMESTM Jun 19, 2017
ea33f8b
STM32: F2: adc; struct member not needed
LMESTM Jul 6, 2017
b9d801f
STM32: L0: adc struct member does not exist anymore
LMESTM Jul 17, 2017
7414b12
STM32: ADC: Fix PinMap_ADC_Internal
LMESTM Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_DISCO_F051R8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint32_t channel;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F030R8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint32_t channel;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F031K6/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint32_t channel;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F042K6/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint32_t channel;
};

struct can_s {
CANName can;
int index;
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F070RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint32_t channel;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F072RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint32_t channel;
};

struct can_s {
CANName can;
int index;
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F091RC/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint32_t channel;
};

struct can_s {
CANName can;
int index;
Expand Down
52 changes: 24 additions & 28 deletions targets/TARGET_STM/TARGET_STM32F0/analogin_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,13 @@
#include "PeripheralPins.h"
#include "mbed_error.h"

ADC_HandleTypeDef AdcHandle;

int adc_inited = 0;

void analogin_init(analogin_t *obj, PinName pin) {
// Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->adc != (ADCName)NC);
obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);

// Get the functions (adc channel) from the pin and assign it to the object
uint32_t function = pinmap_function(pin, PinMap_ADC);
MBED_ASSERT(function != (uint32_t)NC);
Expand All @@ -67,25 +65,25 @@ void analogin_init(analogin_t *obj, PinName pin) {
__ADC1_CLK_ENABLE();

// Configure ADC
AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);
AdcHandle.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
AdcHandle.Init.Resolution = ADC_RESOLUTION12b;
AdcHandle.Init.DataAlign = ADC_DATAALIGN_RIGHT;
AdcHandle.Init.ScanConvMode = ADC_SCAN_DIRECTION_FORWARD;
AdcHandle.Init.EOCSelection = EOC_SINGLE_CONV;
AdcHandle.Init.LowPowerAutoWait = DISABLE;
AdcHandle.Init.LowPowerAutoPowerOff = DISABLE;
AdcHandle.Init.ContinuousConvMode = DISABLE;
AdcHandle.Init.DiscontinuousConvMode = DISABLE;
AdcHandle.Init.ExternalTrigConv = ADC_SOFTWARE_START;
AdcHandle.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
AdcHandle.Init.DMAContinuousRequests = DISABLE;
AdcHandle.Init.Overrun = OVR_DATA_OVERWRITTEN;
if (HAL_ADC_Init(&AdcHandle) != HAL_OK) {
obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
obj->handle.Init.Resolution = ADC_RESOLUTION12b;
obj->handle.Init.DataAlign = ADC_DATAALIGN_RIGHT;
obj->handle.Init.ScanConvMode = ADC_SCAN_DIRECTION_FORWARD;
obj->handle.Init.EOCSelection = EOC_SINGLE_CONV;
obj->handle.Init.LowPowerAutoWait = DISABLE;
obj->handle.Init.LowPowerAutoPowerOff = DISABLE;
obj->handle.Init.ContinuousConvMode = DISABLE;
obj->handle.Init.DiscontinuousConvMode = DISABLE;
obj->handle.Init.ExternalTrigConv = ADC_SOFTWARE_START;
obj->handle.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
obj->handle.Init.DMAContinuousRequests = DISABLE;
obj->handle.Init.Overrun = OVR_DATA_OVERWRITTEN;
if (HAL_ADC_Init(&obj->handle) != HAL_OK) {
error("Cannot initialize ADC");
}
// Run the ADC calibration
if (HAL_ADCEx_Calibration_Start(&AdcHandle) != HAL_OK) {
if (HAL_ADCEx_Calibration_Start(&obj->handle) != HAL_OK) {
error("Cannot Start ADC_Calibration");
}
}
Expand All @@ -94,8 +92,6 @@ void analogin_init(analogin_t *obj, PinName pin) {
static inline uint16_t adc_read(analogin_t *obj) {
ADC_ChannelConfTypeDef sConfig;

AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);

// Configure ADC channel
sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
#if defined (TARGET_STM32F091RC)
Expand Down Expand Up @@ -169,15 +165,15 @@ static inline uint16_t adc_read(analogin_t *obj) {
}

// Clear all channels as it is not done in HAL_ADC_ConfigChannel()
AdcHandle.Instance->CHSELR = 0;
obj->handle.Instance->CHSELR = 0;

HAL_ADC_ConfigChannel(&AdcHandle, &sConfig);
HAL_ADC_ConfigChannel(&obj->handle, &sConfig);

HAL_ADC_Start(&AdcHandle); // Start conversion
HAL_ADC_Start(&obj->handle); // Start conversion

// Wait end of conversion and get value
if (HAL_ADC_PollForConversion(&AdcHandle, 10) == HAL_OK) {
return (HAL_ADC_GetValue(&AdcHandle));
if (HAL_ADC_PollForConversion(&obj->handle, 10) == HAL_OK) {
return (HAL_ADC_GetValue(&obj->handle));
} else {
return 0;
}
Expand Down
6 changes: 6 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F0/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ struct i2c_s {
#endif
};

struct analogin_s {
ADC_HandleTypeDef handle;
PinName pin;
uint8_t channel;
};

#include "gpio_object.h"

#if DEVICE_ANALOGOUT
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F1/TARGET_BLUEPILL_F103C8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint8_t channel;
};

struct can_s {
CANName can;
int index;
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F1/TARGET_DISCO_F100RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint8_t channel;
};

#include "common_objects.h"

#ifdef __cplusplus
Expand Down
6 changes: 0 additions & 6 deletions targets/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ struct port_s {
__IO uint32_t *reg_out;
};

struct analogin_s {
ADCName adc;
PinName pin;
uint8_t channel;
};

struct can_s {
CANName can;
int index;
Expand Down
36 changes: 16 additions & 20 deletions targets/TARGET_STM/TARGET_STM32F1/analogin_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,16 @@
#include "pinmap.h"
#include "PeripheralPins.h"

ADC_HandleTypeDef AdcHandle;

int adc_inited = 0;

void analogin_init(analogin_t *obj, PinName pin)
{
RCC_PeriphCLKInitTypeDef PeriphClkInit;

// Get the peripheral name from the pin and assign it to the object
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->adc != (ADCName)NC);
obj->handle.Instance = (ADC_TypeDef *) pinmap_peripheral(pin, PinMap_ADC);
MBED_ASSERT(obj->handle.Instance != (ADC_TypeDef *)NC);

// Get the functions (adc channel) from the pin and assign it to the object
uint32_t function = pinmap_function(pin, PinMap_ADC);
MBED_ASSERT(function != (uint32_t)NC);
Expand Down Expand Up @@ -79,24 +77,22 @@ void analogin_init(analogin_t *obj, PinName pin)
HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);

// Configure ADC
AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);
AdcHandle.Init.DataAlign = ADC_DATAALIGN_RIGHT;
AdcHandle.Init.ScanConvMode = DISABLE;
AdcHandle.Init.ContinuousConvMode = DISABLE;
AdcHandle.Init.NbrOfConversion = 1;
AdcHandle.Init.DiscontinuousConvMode = DISABLE;
AdcHandle.Init.NbrOfDiscConversion = 0;
AdcHandle.Init.ExternalTrigConv = ADC_SOFTWARE_START;
HAL_ADC_Init(&AdcHandle);
obj->handle.State = HAL_ADC_STATE_RESET;
obj->handle.Init.DataAlign = ADC_DATAALIGN_RIGHT;
obj->handle.Init.ScanConvMode = DISABLE;
obj->handle.Init.ContinuousConvMode = DISABLE;
obj->handle.Init.NbrOfConversion = 1;
obj->handle.Init.DiscontinuousConvMode = DISABLE;
obj->handle.Init.NbrOfDiscConversion = 0;
obj->handle.Init.ExternalTrigConv = ADC_SOFTWARE_START;
HAL_ADC_Init(&obj->handle);
}
}

static inline uint16_t adc_read(analogin_t *obj)
{
ADC_ChannelConfTypeDef sConfig;

AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);

// Configure ADC channel
sConfig.Rank = 1;
sConfig.SamplingTime = ADC_SAMPLETIME_7CYCLES_5;
Expand Down Expand Up @@ -160,13 +156,13 @@ static inline uint16_t adc_read(analogin_t *obj)
return 0;
}

HAL_ADC_ConfigChannel(&AdcHandle, &sConfig);
HAL_ADC_ConfigChannel(&obj->handle, &sConfig);

HAL_ADC_Start(&AdcHandle); // Start conversion
HAL_ADC_Start(&obj->handle); // Start conversion

// Wait end of conversion and get value
if (HAL_ADC_PollForConversion(&AdcHandle, 10) == HAL_OK) {
return (HAL_ADC_GetValue(&AdcHandle));
if (HAL_ADC_PollForConversion(&obj->handle, 10) == HAL_OK) {
return (HAL_ADC_GetValue(&obj->handle));
} else {
return 0;
}
Expand Down
6 changes: 6 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F1/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ struct i2c_s {
#endif
};

struct analogin_s {
ADC_HandleTypeDef handle;
PinName pin;
uint8_t channel;
};

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
Loading