pbio/sys/host: Test if connection is established.

Needed in other system code to test for shutdown when idle for some time while no connection is active.

Author: laurensvalk

lib/pbio/drv/usb/usb_ev3.c

@@ -534,6 +534,10 @@ void pbdrv_usb_tx_flush(void) {
     USBBufferFlush((tUSBBuffer *)&g_sTxBuffer);
 }
 
+bool pbdrv_usb_connection_is_active(void) {
+    return false;
+}
+
 PROCESS_THREAD(pbdrv_usb_process, ev, data) {
 
     PROCESS_BEGIN();

lib/pbio/drv/usb/usb_stm32.c

@@ -214,6 +214,10 @@ static void pbdrv_usb_stm32_reset_tx_state(void) {
     pbdrv_usb_stm32_is_events_subscribed = false;
 }
 
+bool pbdrv_usb_connection_is_active(void) {
+    return pbdrv_usb_stm32_is_events_subscribed;
+}
+
 /**
   * @brief  Pybricks_Itf_Init
   *         Initializes the Pybricks media low layer

lib/pbio/include/pbdrv/usb.h

@@ -62,6 +62,13 @@ uint32_t pbdrv_usb_stdout_tx_available(void);
 */
 bool pbdrv_usb_stdout_tx_is_idle(void);
 
+/**
+ * Indicates if a Pybricks app is connected and configured.
+ *
+ * @retval  true if active, so the host has subscribed to events.
+ */
+bool pbdrv_usb_connection_is_active(void);
+
 #else // PBDRV_CONFIG_USB
 
 static inline pbdrv_usb_bcd_t pbdrv_usb_get_bcd(void) {
@@ -80,6 +87,10 @@ static inline bool pbdrv_usb_stdout_tx_is_idle(void) {
     return true;
 }
 
+static inline bool pbdrv_usb_connection_is_active(void) {
+    return false;
+}
+
 #endif // PBDRV_CONFIG_USB
 
 #endif // _PBDRV_USB_H_

lib/pbio/include/pbsys/host.h

@@ -26,6 +26,7 @@ typedef bool (*pbsys_host_stdin_event_callback_t)(uint8_t c);
 #if PBSYS_CONFIG_HOST
 
 void pbsys_host_init(void);
+bool pbsys_host_is_connected(void);
 uint32_t pbsys_host_stdin_get_free(void);
 void pbsys_host_stdin_write(const uint8_t *data, uint32_t size);
 void pbsys_host_stdin_set_callback(pbsys_host_stdin_event_callback_t callback);
@@ -38,6 +39,7 @@ bool pbsys_host_tx_is_idle(void);
 #else // PBSYS_CONFIG_HOST
 
 #define pbsys_host_init()
+#define pbsys_host_is_connected() false
 #define pbsys_host_stdin_get_free() 0
 #define pbsys_host_stdin_write(data, size) { (void)(data); (void)(size); }
 #define pbsys_host_stdin_set_callback(callback) { (void)(callback); }

lib/pbio/sys/hmi.c

@@ -10,8 +10,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <contiki.h>
-
 #include <pbdrv/bluetooth.h>
 #include <pbdrv/clock.h>
 #include <pbdrv/core.h>
@@ -22,6 +20,7 @@
 #include <pbio/light.h>
 #include <pbio/os.h>
 #include <pbsys/config.h>
+#include <pbsys/host.h>
 #include <pbsys/main.h>
 #include <pbsys/status.h>
 #include <pbsys/storage_settings.h>
@@ -265,8 +264,7 @@ pbio_error_t pbsys_hmi_await_program_selection(void) {
         }
 
         // Don't time out while connected to host.
-        if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)) {
-            // REVISIT: This should ask sys/host for "is connected" so it covers all connection types.
+        if (pbsys_host_is_connected()) {
             time_start = pbdrv_clock_get_ms();
         }
 

lib/pbio/sys/host.c

@@ -22,6 +22,19 @@ void pbsys_host_init(void) {
     pbsys_bluetooth_init();
 }
 
+/**
+ * Tests if the hub is connected to the host with BLE or USB.
+ *
+ * Connected implies an active connection to a Pybricks app, not just
+ * physically plugged in.
+ *
+ * @return              @c true if connection is active, else @c false.
+ */
+bool pbsys_host_is_connected(void) {
+    return pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS) ||
+           pbdrv_usb_connection_is_active();
+}
+
 // Publisher APIs. Pybricks Profile connections call these to push data to
 // a common stdin buffer.