Refactor USB toward generic target

- Move conditionals from pg/usb.c to common_defaults_post.h
- Add detectPin to usbDev_s.
- Bump PG version for usbDev_s.
- Add resource manipulation for USB_DETECT.

src/main/drivers/usb_io.c

@@ -30,9 +30,8 @@
 #include "usb_io.h"
 #include "sdcard.h"
 
-
 #ifdef USE_USB_DETECT
-static IO_t usbDetectPin = IO_NONE;
+static IO_t usbDetectPin;
 #endif
 
 void usbCableDetectDeinit(void)
@@ -47,9 +46,6 @@ void usbCableDetectDeinit(void)
 void usbCableDetectInit(void)
 {
 #ifdef USE_USB_DETECT
-#ifndef USB_DETECT_PIN
-#define USB_DETECT_PIN NONE
-#endif
     usbDetectPin = IOGetByTag(IO_TAG(USB_DETECT_PIN));
 
     IOInit(usbDetectPin, OWNER_USB_DETECT, 0);

src/main/interface/cli.c

@@ -3825,6 +3825,9 @@ const cliResourceValue_t resourceTable[] = {
     DEFS( OWNER_RX_SPI_CS,     PG_RX_SPI_CONFIG, rxSpiConfig_t, csnTag ),
 #endif
     DEFW( OWNER_GYRO_CS,       PG_GYRO_DEVICE_CONFIG, gyroDeviceConfig_t, csnTag, 2 ),
+#ifdef USE_USB_DETECT
+    DEFS( OWNER_USB_DETECT,    PG_USB_CONFIG, usbDev_t, detectPin ),
+#endif
 };
 
 #undef DEFS

src/main/pg/usb.c

@@ -20,28 +20,20 @@
 
 #include "platform.h"
 
-#if defined(USE_USB_ADVANCED_PROFILES)
+#ifdef USE_VCP
+
 #include "drivers/io.h"
 
 #include "pg/pg_ids.h"
 
 #include "usb.h"
 
-#if !defined(USB_MSC_BUTTON_PIN)
+PG_REGISTER_WITH_RESET_TEMPLATE(usbDev_t, usbDevConfig, PG_USB_CONFIG, 1);
-#define USB_MSC_BUTTON_PIN NONE
-#endif
-
-#if defined(USE_USB_MSC_BUTTON_IPU)
-#define MSC_BUTTON_IPU true
-#else
-#define MSC_BUTTON_IPU false
-#endif
-
-PG_REGISTER_WITH_RESET_TEMPLATE(usbDev_t, usbDevConfig, PG_USB_CONFIG, 0);
 
 PG_RESET_TEMPLATE(usbDev_t, usbDevConfig,
     .type = DEFAULT,
     .mscButtonPin = IO_TAG(USB_MSC_BUTTON_PIN),
     .mscButtonUsePullup = MSC_BUTTON_IPU,
+    .detectPin = IO_TAG(USB_DETECT_PIN),
 );
 #endif

src/main/pg/usb.h

@@ -33,6 +33,7 @@ typedef struct usbDev_s {
     uint8_t type;
     ioTag_t mscButtonPin;
     uint8_t mscButtonUsePullup;
+    ioTag_t detectPin;
 } usbDev_t;
 
 PG_DECLARE(usbDev_t, usbDevConfig);

src/main/target/common_defaults_post.h

@@ -257,3 +257,18 @@
 #else
 #define MAX_GYRODEV_COUNT 1
 #endif
+
+#ifdef USE_VCP
+#ifndef USB_DETECT_PIN
+#define USB_DETECT_PIN NONE
+#endif
+
+#ifndef USB_MSC_BUTTON_PIN
+#define USB_MSC_BUTTON_PIN NONE
+#endif
+#if defined(USE_USB_MSC_BUTTON_IPU) && !defined(MSC_BUTTON_IPU)
+#define MSC_BUTTON_IPU true
+#else
+#define MSC_BUTTON_IPU false
+#endif
+#endif