Adding resource CLI command to see whats in use.

src/main/drivers/resource.h

@@ -6,8 +6,6 @@ typedef enum {
     OWNER_PWMINPUT,
     OWNER_PPMINPUT,
     OWNER_PWMOUTPUT_MOTOR,
-    OWNER_PWMOUTPUT_FAST,
-    OWNER_PWMOUTPUT_ONESHOT,
     OWNER_PWMOUTPUT_SERVO,
     OWNER_SOFTSERIAL_RX,
     OWNER_SOFTSERIAL_TX,
@@ -23,7 +21,8 @@ typedef enum {
     OWNER_SYSTEM,
     OWNER_SDCARD,
     OWNER_FLASH,
-    OWNER_USB
+    OWNER_USB,
+    OWNER_BEEPER    
 } resourceOwner_t;
 
 // Currently TIMER should be shared resource (softserial dualtimer and timerqueue needs to allocate timer channel, but pin can be used for other function)
@@ -41,3 +40,4 @@ typedef enum {
     RESOURCE_I2C        = 1 << 7,
     RESOURCE_SPI        = 1 << 8,
 } resourceType_t;
+

src/main/drivers/serial_usb_vcp.c

@@ -24,6 +24,7 @@
 
 #include "build_config.h"
 #include "common/utils.h"
+#include "drivers/io.h"
 
 #include "usb_core.h"
 #ifdef STM32F4
@@ -178,11 +179,9 @@ serialPort_t *usbVcpOpen(void)
     vcpPort_t *s;
 
 #ifdef STM32F4
-	USBD_Init(&USB_OTG_dev,
-		USB_OTG_FS_CORE_ID,
-		&USR_desc,
-		&USBD_CDC_cb,
-		&USR_cb);
+    IOInit(IOGetByTag(IO_TAG(PA11)), OWNER_USB, RESOURCE_IO);
+    IOInit(IOGetByTag(IO_TAG(PA12)), OWNER_USB, RESOURCE_IO);
+	USBD_Init(&USB_OTG_dev, USB_OTG_FS_CORE_ID, &USR_desc, &USBD_CDC_cb, &USR_cb);
 #else
 	Set_System();
 	Set_USBClock();

src/main/drivers/sound_beeper.c

@@ -24,7 +24,7 @@
 #include "common/utils.h"
 
 #include "system.h"
-#include "gpio.h"
+#include "io.h"
 
 #include "sound_beeper.h"
 
@@ -61,7 +61,7 @@ void beeperInit(const beeperConfig_t *config)
 	beeperInverted = config->isInverted;
 
 	if (beeperIO) {
-		IOInit(beeperIO, OWNER_SYSTEM, RESOURCE_OUTPUT);
+		IOInit(beeperIO, OWNER_BEEPER, RESOURCE_OUTPUT);
 		IOConfigGPIO(beeperIO, config->isOD ? IOCFG_OUT_OD : IOCFG_OUT_PP);
 	}
 	systemBeep(false);

src/main/io/serial_cli.c

@@ -44,6 +44,8 @@
 #include "drivers/serial.h"
 #include "drivers/bus_i2c.h"
 #include "drivers/gpio.h"
+#include "drivers/io.h"
+#include "drivers/io_impl.h"
 #include "drivers/timer.h"
 #include "drivers/pwm_rx.h"
 #include "drivers/sdcard.h"
@@ -139,6 +141,7 @@ static void cliTasks(char *cmdline);
 #endif
 static void cliVersion(char *cmdline);
 static void cliRxRange(char *cmdline);
+static void cliResource(char *cmdline);
 
 #ifdef GPS
 static void cliGpsPassthrough(char *cmdline);
@@ -298,6 +301,7 @@ const clicmd_t cmdTable[] = {
     CLI_COMMAND_DEF("profile", "change profile",
         "[<index>]", cliProfile),
 	CLI_COMMAND_DEF("rateprofile", "change rate profile", "[<index>]", cliRateProfile),
+	CLI_COMMAND_DEF("resource", "view currently used resources", NULL, cliResource),
     CLI_COMMAND_DEF("rxrange", "configure rx channel ranges", NULL, cliRxRange),
     CLI_COMMAND_DEF("rxfail", "show/set rx failsafe settings", NULL, cliRxFail),
     CLI_COMMAND_DEF("save", "save and reboot", NULL, cliSave),
@@ -1860,6 +1864,10 @@ static void dumpValues(uint16_t valueSection)
         cliPrintf("set %s = ", valueTable[i].name);
         cliPrintVar(value, 0);
         cliPrint("\r\n");
+        
+#ifdef STM32F4
+        delayMicroseconds(1000);
+#endif
     }
 }
 
@@ -2993,6 +3001,48 @@ void cliProcess(void)
     }
 }
 
+const char * const ownerNames[] = {
+    "FREE",
+    "PWM IN",
+    "PPM IN",
+    "MOTOR",
+    "SERVO",
+    "SOFTSERIAL RX",
+    "SOFTSERIAL TX",
+    "SOFTSERIAL RXTX",        // bidirectional pin for softserial
+    "SOFTSERIAL AUXTIMER",    // timer channel is used for softserial. No IO function on pin
+    "ADC",
+    "SERIAL RX",
+    "SERIAL TX",
+    "SERIAL RXTX",
+    "PINDEBUG",
+    "TIMER",
+    "SONAR",
+    "SYSTEM",
+    "SDCARD",
+    "FLASH",
+    "USB",
+    "BEEPER",
+};
+
+static void cliResource(char *cmdline)
+{
+    UNUSED(cmdline);
+    cliPrintf("IO:\r\n");
+    for (unsigned i = 0; i < DEFIO_IO_USED_COUNT; i++) {
+        const char* owner;
+        char buff[15];
+        if (ioRecs[i].owner < ARRAYLEN(ownerNames)) {
+            owner = ownerNames[ioRecs[i].owner];
+        }
+        else {
+            sprintf(buff, "O=%d", ioRecs[i].owner);
+            owner = buff;
+        }
+        cliPrintf("%c%02d: %19s\r\n", IO_GPIOPortIdx(ioRecs + i) + 'A', IO_GPIOPinIdx(ioRecs + i), owner);
+    }
+}
+
 void cliInit(serialConfig_t *serialConfig)
 {
     UNUSED(serialConfig);

src/main/target/BLUEJAYF4/target.h

@@ -146,7 +146,7 @@
 #define TARGET_IO_PORTA 0xffff
 #define TARGET_IO_PORTB 0xffff
 #define TARGET_IO_PORTC 0xffff
-#define TARGET_IO_PORTD 0xffff
+#define TARGET_IO_PORTD (BIT(2))
 
 #define USED_TIMERS  ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) | TIM_N(9))
 #define TIMER_APB1_PERIPHERALS (RCC_APB1Periph_TIM2 | RCC_APB1Periph_TIM3 | RCC_APB1Periph_TIM5 | RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC)