diff --git a/src/main/drivers/bus_i2c.h b/src/main/drivers/bus_i2c.h
index c207034a5d..f1f687833b 100644
--- a/src/main/drivers/bus_i2c.h
+++ b/src/main/drivers/bus_i2c.h
@@ -33,7 +33,7 @@ typedef enum I2CDevice {
     I2CDEV_1   = 0,
     I2CDEV_2,
     I2CDEV_3,
-#ifdef USE_I2C4
+#ifdef USE_I2C_DEVICE_4
     I2CDEV_4,
 #endif
     I2CDEV_COUNT
diff --git a/src/main/drivers/bus_i2c_hal.c b/src/main/drivers/bus_i2c_hal.c
index 528774e291..f82de7099a 100644
--- a/src/main/drivers/bus_i2c_hal.c
+++ b/src/main/drivers/bus_i2c_hal.c
@@ -62,7 +62,7 @@ static void i2cUnstick(IO_t scl, IO_t sda);
 #define I2C3_SDA PB4
 #endif
 
-#if defined(USE_I2C4)
+#if defined(USE_I2C_DEVICE_4)
 #ifndef I2C4_SCL
 #define I2C4_SCL PD12
 #endif
@@ -75,12 +75,11 @@ static i2cDevice_t i2cHardwareMap[] = {
     { .dev = I2C1, .scl = IO_TAG(I2C1_SCL), .sda = IO_TAG(I2C1_SDA), .rcc = RCC_APB1(I2C1), .overClock = I2C1_OVERCLOCK, .ev_irq = I2C1_EV_IRQn, .er_irq = I2C1_ER_IRQn, .af = GPIO_AF4_I2C1 },
     { .dev = I2C2, .scl = IO_TAG(I2C2_SCL), .sda = IO_TAG(I2C2_SDA), .rcc = RCC_APB1(I2C2), .overClock = I2C2_OVERCLOCK, .ev_irq = I2C2_EV_IRQn, .er_irq = I2C2_ER_IRQn, .af = GPIO_AF4_I2C2 },
     { .dev = I2C3, .scl = IO_TAG(I2C3_SCL), .sda = IO_TAG(I2C3_SDA), .rcc = RCC_APB1(I2C3), .overClock = I2C2_OVERCLOCK, .ev_irq = I2C3_EV_IRQn, .er_irq = I2C3_ER_IRQn, .af = GPIO_AF4_I2C3 },
-#if defined(USE_I2C4)
+#if defined(USE_I2C_DEVICE_4)
     { .dev = I2C4, .scl = IO_TAG(I2C4_SCL), .sda = IO_TAG(I2C4_SDA), .rcc = RCC_APB1(I2C4), .overClock = I2C2_OVERCLOCK, .ev_irq = I2C4_EV_IRQn, .er_irq = I2C4_ER_IRQn, .af = GPIO_AF4_I2C4 }
 #endif
 };
 
-
 typedef struct{
     I2C_HandleTypeDef Handle;
 }i2cHandle_t;
@@ -116,7 +115,7 @@ void I2C3_EV_IRQHandler(void)
     HAL_I2C_EV_IRQHandler(&i2cHandle[I2CDEV_3].Handle);
 }
 
-#ifdef USE_I2C4
+#ifdef USE_I2C_DEVICE_4
 void I2C4_ER_IRQHandler(void)
 {
     HAL_I2C_ER_IRQHandler(&i2cHandle[I2CDEV_4].Handle);
@@ -198,7 +197,7 @@ void i2cInit(I2CDevice device)
     case I2CDEV_3:
         __HAL_RCC_I2C3_CLK_ENABLE();
         break;
-#ifdef USE_I2C4
+#ifdef USE_I2C_DEVICE_4
     case I2CDEV_4:
         __HAL_RCC_I2C4_CLK_ENABLE();
         break;
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 9846d9bbdb..a12da49038 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -323,25 +323,38 @@ void init(void)
 #ifdef TARGET_BUS_INIT
     targetBusInit();
 #else
-    #ifdef USE_SPI
-        #ifdef USE_SPI_DEVICE_1
-            spiInit(SPIDEV_1);
-        #endif
-        #ifdef USE_SPI_DEVICE_2
-            spiInit(SPIDEV_2);
-        #endif
-        #ifdef USE_SPI_DEVICE_3
-            spiInit(SPIDEV_3);
-        #endif
-        #ifdef USE_SPI_DEVICE_4
-            spiInit(SPIDEV_4);
-        #endif
-    #endif
 
-    #ifdef USE_I2C
-        i2cInit(I2C_DEVICE);
-    #endif
+#ifdef USE_SPI
+#ifdef USE_SPI_DEVICE_1
+    spiInit(SPIDEV_1);
 #endif
+#ifdef USE_SPI_DEVICE_2
+    spiInit(SPIDEV_2);
+#endif
+#ifdef USE_SPI_DEVICE_3
+    spiInit(SPIDEV_3);
+#endif
+#ifdef USE_SPI_DEVICE_4
+    spiInit(SPIDEV_4);
+#endif
+#endif /* USE_SPI */
+
+#ifdef USE_I2C
+#ifdef USE_I2C_DEVICE_1
+    i2cInit(I2CDEV_1);
+#endif
+#ifdef USE_I2C_DEVICE_2
+    i2cInit(I2CDEV_2);
+#endif
+#ifdef USE_I2C_DEVICE_3
+    i2cInit(I2CDEV_3);
+#endif  
+#ifdef USE_I2C_DEVICE_4
+    i2cInit(I2CDEV_4);
+#endif  
+#endif /* USE_I2C */
+
+#endif /* TARGET_BUS_INIT */
 
 #ifdef USE_HARDWARE_REVISION_DETECTION
     updateHardwareRevision();
diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h
index e7afb03ce6..e290fabaa4 100644
--- a/src/main/target/AIR32/target.h
+++ b/src/main/target/AIR32/target.h
@@ -76,7 +76,8 @@
 #define UART3_RX_PIN            PB11 //(AF7)
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2) // SDA (PA10/AF4), SCL (PA9/AF4)
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 #define I2C2_SCL                PA9
 #define I2C2_SDA                PA10
 
diff --git a/src/main/target/ALIENFLIGHTF1/target.h b/src/main/target/ALIENFLIGHTF1/target.h
index 56f73d71b0..570db4238e 100644
--- a/src/main/target/ALIENFLIGHTF1/target.h
+++ b/src/main/target/ALIENFLIGHTF1/target.h
@@ -53,7 +53,8 @@
 #define UART3_TX_PIN            PB10
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2)
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 
 #define USE_ADC
 #define CURRENT_METER_ADC_PIN   PB1
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index 4b6386f8a8..41e41bff7a 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -90,8 +90,8 @@
 #define UART3_RX_PIN            PB11
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2) // SDA (PA10/AF4), SCL (PA9/AF4)
-
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 #define I2C2_SCL                PA9
 #define I2C2_SDA                PA10
 
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index cecd4bc2c9..52c640c89a 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -140,8 +140,8 @@
 #define USE_SPI_DEVICE_3
 
 #define USE_I2C
+#define USE_I2C_DEVICE_1
 #define I2C_DEVICE              (I2CDEV_1)
-//#define I2C_DEVICE_EXT          (I2CDEV_2)
 #define I2C1_SCL                PB6
 #define I2C1_SDA                PB7
 
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index 6dd3ecc52d..8c4600d8cd 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -134,9 +134,8 @@
 #define SDCARD_DMA_CHANNEL                  DMA_CHANNEL_4
 
 #define USE_I2C
-#define USE_I2C4
-#define I2C_DEVICE (I2CDEV_4)
-//#define I2C_DEVICE_EXT (I2CDEV_2)
+#define USE_I2C_DEVICE_4
+#define I2C_DEVICE                  (I2CDEV_4)
 
 #define USE_ADC
 #define VBAT_ADC_PIN                PC0
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 482f3ee7f3..817e9b2d75 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -138,6 +138,7 @@
 #define SPI3_MOSI_PIN           PC12
 
 #define USE_I2C
+#define USE_I2C_DEVICE_1
 #define I2C_DEVICE              (I2CDEV_1)
 #define USE_I2C_PULLUP
 
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index e141d69ffa..c44f461412 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -100,7 +100,8 @@
 #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1)
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_ADC
 #define ADC_INSTANCE            ADC1
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index cd10384e3c..e0ad840930 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -44,6 +44,7 @@
 #define SERIAL_PORT_COUNT       2
 
 #define USE_I2C
+#define USE_I2C_DEVICE_1
 #define I2C_DEVICE              (I2CDEV_1)
 
 // #define SOFT_I2C // enable to test software i2c
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index 9cf92bd1a4..7c82523e6f 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -116,6 +116,7 @@
 #define SPI2_MOSI_PIN           PC3
 
 #define USE_I2C
+#define USE_I2C_DEVICE_3
 #define I2C_DEVICE              (I2CDEV_3)
 #define I2C3_SCL                PA8
 #define I2C3_SDA                PC9
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index cb7f26331e..ce232c883b 100755
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -99,13 +99,13 @@
 #define UART3_RX_PIN            PB11
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2)
-
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 #define I2C2_SCL_PIN            PA9
 #define I2C2_SDA_PIN            PA10
 
 #define USE_BST
-#define BST_DEVICE (BSTDEV_1)
+#define BST_DEVICE              (BSTDEV_1)
 /* Configure the CRC peripheral to use the polynomial x8 + x7 + x6 + x4 + x2 + 1 */
 #define BST_CRC_POLYNOM         0xD5
 
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index 39199d241f..63457ab391 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -129,6 +129,7 @@
 
 
 #define USE_I2C
+#define USE_I2C_DEVICE_2
 #define I2C_DEVICE              (I2CDEV_2)
 #define USE_I2C_PULLUP
 #define I2C2_SCL                PB10
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index 4c95f8959b..24cc5df743 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -135,10 +135,10 @@
 #define SOFTSERIAL1_TX_PIN      PB1
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // SDA (PB9/AF4), SCL (PB8/AF4)
-
-#define I2C1_SCL            PB8
-#define I2C1_SDA            PB9
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
+#define I2C1_SCL                PB8
+#define I2C1_SDA                PB9
 
 #define BOARD_HAS_VOLTAGE_DIVIDER
 #define USE_ADC
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index ae67882d9d..bd94c486c9 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -155,7 +155,8 @@
 #define SPI3_MOSI_PIN           PC12
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1)  // PB6-SCL, PB7-SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 #define USE_I2C_PULLUP
 #define I2C1_SCL                PB6
 #define I2C1_SDA                PB7
diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h
index ff108c7c8d..cb8862cb71 100644
--- a/src/main/target/FURYF7/target.h
+++ b/src/main/target/FURYF7/target.h
@@ -124,7 +124,8 @@
 #define SERIAL_PORT_COUNT       6 //VCP, USART1, USART3, USART6, SOFTSERIAL x 2
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1)  // PB6-SCL, PB7-SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 #define USE_I2C_PULLUP
 #define I2C1_SCL                PB6
 #define I2C1_SDA                PB7
diff --git a/src/main/target/IRCFUSIONF3/target.h b/src/main/target/IRCFUSIONF3/target.h
index 5ca1bbf336..2291bb78a7 100644
--- a/src/main/target/IRCFUSIONF3/target.h
+++ b/src/main/target/IRCFUSIONF3/target.h
@@ -63,7 +63,8 @@
 #define UART3_RX_PIN            PB11
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h
index fcd61d8334..105a194843 100644
--- a/src/main/target/ISHAPEDF3/target.h
+++ b/src/main/target/ISHAPEDF3/target.h
@@ -80,7 +80,8 @@
 #define SOFTSERIAL2_TX_PIN      PB1  // PWM 8
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 8c4deb0e6a..5f502aa880 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -114,15 +114,15 @@
 #define SPI3_MOSI_PIN           PC12
 
 #define USE_I2C
+#define USE_I2C_DEVICE_1
 #define I2C_DEVICE              (I2CDEV_1)
-//#define I2C_DEVICE_EXT          (I2CDEV_2)
 
 #define BOARD_HAS_VOLTAGE_DIVIDER
 #define USE_ADC
-#define VBAT_ADC_PIN           PC3
-#define VBAT_ADC_CHANNEL       ADC_Channel_13
+#define VBAT_ADC_PIN                PC3
+#define VBAT_ADC_CHANNEL            ADC_Channel_13
 
-#define CURRENT_METER_ADC_PIN  PC2
+#define CURRENT_METER_ADC_PIN       PC2
 #define CURRENT_METER_ADC_CHANNEL   ADC_Channel_12
 
 #define RSSI_ADC_PIN                PC1
diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h
index 01851f3d55..272c36db01 100644
--- a/src/main/target/KISSFC/target.h
+++ b/src/main/target/KISSFC/target.h
@@ -85,7 +85,8 @@
 #endif
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_ADC
 #define VBAT_SCALE_DEFAULT      160
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index 2f5b4af279..8540aaef4e 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -105,13 +105,14 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PC12
 
-
-
-/* #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1)  // PB6-SCL, PB7-SDA
+/* 
+#define USE_I2C
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 #define USE_I2C_PULLUP
 #define I2C1_SCL                PB6
-#define I2C1_SDA                PB7 */
+#define I2C1_SDA                PB7 
+*/
 
 #define USE_ADC
 #define BOARD_HAS_VOLTAGE_DIVIDER
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index 11425cfa80..9fc3dcad58 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -67,7 +67,8 @@
 #define SERIAL_PORT_COUNT       2
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2)
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 
 #define SPEKTRUM_BIND
 // USART2, PA3
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index e78417d1da..df7deaf56b 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -76,6 +76,7 @@
 #define UART3_RX_PIN            PB11 // PB11 (AF7)
 
 #define USE_I2C
+#define USE_I2C_DEVICE_2
 #define I2C_DEVICE              (I2CDEV_2)
 #define I2C2_SCL                PA9
 #define I2C2_SDA                PA10
diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h
index a03a113a1a..2b3d65b447 100755
--- a/src/main/target/MULTIFLITEPICO/target.h
+++ b/src/main/target/MULTIFLITEPICO/target.h
@@ -90,7 +90,8 @@
 */
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 6b99305e96..973b01a3d7 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -129,7 +129,8 @@
 #define UART3_TX_PIN            PB10
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2)
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 
 // #define SOFT_I2C // enable to test software i2c
 // #define SOFT_I2C_PB1011 // If SOFT_I2C is enabled above, need to define pinout as well (I2C1 = PB67, I2C2 = PB1011)
diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h
index 85aa854b13..406a7030c7 100644
--- a/src/main/target/NERO/target.h
+++ b/src/main/target/NERO/target.h
@@ -70,7 +70,8 @@
 #define SDCARD_DMA_CHANNEL                  DMA_CHANNEL_0
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1)
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_VCP
 //#define VBUS_SENSING_PIN PA8
diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h
index 3d4a472b84..6e8804aa6f 100644
--- a/src/main/target/NUCLEOF7/target.h
+++ b/src/main/target/NUCLEOF7/target.h
@@ -133,11 +133,10 @@
 #define SDCARD_DMA_CHANNEL                  DMA_CHANNEL_4
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1)
-#define I2C1_SCL PB8
-#define I2C1_SDA PB9
-
-//#define I2C_DEVICE_EXT (I2CDEV_2)
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE                  (I2CDEV_1)
+#define I2C1_SCL                    PB8
+#define I2C1_SDA                    PB9
 
 #define USE_ADC
 #define VBAT_ADC_PIN                PA3
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index d88c343d55..d43a2f705a 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -82,7 +82,8 @@
 
 #undef USE_I2C
 //#define USE_I2C
-//#define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA
+//#define USE_I2C_DEVICE_1
+//#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_ESCSERIAL
 #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 1e55afd7f3..68e37d297f 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -155,9 +155,6 @@
 #define SPI3_MISO_PIN           PC11
 #define SPI3_MOSI_PIN           PC12
 
-//#define USE_I2C
-//#define I2C_DEVICE (I2CDEV_1)
-
 #define USE_ADC
 #define CURRENT_METER_ADC_PIN   PC1
 #define VBAT_ADC_PIN            PC2
diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h
index fda731bb3c..3d9becdfaa 100644
--- a/src/main/target/RCEXPLORERF3/target.h
+++ b/src/main/target/RCEXPLORERF3/target.h
@@ -82,7 +82,8 @@
 #define UART3_RX_PIN            PB11 // PB11 (AF7)
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2) // SDA (PA10/AF4), SCL (PA9/AF4)
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 
 #define I2C2_SCL                PA9
 #define I2C2_SDA                PA10
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index 9c7c0c01a2..4cf0ab2740 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -176,6 +176,7 @@
 #define SPI3_MOSI_PIN           PC12
 
 #define USE_I2C
+#define USE_I2C_DEVICE_1
 #define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_ADC
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index 998f7ac0c2..c0db4ddf9d 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -76,6 +76,7 @@
 #define USE_SPI_DEVICE_2
 
 #define USE_I2C
+#define USE_I2C_DEVICE_3
 #define I2C_DEVICE (I2CDEV_3)
 
 #undef LED_STRIP
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index afe500fec6..4d600d3c41 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -103,7 +103,8 @@
 #define UART5_RX_PIN             PD2
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2) // SDA (PA14/AF4), SCL (PA15/AF4)
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 
 #define I2C2_SCL_GPIO            GPIOA
 #define I2C2_SCL_GPIO_AF         GPIO_AF_4
diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h
index dd9069e715..261293a32e 100644
--- a/src/main/target/SINGULARITY/target.h
+++ b/src/main/target/SINGULARITY/target.h
@@ -65,7 +65,8 @@
 #define SOFTSERIAL1_TX_PIN      PA3
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1 // PA4, 5, 6, 7
diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h
index a1c7f97f60..06180886cf 100644
--- a/src/main/target/SPARKY/target.h
+++ b/src/main/target/SPARKY/target.h
@@ -77,8 +77,8 @@
 // Note: PA5 and PA0 are N/C on the sparky - potentially use for ADC or LED STRIP?
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_2) // SDA (PA10/AF4), SCL (PA9/AF4)
-
+#define USE_I2C_DEVICE_2
+#define I2C_DEVICE              (I2CDEV_2)
 #define I2C2_SCL                PA9
 #define I2C2_SDA                PA10
 
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index a516a8f469..0b3c64e526 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -114,8 +114,8 @@
 #define SPI3_MOSI_PIN           PC12
 
 #define USE_I2C
+#define USE_I2C_DEVICE_1
 #define I2C_DEVICE              (I2CDEV_1)
-//#define I2C_DEVICE_EXT          (I2CDEV_2)
 
 #define USE_ADC
 #define VBAT_ADC_PIN            PC3
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index f369576eb2..f774fb6639 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -154,7 +154,8 @@
 #define UART3_RX_PIN            PB11 // PB11 (AF7)
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index 3fbf7f0e33..374eb1a66d 100755
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -92,7 +92,8 @@
 #define UART3_RX_PIN            PB11 // PB11 (AF7)
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1 // PB9,3,4,5 on AF5 SPI1 (MPU)
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index c859204012..1f1712e0b2 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -129,7 +129,8 @@
 #define MPU6500_SPI_INSTANCE             SPI1
 #else
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI_DEVICE_2 // PB12,13,14,15 on AF5
 
diff --git a/src/main/target/SPRACINGF3MINI/target.mk b/src/main/target/SPRACINGF3MINI/target.mk
index a46cf1be8f..386adddd92 100644
--- a/src/main/target/SPRACINGF3MINI/target.mk
+++ b/src/main/target/SPRACINGF3MINI/target.mk
@@ -7,7 +7,7 @@ TARGET_SRC = \
             drivers/barometer_bmp280.c \
             drivers/compass_ak8975.c \
             drivers/compass_hmc5883l.c \
-			drivers/compass_ak8963.c \
+            drivers/compass_ak8963.c \
             drivers/flash_m25p16.c \
             drivers/transponder_ir.c \
             drivers/transponder_ir_stm32f30x.c \
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index eba7318c4c..4cf44851d0 100755
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -78,7 +78,8 @@
 #define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1 // MPU
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index 7c4cdb2b21..ddc077ca0f 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -163,6 +163,7 @@
 #define UART3_RX_PIN            PB11 // PB11 (AF7)
 
 #define USE_I2C
+#define USE_I2C_DEVICE_1
 #define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_ADC
diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h
index 89aa9f696f..5ef82fcc5c 100644
--- a/src/main/target/VRRACE/target.h
+++ b/src/main/target/VRRACE/target.h
@@ -145,10 +145,11 @@
 #define SPI3_MOSI_PIN           PC12
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1)  // PB8-SCL, PB8-SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 #define USE_I2C_PULLUP
-#define I2C1_SCL             PB8
-#define I2C1_SDA             PB9
+#define I2C1_SCL                PB8
+#define I2C1_SDA                PB9
 */
 
 #define USE_ADC
diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h
index 585c8bfcdf..2c4b77a443 100644
--- a/src/main/target/X_RACERSPI/target.h
+++ b/src/main/target/X_RACERSPI/target.h
@@ -75,7 +75,8 @@
 #define SONAR_SOFTSERIAL1_EXCLUSIVE
 
 #define USE_I2C
-#define I2C_DEVICE              (I2CDEV_1) // PB6/SCL, PB7/SDA
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index 461af8aefd..c34fd98127 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -132,7 +132,8 @@
 
 
 #define USE_I2C
-#define I2C_DEVICE (I2CDEV_1) // SCL PB8 - SDA PB9
+#define USE_I2C_DEVICE_1
+#define I2C_DEVICE              (I2CDEV_1)
 
 // ADC inputs
 #define BOARD_HAS_VOLTAGE_DIVIDER