diff --git a/src/main/target/AIKONF4/target.h b/src/main/target/AIKONF4/target.h index 09a3ded844..e806258324 100644 --- a/src/main/target/AIKONF4/target.h +++ b/src/main/target/AIKONF4/target.h @@ -65,7 +65,8 @@ #define M25P16_SPI_INSTANCE SPI2 #define USE_VCP -#define VBUS_SENSING_PIN PD2 +#define USE_USB_DETECT +#define USB_DETECT_PIN PD2 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h index dce1a29f41..b6e913aa91 100644 --- a/src/main/target/ANYFCF7/target.h +++ b/src/main/target/ANYFCF7/target.h @@ -60,7 +60,8 @@ #define USABLE_TIMER_CHANNEL_COUNT 16 #define USE_VCP -#define VBUS_SENSING_PIN PA8 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA8 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h index 48f01b4a4c..2b30e5ffad 100644 --- a/src/main/target/ANYFCM7/target.h +++ b/src/main/target/ANYFCM7/target.h @@ -56,7 +56,8 @@ #define USABLE_TIMER_CHANNEL_COUNT 16 #define USE_VCP -#define VBUS_SENSING_PIN PA8 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA8 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h index ad504de302..71931a35ac 100644 --- a/src/main/target/BEEROTORF4/target.h +++ b/src/main/target/BEEROTORF4/target.h @@ -73,8 +73,8 @@ #define SDCARD_DMA_CHANNEL 0 #define USE_VCP -#define VBUS_SENSING_ENABLED -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h index 284409ab97..4356a03ab6 100644 --- a/src/main/target/BETAFLIGHTF4/target.h +++ b/src/main/target/BETAFLIGHTF4/target.h @@ -68,7 +68,8 @@ #define USE_FLASH_M25P16 #define USE_VCP -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #define USE_UART1 diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h index 6db38ef4b0..568ba94aa1 100644 --- a/src/main/target/BLUEJAYF4/target.h +++ b/src/main/target/BLUEJAYF4/target.h @@ -97,8 +97,8 @@ #define USE_FLASH_M25P16 #define USE_VCP -//#define VBUS_SENSING_PIN PA8 -//#define VBUS_SENSING_ENABLED +//#define USB_DETECT_PIN PA8 +//#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h index d853b57273..a2107b72a4 100644 --- a/src/main/target/CLRACINGF4/target.h +++ b/src/main/target/CLRACINGF4/target.h @@ -87,7 +87,8 @@ #define USE_VCP -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h index 8baee5d641..bd9d65a544 100644 --- a/src/main/target/COLIBRI/target.h +++ b/src/main/target/COLIBRI/target.h @@ -70,7 +70,8 @@ #define USE_VCP -#define VBUS_SENSING_PIN PA9 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA9 #define USE_UART1 #define UART1_RX_PIN PB7 diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h index 548dab886f..3198bf781d 100644 --- a/src/main/target/F4BY/target.h +++ b/src/main/target/F4BY/target.h @@ -71,7 +71,8 @@ #define USE_VCP -#define VBUS_SENSING_PIN PA9 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA9 #define USE_UART1 #define UART1_RX_PIN PB7 diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h index f2f7262d33..5f921df328 100644 --- a/src/main/target/FF_FORTINIF4/target.h +++ b/src/main/target/FF_FORTINIF4/target.h @@ -96,8 +96,8 @@ /*-----------USB-UARTs-------------*/ #define USE_VCP -//#define VBUS_SENSING_PIN PA8 -//#define VBUS_SENSING_ENABLED +//#define USB_DETECT_PIN PA8 +//#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h index 6b30f7db79..dc6eda0319 100644 --- a/src/main/target/FF_PIKOF4/target.h +++ b/src/main/target/FF_PIKOF4/target.h @@ -101,8 +101,8 @@ /*-----------USB-UARTs-------------*/ #define USE_VCP -//#define VBUS_SENSING_PIN PA8 -//#define VBUS_SENSING_ENABLED +//#define USB_DETECT_PIN PA8 +//#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h index b05179cf61..845c8fcff1 100644 --- a/src/main/target/FISHDRONEF4/target.h +++ b/src/main/target/FISHDRONEF4/target.h @@ -51,8 +51,8 @@ // *************** UART ***************************** #define USE_VCP -#define VBUS_SENSING_PIN PA8 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PA8 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h index b03cd0edcc..57358509b3 100644 --- a/src/main/target/FRSKYF4/target.h +++ b/src/main/target/FRSKYF4/target.h @@ -68,7 +68,8 @@ #define SDCARD_DMA_CHANNEL 0 #define USE_VCP -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h index af43731fde..50c59a929d 100644 --- a/src/main/target/FURYF4/target.h +++ b/src/main/target/FURYF4/target.h @@ -119,8 +119,8 @@ #define M25P16_SPI_INSTANCE SPI3 #define USE_VCP -#define VBUS_SENSING_PIN PC5 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PC5 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h index 3da7203f4c..6f40ff371b 100644 --- a/src/main/target/FURYF7/target.h +++ b/src/main/target/FURYF7/target.h @@ -93,7 +93,8 @@ #define M25P16_SPI_INSTANCE SPI3 #define USE_VCP -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h index c9f29046b3..71a8a3034f 100644 --- a/src/main/target/KAKUTEF4/target.h +++ b/src/main/target/KAKUTEF4/target.h @@ -85,8 +85,8 @@ #define USE_FLASH_M25P16 #define USE_VCP -#define VBUS_SENSING_PIN PA8 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PA8 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h index 34d9bcdb74..4f835687dd 100644 --- a/src/main/target/KAKUTEF7/target.h +++ b/src/main/target/KAKUTEF7/target.h @@ -63,7 +63,8 @@ #define USE_EXTI #define USE_VCP -#define VBUS_SENSING_PIN PA8 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA8 #define USE_UART1 #define UART1_TX_PIN PA9 diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h index 8ba0cf4fc7..d20795dd72 100644 --- a/src/main/target/KIWIF4/target.h +++ b/src/main/target/KIWIF4/target.h @@ -106,8 +106,8 @@ #endif #define USE_VCP -#define VBUS_SENSING_PIN PC5 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PC5 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h index 42d79cecf9..b0d5b366df 100644 --- a/src/main/target/KROOZX/target.h +++ b/src/main/target/KROOZX/target.h @@ -95,7 +95,8 @@ #define CURRENT_METER_OFFSET_DEFAULT 0 #define USE_VCP -//#define VBUS_SENSING_PIN PA9 +#define USE_USB_DETECT +//#define USB_DETECT_PIN PA9 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h index 8e6c761315..2f59b18ed8 100644 --- a/src/main/target/MATEKF405/target.h +++ b/src/main/target/MATEKF405/target.h @@ -126,8 +126,8 @@ // *************** UART ***************************** #define USE_VCP -#define VBUS_SENSING_PIN PB12 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PB12 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/MATEKF411/target.h b/src/main/target/MATEKF411/target.h index c4aeef1f49..5e02edfa6d 100644 --- a/src/main/target/MATEKF411/target.h +++ b/src/main/target/MATEKF411/target.h @@ -73,8 +73,8 @@ // *************** UART ***************************** #define USE_VCP -#define VBUS_SENSING_PIN PC15 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PC15 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h index 952a0f688c..d0ec5f8333 100644 --- a/src/main/target/MATEKF722/target.h +++ b/src/main/target/MATEKF722/target.h @@ -110,8 +110,8 @@ #define MAX7456_SPI_CS_PIN PB10 // *************** UART ***************************** #define USE_VCP -#define VBUS_SENSING_PIN PB12 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PB12 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h index 0e6f6706dc..4307bca0a8 100644 --- a/src/main/target/MOTOLABF4/target.h +++ b/src/main/target/MOTOLABF4/target.h @@ -66,8 +66,8 @@ #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_VCP -//#define VBUS_SENSING_PIN PC15 -//#define VBUS_SENSING_ENABLED +//#define USB_DETECT_PIN PC15 +//#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h index 79ccff945e..ba4ed9dd26 100644 --- a/src/main/target/NERO/target.h +++ b/src/main/target/NERO/target.h @@ -73,8 +73,8 @@ #define I2C1_SDA PB9 #define USE_VCP -//#define VBUS_SENSING_PIN PA8 -//#define VBUS_SENSING_ENABLED +//#define USB_DETECT_PIN PA8 +//#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h index 354d1419a6..e8e77e55f0 100644 --- a/src/main/target/NOX/target.h +++ b/src/main/target/NOX/target.h @@ -59,7 +59,8 @@ #define MAX7456_RESTORE_CLK (SPI_CLOCK_FAST) #define USE_VCP -//#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +//#define USB_DETECT_PIN PC5 #define USE_UART1 #define UART1_RX_PIN PB7 diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h index cdda086fba..6468618ca7 100644 --- a/src/main/target/NUCLEOF7/target.h +++ b/src/main/target/NUCLEOF7/target.h @@ -58,7 +58,8 @@ #define USABLE_TIMER_CHANNEL_COUNT 16 #define USE_VCP -#define VBUS_SENSING_PIN PA9 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA9 //#define USE_UART1 //#define UART1_RX_PIN PA10 diff --git a/src/main/target/NUCLEOF722/target.h b/src/main/target/NUCLEOF722/target.h index c7afe68d71..16c5d2fa5b 100644 --- a/src/main/target/NUCLEOF722/target.h +++ b/src/main/target/NUCLEOF722/target.h @@ -58,7 +58,8 @@ #define USABLE_TIMER_CHANNEL_COUNT 11 #define USE_VCP -#define VBUS_SENSING_PIN PA9 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA9 //#define USE_UART1 //#define UART1_RX_PIN PA10 diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index c5f06f1d84..fd3f0b7c23 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -158,7 +158,8 @@ #endif // OMNIBUSF4 #define USE_VCP -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h index e2f14de48b..1a9f057fe6 100644 --- a/src/main/target/OMNIBUSF7/target.h +++ b/src/main/target/OMNIBUSF7/target.h @@ -115,7 +115,8 @@ //UARTS------------------------------------- #define USE_VCP -#define VBUS_SENSING_PIN PC4 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC4 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index 6021f01512..34baf7453d 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -183,9 +183,11 @@ #define USE_VCP #if defined(PODIUMF4) -#define VBUS_SENSING_PIN PA8 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA8 #else -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #endif #define USE_UART1 diff --git a/src/main/target/REVOLT/target.h b/src/main/target/REVOLT/target.h index 0a88c51d44..c295169fd5 100644 --- a/src/main/target/REVOLT/target.h +++ b/src/main/target/REVOLT/target.h @@ -161,7 +161,8 @@ #define VBAT_ADC_PIN PC2 #define USE_VCP -#define VBUS_SENSING_PIN PC5 +#define USE_USB_DETECT +#define USB_DETECT_PIN PC5 #define TARGET_IO_PORTA 0xffff diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h index 623ecfa226..215da27969 100644 --- a/src/main/target/REVONANO/target.h +++ b/src/main/target/REVONANO/target.h @@ -51,7 +51,8 @@ #define USE_MPU_DATA_READY_SIGNAL #define USE_VCP -//#define VBUS_SENSING_PIN PA9 +#define USE_USB_DETECT +//#define USB_DETECT_PIN PA9 #define USE_UART1 // Flexi Port #define UART1_RX_PIN PB7 diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h index 6a13df070c..7144f41a09 100644 --- a/src/main/target/SPARKY2/target.h +++ b/src/main/target/SPARKY2/target.h @@ -73,7 +73,8 @@ #define USE_FLASH_TOOLS #define USE_VCP -#define VBUS_SENSING_PIN PA8 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA8 #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/SPEEDYBEEF4/target.h b/src/main/target/SPEEDYBEEF4/target.h index 30705d1e1b..7241e0724c 100644 --- a/src/main/target/SPEEDYBEEF4/target.h +++ b/src/main/target/SPEEDYBEEF4/target.h @@ -91,8 +91,8 @@ // *************** UART ***************************** #define USE_VCP -#define VBUS_SENSING_PIN PB12 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PB12 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PA10 diff --git a/src/main/target/STM32F4DISCOVERY/target.h b/src/main/target/STM32F4DISCOVERY/target.h index fe4f69f1b0..5f5d7403a4 100644 --- a/src/main/target/STM32F4DISCOVERY/target.h +++ b/src/main/target/STM32F4DISCOVERY/target.h @@ -56,8 +56,8 @@ #define USE_VCP #define USB_MSC_BUTTON_PIN PA0 -#define VBUS_SENSING_PIN PA9 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PA9 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PB7 diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h index 3bd1aa8863..d4bec8c80c 100644 --- a/src/main/target/VRRACE/target.h +++ b/src/main/target/VRRACE/target.h @@ -89,8 +89,8 @@ */ #define USE_VCP -#define VBUS_SENSING_PIN PA9 -//#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PA9 +//#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PB7 diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h index bf96fc59e3..a7bcb363cc 100644 --- a/src/main/target/WORMFC/target.h +++ b/src/main/target/WORMFC/target.h @@ -66,8 +66,8 @@ #define INVERTER_PIN_UART3 PB12 #define USE_VCP -#define VBUS_SENSING_PIN PA9 -#define VBUS_SENSING_ENABLED +#define USB_DETECT_PIN PA9 +#define USE_USB_DETECT #define USE_UART1 #define UART1_RX_PIN PB7 diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h index 2ef0c3987e..c17935d0e2 100644 --- a/src/main/target/YUPIF7/target.h +++ b/src/main/target/YUPIF7/target.h @@ -48,7 +48,8 @@ // Serial ports #define USE_VCP -#define VBUS_SENSING_PIN PA8 +#define USE_USB_DETECT +#define USB_DETECT_PIN PA8 #define USE_UART1 #define UART1_RX_PIN PA10