Small bugfix and added some comments.
This commit is contained in:
committed by
Raphael Coeffic
parent
b1be0bf57d
commit
ec630671ad
@@ -56,11 +56,11 @@ static void adc_setup_scan_mode(ADC_TypeDef* ADCx, uint8_t nconv)
|
|||||||
ADC_InitTypeDef ADC_InitStructure;
|
ADC_InitTypeDef ADC_InitStructure;
|
||||||
ADC_StructInit(&ADC_InitStructure);
|
ADC_StructInit(&ADC_InitStructure);
|
||||||
|
|
||||||
ADC_InitStructure.ADC_ScanConvMode = ENABLE;
|
ADC_InitStructure.ADC_ScanConvMode = ENABLE; // Sets ADC_CR1_SCAN
|
||||||
ADC_InitStructure.ADC_ContinuousConvMode = DISABLE;
|
ADC_InitStructure.ADC_ContinuousConvMode = DISABLE; // Clears ADC_CR2_CONT
|
||||||
ADC_InitStructure.ADC_ExternalTrigConvEdge = ADC_ExternalTrigConvEdge_None;
|
ADC_InitStructure.ADC_ExternalTrigConvEdge = ADC_ExternalTrigConvEdge_None; // Software trigger
|
||||||
ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right;
|
ADC_InitStructure.ADC_DataAlign = ADC_DataAlign_Right;
|
||||||
ADC_InitStructure.ADC_NbrOfConversion = nconv;
|
ADC_InitStructure.ADC_NbrOfConversion = nconv; // Channel count
|
||||||
|
|
||||||
ADC_Init(ADCx, &ADC_InitStructure);
|
ADC_Init(ADCx, &ADC_InitStructure);
|
||||||
|
|
||||||
@@ -141,7 +141,7 @@ static uint8_t ADC_EXT_get_nconv() { return NUM_ANALOGS_ADC_EXT; }
|
|||||||
#elif defined(PCBX10)
|
#elif defined(PCBX10)
|
||||||
|
|
||||||
static const stm32_hal_adc_channel ADC_EXT_channels[] = {
|
static const stm32_hal_adc_channel ADC_EXT_channels[] = {
|
||||||
{ ADC_Channel_Vbat, 1, ADC_SAMPTIME }
|
{ ADC_Channel_Vbat, ADC_SAMPTIME }
|
||||||
};
|
};
|
||||||
|
|
||||||
static uint8_t ADC_EXT_get_nconv() { return 1; }
|
static uint8_t ADC_EXT_get_nconv() { return 1; }
|
||||||
@@ -188,7 +188,7 @@ stm32_hal_adc ADC_hal_def[] = {
|
|||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
{ nullptr, nullptr, nullptr, nullptr, nullptr },
|
{ nullptr, nullptr, nullptr, nullptr, nullptr }, // required to detect end of ADC definitions
|
||||||
};
|
};
|
||||||
|
|
||||||
static void adc_init_channels(ADC_TypeDef* adc, const stm32_hal_adc_channel* chan,
|
static void adc_init_channels(ADC_TypeDef* adc, const stm32_hal_adc_channel* chan,
|
||||||
|
|||||||
@@ -23,7 +23,6 @@
|
|||||||
|
|
||||||
struct stm32_hal_adc_channel {
|
struct stm32_hal_adc_channel {
|
||||||
const uint8_t adc_channel;
|
const uint8_t adc_channel;
|
||||||
const uint8_t rank;
|
|
||||||
const uint8_t sample_time;
|
const uint8_t sample_time;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user