Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 12:57:27 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

[stm32] fix ADC sample rate after libopencm3 update

Browse Source
This commit is contained in:
Felix Ruess
2013-06-04 19:00:01 +02:00
parent fb272f423a
commit b084e20484
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/mcu_periph/adc_arch.c
+6 -4
View File
@@ -89,8 +89,10 @@
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/gpio.h>
#if defined(STM32F1) #if defined(STM32F1)
#include <libopencm3/stm32/f1/adc.h> #include <libopencm3/stm32/f1/adc.h>
#define ADC_SAMPLE_TIME ADC_SMPR_SMP_41DOT5CYC
#elif defined(STM32F4) #elif defined(STM32F4)
#include <libopencm3/stm32/f4/adc.h> #include <libopencm3/stm32/f4/adc.h>
#define ADC_SAMPLE_TIME ADC_SMPR_SMP_56CYC
#endif #endif
#include <libopencm3/cm3/nvic.h> #include <libopencm3/cm3/nvic.h>
#include <libopencm3/stm32/timer.h> #include <libopencm3/stm32/timer.h>
@@ -372,22 +374,22 @@ static inline void adc_init_single(uint32_t adc,
rank = 3; rank = 3;
if (chan1) { if (chan1) {
adc_set_sample_time(adc, adc_channel_map[0], ADC_SMPR1_SMP_41DOT5CYC); adc_set_sample_time(adc, adc_channel_map[0], ADC_SAMPLE_TIME);
channels[rank] = adc_channel_map[0]; channels[rank] = adc_channel_map[0];
rank--; rank--;
} }
if (chan2) { if (chan2) {
adc_set_sample_time(adc, adc_channel_map[1], ADC_SMPR1_SMP_41DOT5CYC); adc_set_sample_time(adc, adc_channel_map[1], ADC_SAMPLE_TIME);
channels[rank] = adc_channel_map[1]; channels[rank] = adc_channel_map[1];
rank--; rank--;
} }
if (chan3) { if (chan3) {
adc_set_sample_time(adc, adc_channel_map[2], ADC_SMPR1_SMP_41DOT5CYC); adc_set_sample_time(adc, adc_channel_map[2], ADC_SAMPLE_TIME);
channels[rank] = adc_channel_map[2]; channels[rank] = adc_channel_map[2];
rank--; rank--;
} }
if (chan4) { if (chan4) {
adc_set_sample_time(adc, adc_channel_map[3], ADC_SMPR1_SMP_41DOT5CYC); adc_set_sample_time(adc, adc_channel_map[3], ADC_SAMPLE_TIME);
channels[rank] = adc_channel_map[3]; channels[rank] = adc_channel_map[3];
} }