diff --git a/src/main/drivers/adc.c b/src/main/drivers/adc.c
index eae243340..958a831b4 100644
--- a/src/main/drivers/adc.c
+++ b/src/main/drivers/adc.c
@@ -25,6 +25,8 @@
 
 #include "adc.h"
 
+//#define DEBUG_ADC_CHANNELS
+
 #ifdef USE_ADC
 adc_config_t adcConfig[ADC_CHANNEL_COUNT];
 volatile uint16_t adcValues[ADC_CHANNEL_COUNT];
@@ -33,7 +35,7 @@ extern int16_t debug[4];
 
 uint16_t adcGetChannel(uint8_t channel)
 {
-#if DEBUG_ADC_CHANNELS
+#ifdef DEBUG_ADC_CHANNELS
     if (adcConfig[0].enabled) {
         debug[0] = adcValues[adcConfig[0].dmaIndex];
     }
diff --git a/src/main/drivers/adc_stm32f10x.c b/src/main/drivers/adc_stm32f10x.c
index 5f591ed0a..c6c97c2f4 100644
--- a/src/main/drivers/adc_stm32f10x.c
+++ b/src/main/drivers/adc_stm32f10x.c
@@ -64,7 +64,7 @@ void adcInit(drv_adc_config_t *init)
     GPIO_StructInit(&GPIO_InitStructure);
     GPIO_InitStructure.GPIO_Mode  = GPIO_Mode_AIN;
 
-#ifdef VBAT_ADC_GPIO_PIN
+#ifdef VBAT_ADC_GPIO
     GPIO_InitStructure.GPIO_Pin = VBAT_ADC_GPIO_PIN;
     GPIO_Init(VBAT_ADC_GPIO, &GPIO_InitStructure);
     adcConfig[ADC_BATTERY].adcChannel = VBAT_ADC_CHANNEL;
diff --git a/src/main/drivers/adc_stm32f30x.c b/src/main/drivers/adc_stm32f30x.c
index 6c129d546..ecaa1c000 100644
--- a/src/main/drivers/adc_stm32f30x.c
+++ b/src/main/drivers/adc_stm32f30x.c
@@ -44,42 +44,56 @@ void adcInit(drv_adc_config_t *init)
     memset(&adcConfig, 0, sizeof(adcConfig));
 
     GPIO_StructInit(&GPIO_InitStructure);
-    GPIO_InitStructure.GPIO_Pin   = GPIO_Pin_0 | GPIO_Pin_3;
     GPIO_InitStructure.GPIO_Mode  = GPIO_Mode_AN;
     GPIO_InitStructure.GPIO_PuPd  = GPIO_PuPd_NOPULL ;
 
-    adcConfig[ADC_BATTERY].adcChannel = ADC_Channel_6;
+#ifdef VBAT_ADC_GPIO
+    GPIO_InitStructure.GPIO_Pin   = VBAT_ADC_GPIO_PIN;
+    GPIO_Init(VBAT_ADC_GPIO, &GPIO_InitStructure);
+
+    adcConfig[ADC_BATTERY].adcChannel = VBAT_ADC_CHANNEL;
     adcConfig[ADC_BATTERY].dmaIndex = adcChannelCount;
     adcConfig[ADC_BATTERY].sampleTime = ADC_SampleTime_601Cycles5;
     adcConfig[ADC_BATTERY].enabled = true;
     adcChannelCount++;
+#endif
 
+#ifdef CURRENT_METER_ADC_GPIO
     if (init->enableCurrentMeter) {
-        GPIO_InitStructure.GPIO_Pin |= GPIO_Pin_1;
+        GPIO_InitStructure.GPIO_Pin = CURRENT_METER_ADC_GPIO_PIN;
+        GPIO_Init(CURRENT_METER_ADC_GPIO, &GPIO_InitStructure);
 
-        adcConfig[ADC_CURRENT].adcChannel = ADC_Channel_7;
+        adcConfig[ADC_CURRENT].adcChannel = CURRENT_METER_ADC_CHANNEL;
         adcConfig[ADC_CURRENT].dmaIndex = adcChannelCount;
         adcConfig[ADC_CURRENT].sampleTime = ADC_SampleTime_601Cycles5;
         adcConfig[ADC_CURRENT].enabled = true;
         adcChannelCount++;
-
     }
+#endif
 
+#ifdef RSSI_ADC_GPIO
     if (init->enableRSSI) {
-        GPIO_InitStructure.GPIO_Pin |= GPIO_Pin_2;
+        GPIO_InitStructure.GPIO_Pin = RSSI_ADC_GPIO_PIN;
+        GPIO_Init(RSSI_ADC_GPIO, &GPIO_InitStructure);
 
-        adcConfig[ADC_RSSI].adcChannel = ADC_Channel_8;
+        adcConfig[ADC_RSSI].adcChannel = RSSI_ADC_CHANNEL;
         adcConfig[ADC_RSSI].dmaIndex = adcChannelCount;
         adcConfig[ADC_RSSI].sampleTime = ADC_SampleTime_601Cycles5;
         adcConfig[ADC_RSSI].enabled = true;
         adcChannelCount++;
     }
+#endif
 
-    adcConfig[ADC_EXTERNAL1].adcChannel = ADC_Channel_9;
+#ifdef EXTERNAL1_ADC_GPIO
+    GPIO_InitStructure.GPIO_Pin   = EXTERNAL1_ADC_GPIO_PIN;
+    GPIO_Init(EXTERNAL1_ADC_GPIO, &GPIO_InitStructure);
+
+    adcConfig[ADC_EXTERNAL1].adcChannel = EXTERNAL1_ADC_CHANNEL;
     adcConfig[ADC_EXTERNAL1].dmaIndex = adcChannelCount;
     adcConfig[ADC_EXTERNAL1].sampleTime = ADC_SampleTime_601Cycles5;
     adcConfig[ADC_EXTERNAL1].enabled = true;
     adcChannelCount++;
+#endif
 
     RCC_ADCCLKConfig(RCC_ADC12PLLCLK_Div256);  // 72 MHz divided by 256 = 281.25 kHz
     RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1 | RCC_AHBPeriph_ADC12, ENABLE);
@@ -103,7 +117,6 @@ void adcInit(drv_adc_config_t *init)
 
     DMA_Cmd(DMA1_Channel1, ENABLE);
 
-    GPIO_Init(GPIOC, &GPIO_InitStructure);
 
     // calibrate
 
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index cc699343c..c5f896f3c 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -70,6 +70,23 @@
 
 #define USE_ADC
 
+#define VBAT_ADC_GPIO               GPIOC
+#define VBAT_ADC_GPIO_PIN           GPIO_Pin_0
+#define VBAT_ADC_CHANNEL            ADC_Channel_6
+
+#define CURRENT_METER_ADC_GPIO      GPIOC
+#define CURRENT_METER_ADC_GPIO_PIN  GPIO_Pin_1
+#define CURRENT_METER_ADC_CHANNEL   ADC_Channel_7
+
+#define RSSI_ADC_GPIO               GPIOC
+#define RSSI_ADC_GPIO_PIN           GPIO_Pin_2
+#define RSSI_ADC_CHANNEL            ADC_Channel_8
+
+#define EXTERNAL1_ADC_GPIO          GPIOC
+#define EXTERNAL1_ADC_GPIO_PIN      GPIO_Pin_3
+#define EXTERNAL1_ADC_CHANNEL       ADC_Channel_9
+
+
 #define SENSORS_SET (SENSOR_ACC | SENSOR_BARO | SENSOR_MAG)
 
 #define GPS
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index ab840213f..2990341ea 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -61,6 +61,22 @@
 
 #define USE_ADC
 
+#define VBAT_ADC_GPIO               GPIOC
+#define VBAT_ADC_GPIO_PIN           GPIO_Pin_0
+#define VBAT_ADC_CHANNEL            ADC_Channel_6
+
+#define CURRENT_METER_ADC_GPIO      GPIOC
+#define CURRENT_METER_ADC_GPIO_PIN  GPIO_Pin_1
+#define CURRENT_METER_ADC_CHANNEL   ADC_Channel_7
+
+#define RSSI_ADC_GPIO               GPIOC
+#define RSSI_ADC_GPIO_PIN           GPIO_Pin_2
+#define RSSI_ADC_CHANNEL            ADC_Channel_8
+
+#define EXTERNAL1_ADC_GPIO          GPIOC
+#define EXTERNAL1_ADC_GPIO_PIN      GPIO_Pin_3
+#define EXTERNAL1_ADC_CHANNEL       ADC_Channel_9
+
 #define SENSORS_SET (SENSOR_ACC | SENSOR_MAG)
 
 #define BLACKBOX