pbio/drv/usb: Disable work in progress in release builds.

USB is not finished yet, so we'll disable the work-in-progress developments until it is ready for beta testing. This lets us proceed with beta releases to test other functionality.

Leaving it enabled without it actually working can cause unexpected lockups such as in lsusb or when writing stdout. Windows users may get notifications about Pybricks USB devices without it actually working or being documented yet.

Author: laurensvalk

lib/pbio/drv/usb/usb_stm32.c

@@ -152,6 +152,10 @@ void pbdrv_usb_stm32_handle_vbus_irq(bool active) {
  *                          if this platform does not support USB.
  */
 pbio_error_t pbdrv_usb_stdout_tx(const uint8_t *data, uint32_t *size) {
+    #if PBDRV_CONFIG_USB_CHARGE_ONLY
+    return PBIO_ERROR_NOT_IMPLEMENTED;
+    #endif
+
     uint8_t *ptr = usb_stdout_buf;
     uint32_t ptr_len = sizeof(usb_stdout_buf);
 
@@ -258,7 +262,7 @@ static USBD_StatusTypeDef Pybricks_Itf_TransmitCplt(uint8_t *Buf, uint32_t Len,
     return ret;
 }
 
-static USBD_Pybricks_ItfTypeDef USBD_Pybricks_fops = {
+USBD_Pybricks_ItfTypeDef USBD_Pybricks_fops = {
     .Init = Pybricks_Itf_Init,
     .DeInit = Pybricks_Itf_DeInit,
     .Receive = Pybricks_Itf_Receive,
@@ -272,11 +276,15 @@ void pbdrv_usb_init(void) {
     husbd.pData = &hpcd;
     hpcd.pData = &husbd;
 
+    #if PBDRV_CONFIG_USB_CHARGE_ONLY
+    USBD_Init(&husbd, NULL, 0);
+    #else
     USBD_Pybricks_Desc_Init();
     USBD_Init(&husbd, &USBD_Pybricks_Desc, 0);
     USBD_RegisterClass(&husbd, &USBD_Pybricks_ClassDriver);
     USBD_Pybricks_RegisterInterface(&husbd, &USBD_Pybricks_fops);
     USBD_Start(&husbd);
+    #endif
 
     process_start(&pbdrv_usb_process);
 
@@ -332,6 +340,11 @@ PROCESS_THREAD(pbdrv_usb_process, ev, data) {
             }
         }
 
+        #if PBDRV_CONFIG_USB_CHARGE_ONLY
+        // Communication logic skipped when charging only.
+        continue;
+        #endif
+
         if (pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN)) {
             if (pbio_oneshot(true, &pwrdn_oneshot)) {
                 USBD_Stop(&husbd);

lib/pbio/platform/essential_hub/pbdrvconfig.h

@@ -102,6 +102,7 @@
 #define PBDRV_CONFIG_USB_MFG_STR                    LEGO_USB_MFG_STR
 #define PBDRV_CONFIG_USB_PROD_STR                   LEGO_USB_PROD_STR_TECHNIC_SMALL_HUB " + Pybricks"
 #define PBDRV_CONFIG_USB_STM32F4                    (1)
+#define PBDRV_CONFIG_USB_CHARGE_ONLY                (1)
 
 #define PBDRV_CONFIG_STACK                          (1)
 #define PBDRV_CONFIG_STACK_EMBEDDED                 (1)

lib/pbio/platform/prime_hub/pbdrvconfig.h

@@ -119,6 +119,7 @@
 #define PBDRV_CONFIG_USB_PROD_STR                   LEGO_USB_PROD_STR_TECHNIC_LARGE_HUB " + Pybricks"
 #define PBDRV_CONFIG_USB_STM32F4                    (1)
 #define PBDRV_CONFIG_USB_STM32F4_HUB_VARIANT_ADDR   0x08007d80
+#define PBDRV_CONFIG_USB_CHARGE_ONLY                (1)
 
 #define PBDRV_CONFIG_STACK                          (1)
 #define PBDRV_CONFIG_STACK_EMBEDDED                 (1)