noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #244 from RomeroMalaquias/master 

F3 - Avoiding conditional directives that break statements
This commit is contained in:
Roger Clark 2017-01-16 18:20:59 +11:00 committed by GitHub
parent c2f4aa8566 8cfa60ff84
commit abdf42d0cb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STM32F3/cores/maple/libmaple/stm32f3/f3_adc.c
View File

@ -301,11 +301,11 @@ void adc_config_gpio(const adc_dev *ignored, gpio_dev *gdev, uint8 bit) {
} }
void adc_enable_single_swstart(const adc_dev *dev) { void adc_enable_single_swstart(const adc_dev *dev) {
int check_dev_adc = dev == ADC1;
#if STM32_F3_LINE == STM32_F3_LINE_303 #if STM32_F3_LINE == STM32_F3_LINE_303
if ( (dev == ADC1) || (dev == ADC3) ) check_dev_adc = (check_dev_adc || dev == ADC3);
#else
if (dev == ADC1)
#endif #endif
if (check_dev_adc)
adc_init(dev); /* FIXME hack needed for wirish, as master and slave ADC share the same reset register */ adc_init(dev); /* FIXME hack needed for wirish, as master and slave ADC share the same reset register */
adc_set_exttrig(dev, ADC_EXTTRIG_MODE_SOFTWARE); adc_set_exttrig(dev, ADC_EXTTRIG_MODE_SOFTWARE);
adc_regulator_enable(dev); adc_regulator_enable(dev);