STM32 ADC: replace flags type from int to bool

pull/5513/head
bcostm 2017-11-17 13:50:38 +01:00
parent 1d3eb508bf
commit c54e9079b8
6 changed files with 24 additions and 18 deletions

View File

@ -35,10 +35,11 @@
#include "pinmap.h"
#include "mbed_error.h"
#include "PeripheralPins.h"
#include <stdbool.h>
void analogin_init(analogin_t *obj, PinName pin)
{
static int adc_calibrated = 0;
static bool adc_calibrated = false;
uint32_t function = (uint32_t)NC;
// ADC Internal Channels "pins" (Temperature, Vref, Vbat, ...)
@ -89,8 +90,8 @@ void analogin_init(analogin_t *obj, PinName pin)
}
// ADC calibration is done only once
if (adc_calibrated == 0) {
adc_calibrated = 1;
if (!adc_calibrated) {
adc_calibrated = true;
HAL_ADCEx_Calibration_Start(&obj->handle);
}
}

View File

@ -35,10 +35,11 @@
#include "pinmap.h"
#include "mbed_error.h"
#include "PeripheralPins.h"
#include <stdbool.h>
void analogin_init(analogin_t *obj, PinName pin)
{
static int adc_calibrated = 0;
static bool adc_calibrated = false;
RCC_PeriphCLKInitTypeDef PeriphClkInit;
uint32_t function = (uint32_t)NC;
@ -85,8 +86,8 @@ void analogin_init(analogin_t *obj, PinName pin)
}
// This section is done only once
if (adc_calibrated == 0) {
adc_calibrated = 1;
if (!adc_calibrated) {
adc_calibrated = true;
// Configure ADC clock prescaler
// Caution: On STM32F1, ADC clock frequency max is 14 MHz (refer to device datasheet).
// Therefore, ADC clock prescaler must be configured in function

View File

@ -35,10 +35,11 @@
#include "pinmap.h"
#include "mbed_error.h"
#include "PeripheralPins.h"
#include <stdbool.h>
void analogin_init(analogin_t *obj, PinName pin)
{
static int adc_calibrated = 0;
static bool adc_calibrated = false;
uint32_t function = (uint32_t)NC;
// ADC Internal Channels "pins" (Temperature, Vref, Vbat, ...)
@ -109,8 +110,8 @@ void analogin_init(analogin_t *obj, PinName pin)
}
// ADC calibration is done only once
if (adc_calibrated == 0) {
adc_calibrated = 1;
if (!adc_calibrated) {
adc_calibrated = true;
HAL_ADCEx_Calibration_Start(&obj->handle, ADC_SINGLE_ENDED);
}
}

View File

@ -35,10 +35,11 @@
#include "pinmap.h"
#include "mbed_error.h"
#include "PeripheralPins.h"
#include <stdbool.h>
void analogin_init(analogin_t *obj, PinName pin)
{
static int adc_calibrated = 0;
static bool adc_calibrated = false;
uint32_t function = (uint32_t)NC;
// ADC Internal Channels "pins" (Temperature, Vref, Vbat, ...)
@ -92,8 +93,8 @@ void analogin_init(analogin_t *obj, PinName pin)
}
// ADC calibration is done only once
if (adc_calibrated == 0) {
adc_calibrated = 1;
if (!adc_calibrated) {
adc_calibrated = true;
HAL_ADCEx_Calibration_Start(&obj->handle, ADC_SINGLE_ENDED);
}

View File

@ -35,10 +35,11 @@
#include "pinmap.h"
#include "mbed_error.h"
#include "PeripheralPins.h"
#include <stdbool.h>
void analogin_init(analogin_t *obj, PinName pin)
{
static int adc_hsi_inited = 0;
static bool adc_hsi_inited = false;
RCC_OscInitTypeDef RCC_OscInitStruct;
uint32_t function = (uint32_t)NC;
@ -92,8 +93,8 @@ void analogin_init(analogin_t *obj, PinName pin)
}
// This section is done only once
if (adc_hsi_inited == 0) {
adc_hsi_inited = 1;
if (!adc_hsi_inited) {
adc_hsi_inited = true;
// Enable the HSI (to clock the ADC)
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
RCC_OscInitStruct.HSIState = RCC_HSI_ON;

View File

@ -35,10 +35,11 @@
#include "pinmap.h"
#include "mbed_error.h"
#include "PeripheralPins.h"
#include <stdbool.h>
void analogin_init(analogin_t *obj, PinName pin)
{
static int adc_calibrated = 0;
static bool adc_calibrated = false;
uint32_t function = (uint32_t)NC;
// ADC Internal Channels "pins" (Temperature, Vref, Vbat, ...)
@ -93,8 +94,8 @@ void analogin_init(analogin_t *obj, PinName pin)
}
// ADC calibration is done only once
if (adc_calibrated == 0) {
adc_calibrated = 1;
if (!adc_calibrated) {
adc_calibrated = true;
HAL_ADCEx_Calibration_Start(&obj->handle, ADC_SINGLE_ENDED);
}
}