pbio/sys/hmi_pup: Add green light for USB connection.

laurensvalk · laurensvalk · commit d1d711f3bad7 · 2025-10-06T15:18:43.000+02:00
Makes it easy to see that a host has (automatically) opened a connection.

BLE advertising stops automatically.
diff --git a/lib/pbio/include/pbio/protocol.h b/lib/pbio/include/pbio/protocol.h
@@ -341,6 +341,12 @@ typedef enum {
      * @since Pybricks Profile v1.5.0
      */
     PBIO_PYBRICKS_STATUS_BATTERY_HIGH_TEMP_WARNING = 11,
+    /**
+     * Hub is connected to a host (like Pybricks Code) via USB.
+     *
+     * @since Pybricks Profile v1.5.0
+     */
+    PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED = 12,
     /** Total number of indications. */
     NUM_PBIO_PYBRICKS_STATUS,
 } pbio_pybricks_status_flags_t;
diff --git a/lib/pbio/sys/core.c b/lib/pbio/sys/core.c
@@ -5,6 +5,7 @@
 
 #include <pbdrv/bluetooth.h>
 #include <pbdrv/watchdog.h>
+#include <pbdrv/usb.h>
 
 #include <pbio/busy_count.h>
 #include <pbio/main.h>
@@ -38,10 +39,13 @@ PROCESS_THREAD(pbsys_system_process, ev, data) {
             pbsys_program_stop_poll();
             pbsys_status_light_poll();
 
-            // Revisit: Use pbio/sys/host callback to indicate connection changes.
-            if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)) {
+            // Revisit: Move to HMI process running parallel to user code.
+            if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
                 pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
             }
+            if (!pbdrv_usb_connection_is_active()) {
+                pbsys_status_clear(PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED);
+            }
 
             // keep the hub from resetting itself
             pbdrv_watchdog_update();
diff --git a/lib/pbio/sys/hmi_pup.c b/lib/pbio/sys/hmi_pup.c
@@ -14,6 +14,7 @@
 
 #include <pbdrv/bluetooth.h>
 #include <pbdrv/led.h>
+#include <pbdrv/usb.h>
 
 #include <pbio/button.h>
 #include <pbio/busy_count.h>
@@ -133,13 +134,25 @@ void pbsys_hmi_init(void) {
 void pbsys_hmi_deinit(void) {
     pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
     pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
+    pbsys_status_clear(PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED);
 
     #if PBIO_CONFIG_LIGHT_MATRIX
     pbio_busy_count_up();
     pbio_os_process_start(&boot_animation_process, boot_animation_process_boot_thread, (void *)false);
     #endif
 }
 
+/**
+ * Tests if the BLE or USB connection has changed.
+ *
+ * @return  @c true if the system status is different from the driver status. @c false if unchanged.
+ */
+static bool host_connection_changed(void) {
+    return
+        pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS) != pbsys_status_test(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED) ||
+        pbdrv_usb_connection_is_active() != pbsys_status_test(PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED);
+}
+
 /**
  * The HMI is a loop running the following steps:
  *
@@ -168,28 +181,36 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
         light_matrix_show_idle_ui(100);
         #endif
 
-        // Initialize Bluetooth depending on current state.
-        if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)) {
-            DEBUG_PRINT("Connected: yes\n");
+        // Update USB state.
+        DEBUG_PRINT("USB Connected: ");
+        if (pbdrv_usb_connection_is_active()) {
+            DEBUG_PRINT("Yes.\n");
+            pbsys_status_set(PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED);
+        } else {
+            DEBUG_PRINT("No.\n");
+            pbsys_status_clear(PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED);
+        }
+
+        // Update BLE state.
+        DEBUG_PRINT("BLE Connected: ");
+        if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
+            DEBUG_PRINT("Yes.\n");
             pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
-            pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
-            // No need to stop advertising since this is automatic.
         } else {
-            // Not connected right now.
-            DEBUG_PRINT("Connected: No\n");
+            DEBUG_PRINT("No.\n");
             pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
+        }
 
-            // Enable or disable advertising depending on user setting.
-            bool do_advertise = pbsys_storage_settings_bluetooth_enabled_get();
-            DEBUG_PRINT("Advertising is configured to be: %s. \n", do_advertise ? "on" : "off");
-            if (do_advertise) {
-                pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
-            } else {
-                pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
-            }
-            pbdrv_bluetooth_start_advertising(do_advertise);
-            PBIO_OS_AWAIT(state, &sub, pbdrv_bluetooth_await_advertise_or_scan_command(&sub, NULL));
+        // Advertise if BLE enabled and there is no host connection.
+        bool advertise = pbsys_storage_settings_bluetooth_enabled_get() && !pbsys_host_is_connected();
+        DEBUG_PRINT("BLE Advertising: %s. \n", advertise ? "on" : "off");
+        if (advertise) {
+            pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
+        } else {
+            pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
         }
+        pbdrv_bluetooth_start_advertising(advertise);
+        PBIO_OS_AWAIT(state, &sub, pbdrv_bluetooth_await_advertise_or_scan_command(&sub, NULL));
 
         // Buttons could be pressed at the end of the user program, so wait for
         // a release and then a new press, or until we have to exit early.
@@ -221,24 +242,24 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
             // Wait for button press, external program start, or connection change.
             pbdrv_button_get_pressed() ||
             pbsys_main_program_start_is_requested() ||
-            pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE) != pbsys_status_test(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
+            host_connection_changed();
         }));
 
         // Became connected or disconnected, so go back to handle it.
-        if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE) != pbsys_status_test(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED)) {
+        if (host_connection_changed()) {
             DEBUG_PRINT("Connection changed.\n");
             continue;
         }
 
-        // External progran request takes precedence over buttons.
+        // External program request takes precedence over buttons.
         if (pbsys_main_program_start_is_requested()) {
             DEBUG_PRINT("Start program from Pybricks Code.\n");
             break;
         }
 
         #if PBSYS_CONFIG_HMI_PUP_BLUETOOTH_BUTTON
-        // Toggle Bluetooth enable setting if Bluetooth button pressed. Only if disconnected.
-        if ((pbdrv_button_get_pressed() & PBSYS_CONFIG_HMI_PUP_BLUETOOTH_BUTTON) && !pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)) {
+        // Toggle Bluetooth enable setting if Bluetooth button pressed. Only when disconnected.
+        if ((pbdrv_button_get_pressed() & PBSYS_CONFIG_HMI_PUP_BLUETOOTH_BUTTON) && !pbsys_host_is_connected()) {
             pbsys_storage_settings_bluetooth_enabled_set(!pbsys_storage_settings_bluetooth_enabled_get());
             DEBUG_PRINT("Toggling Bluetooth to: %s. \n", pbsys_storage_settings_bluetooth_enabled_get() ? "on" : "off");
             continue;
diff --git a/lib/pbio/sys/light.c b/lib/pbio/sys/light.c
@@ -29,10 +29,11 @@ typedef enum {
 } pbsys_status_light_indication_warning_t;
 
 typedef enum {
-    PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_NONE,
-    PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_ADVERTISING,
-    PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_CONNECTED_IDLE,
-} pbsys_status_light_indication_ble_t;
+    PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_NONE,
+    PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_ADVERTISING,
+    PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_CONNECTED,
+    PBSYS_STATUS_LIGHT_INDICATION_USB_ACTIVE_BLE_ANY,
+} pbsys_status_light_indication_usb_ble_t;
 
 /** A single element of a status light indication pattern. */
 typedef struct {
@@ -95,12 +96,12 @@ pbsys_status_light_indication_pattern_warning[] = {
 
 static const pbsys_status_light_indication_pattern_element_t *const
 pbsys_status_light_indication_pattern_ble[] = {
-    [PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_NONE] =
+    [PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_NONE] =
         (const pbsys_status_light_indication_pattern_element_t[]) {
         PBSYS_STATUS_LIGHT_INDICATION_PATTERN_FOREVER(PBIO_COLOR_NONE),
     },
     // Two blue blinks, pause, then repeat.
-    [PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_ADVERTISING] =
+    [PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_ADVERTISING] =
         (const pbsys_status_light_indication_pattern_element_t[]) {
         { .color = PBIO_COLOR_BLUE, .duration = 2 },
         { .color = PBIO_COLOR_BLACK, .duration = 2 },
@@ -109,10 +110,15 @@ pbsys_status_light_indication_pattern_ble[] = {
         PBSYS_STATUS_LIGHT_INDICATION_PATTERN_REPEAT
     },
     // Blue, always on.
-    [PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_CONNECTED_IDLE] =
+    [PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_CONNECTED] =
         (const pbsys_status_light_indication_pattern_element_t[]) {
         PBSYS_STATUS_LIGHT_INDICATION_PATTERN_FOREVER(PBIO_COLOR_BLUE),
     },
+    // Green, always on.
+    [PBSYS_STATUS_LIGHT_INDICATION_USB_ACTIVE_BLE_ANY] =
+        (const pbsys_status_light_indication_pattern_element_t[]) {
+        PBSYS_STATUS_LIGHT_INDICATION_PATTERN_FOREVER(PBIO_COLOR_GREEN),
+    },
 };
 
 typedef struct {
@@ -198,23 +204,25 @@ void pbsys_status_light_handle_status_change(void) {
         warning_indication = PBSYS_STATUS_LIGHT_INDICATION_WARNING_LOW_VOLTAGE;
     }
 
-    // BLE pattern precedence.
-    pbsys_status_light_indication_ble_t ble_indication = PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_NONE;
-    if (pbsys_status_test(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING)) {
-        ble_indication = PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_ADVERTISING;
+    // USB/BLE pattern precedence.
+    pbsys_status_light_indication_usb_ble_t usb_ble_indication = PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_NONE;
+    if (pbsys_status_test(PBIO_PYBRICKS_STATUS_USB_HOST_CONNECTED)) {
+        usb_ble_indication = PBSYS_STATUS_LIGHT_INDICATION_USB_ACTIVE_BLE_ANY;
+    } else if (pbsys_status_test(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING)) {
+        usb_ble_indication = PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_ADVERTISING;
     } else if (pbsys_status_test(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED)
                #if !PBSYS_CONFIG_STATUS_LIGHT_BLUETOOTH
                // Hubs without Bluetooth light show idle state only when program not running.
                && !pbsys_status_test(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING)
                #endif
                ) {
-        ble_indication = PBSYS_STATUS_LIGHT_INDICATION_BLUETOOTH_BLE_CONNECTED_IDLE;
+        usb_ble_indication = PBSYS_STATUS_LIGHT_INDICATION_USB_NONE_BLE_CONNECTED;
     }
 
     // If the indication changed, then reset the indication pattern to the
     // beginning. Reset both so that patterns with the same length stay in sync.
-    if (ble_pattern_state->indication != ble_indication || warning_pattern_state->indication != warning_indication) {
-        ble_pattern_state->indication = ble_indication;
+    if (ble_pattern_state->indication != usb_ble_indication || warning_pattern_state->indication != warning_indication) {
+        ble_pattern_state->indication = usb_ble_indication;
         ble_pattern_state->pattern_index = ble_pattern_state->pattern_count = 0;
 
         warning_pattern_state->indication = warning_indication;
