Merge branch 'master' of github.com:paparazzi/paparazzi into add_pixracer_fixedwing

This commit is contained in:
Developer
2017-04-04 14:11:59 +02:00
@@ -142,7 +142,7 @@
// AUX1
#if USE_ADC_2
#define AD1_2_CHANNEL ADC_CHANNEL_IN2
#define AD1_2_CHANNEL ADC_CHANNEL_IN3
#define ADC_2 AD1_2
#define ADC_2_GPIO_PORT GPIOA
#define ADC_2_GPIO_PIN GPIO3