pbio/sys/hmi: Refactor program start logic.

Currently, the UI is split between sys/hmi and sys/bluetooth. This is the first step towards bringing the UI to one place and eliminating the pbsys/bluetooth layer. This will in turn support the clearer separation of the sys/host and ble/usb layers, which will be needed for proper USB support.

This intermediate result works but isn't identical yet to previous behavior. It currently toggles the advertising state but does not fully turn it off or save it persistently.

Author: laurensvalk

lib/pbio/include/pbdrv/bluetooth.h

@@ -417,6 +417,9 @@ static inline void pbdrv_bluetooth_queue_noop(pbio_task_t *task) {
 static inline void pbdrv_bluetooth_start_advertising(void) {
 }
 
+static inline void pbdrv_bluetooth_stop_advertising(void) {
+}
+
 static inline bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
     return false;
 }

lib/pbio/sys/bluetooth.c

@@ -311,52 +311,23 @@ PROCESS_THREAD(pbsys_bluetooth_process, ev, data) {
         etimer_set(&timer, 150);
         PROCESS_WAIT_EVENT_UNTIL(ev == PROCESS_EVENT_TIMER && etimer_expired(&timer));
 
-        // Wait until Bluetooth enabled requested by user, but stop waiting on shutdown.
-        // If storage is not yet loaded, this will wait for that too.
-        PROCESS_WAIT_UNTIL(pbsys_storage_settings_bluetooth_enabled() || pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST));
-        if (pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST)) {
-            break;
-        }
-
         // Enable Bluetooth.
         pbdrv_bluetooth_power_on(true);
         PROCESS_WAIT_UNTIL(pbdrv_bluetooth_is_ready());
 
-        // Start advertising, and show visual indicator on status light.
-        pbdrv_bluetooth_start_advertising();
-        pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
-
         // Now we are idle. We need to change the Bluetooth state and
         // indicators if a host connects to us, or a user program starts, or we
         // shut down, or Bluetooth is disabled by the user.
         PROCESS_WAIT_UNTIL(
             pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)
-            || pbsys_status_test(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING)
-            || pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST)
-            || !pbsys_storage_settings_bluetooth_enabled());
-
-        // Now change the state depending on which of the above was triggered.
-
-        // If connected, advertising stops automatically. Otherwise manually
-        // stop advertising (if the user code started using the button or we
-        // are shutting down or or BLE became disabled).
-        if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)) {
-            pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
-        } else {
-            pbdrv_bluetooth_stop_advertising();
-            pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED); // REVISIT: also via state...
-        }
-
-        // In all cases, clear the advertising flag to stop blinking.
-        pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
+            );
 
         PT_INIT(&status_monitor_pt);
 
         // The Bluetooth enabled flag can only change while disconnected and
         // while no program is running. So here it just serves to skip the
         // Bluetooth loop below and go directly to the disable step below it.
-        while (pbsys_storage_settings_bluetooth_enabled()
-               && pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)
+        while (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)
                && !pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST)) {
 
             if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PYBRICKS)) {
@@ -391,9 +362,6 @@ PROCESS_THREAD(pbsys_bluetooth_process, ev, data) {
             PROCESS_WAIT_EVENT();
         }
 
-        pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
-        pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
-
         reset_all();
         PROCESS_WAIT_WHILE(pbsys_status_test(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING));