pbio/sys/hmi: Move bluetooth enable.

This completes the move of pulling the UI logic out of pbsys/bluetooth while ensuring that resetting Bluetooth happens at the same time as before.

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -603,7 +603,15 @@ void pbdrv_bluetooth_init(void) {
     nordic_spp_service_server_init(nordic_spp_packet_handler);
 }
 
+static bool pbdrv_bluetooth_powered_on;
+
 void pbdrv_bluetooth_power_on(bool on) {
+
+    if (pbdrv_bluetooth_powered_on == on) {
+        return;
+    }
+    pbdrv_bluetooth_powered_on = on;
+
     hci_power_control(on ? HCI_POWER_ON : HCI_POWER_OFF);
 
     // When powering off, cancel all pending tasks.
@@ -619,7 +627,7 @@ void pbdrv_bluetooth_power_on(bool on) {
 }
 
 bool pbdrv_bluetooth_is_ready(void) {
-    return hci_get_state() != HCI_STATE_OFF;
+    return hci_get_state() != HCI_STATE_OFF || !pbdrv_bluetooth_powered_on;
 }
 
 const char *pbdrv_bluetooth_get_hub_name(void) {

lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c

@@ -237,7 +237,15 @@ void pbdrv_bluetooth_init(void) {
     spi_init();
 }
 
+static bool pbdrv_bluetooth_powered_on;
+
 void pbdrv_bluetooth_power_on(bool on) {
+
+    if (pbdrv_bluetooth_powered_on == on) {
+        return;
+    }
+    pbdrv_bluetooth_powered_on = on;
+
     if (on) {
         process_start(&pbdrv_bluetooth_spi_process);
     } else {

lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c

@@ -262,7 +262,15 @@ void pbdrv_bluetooth_init(void) {
 
 // Public Bluetooth driver API implementation
 
+static bool pbdrv_bluetooth_powered_on;
+
 void pbdrv_bluetooth_power_on(bool on) {
+
+    if (pbdrv_bluetooth_powered_on == on) {
+        return;
+    }
+    pbdrv_bluetooth_powered_on = on;
+
     if (on) {
         process_start(&pbdrv_bluetooth_spi_process);
     } else {

lib/pbio/platform/prime_hub/pbdrvconfig.h

@@ -107,7 +107,7 @@
 #define PBDRV_CONFIG_SOUND_STM32_HAL_DAC            (1)
 
 #define PBDRV_CONFIG_UART                           (1)
-#define PBDRV_CONFIG_UART_DEBUG_FIRST_PORT          (0)
+#define PBDRV_CONFIG_UART_DEBUG_FIRST_PORT          (1)
 #define PBDRV_CONFIG_UART_STM32F4_LL_IRQ            (1)
 #define PBDRV_CONFIG_UART_STM32F4_LL_IRQ_NUM_UART   (6)
 

lib/pbio/sys/bluetooth.c

@@ -297,7 +297,6 @@ static PT_THREAD(pbsys_bluetooth_monitor_status(struct pt *pt)) {
 }
 
 PROCESS_THREAD(pbsys_bluetooth_process, ev, data) {
-    static struct etimer timer;
     static struct pt status_monitor_pt;
 
     PROCESS_BEGIN();
@@ -307,14 +306,6 @@ PROCESS_THREAD(pbsys_bluetooth_process, ev, data) {
 
     while (!pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST)) {
 
-        // make sure the Bluetooth chip is in reset long enough to actually reset
-        etimer_set(&timer, 150);
-        PROCESS_WAIT_EVENT_UNTIL(ev == PROCESS_EVENT_TIMER && etimer_expired(&timer));
-
-        // Enable Bluetooth.
-        pbdrv_bluetooth_power_on(true);
-        PROCESS_WAIT_UNTIL(pbdrv_bluetooth_is_ready());
-
         // 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.
@@ -363,11 +354,6 @@ PROCESS_THREAD(pbsys_bluetooth_process, ev, data) {
         }
 
         reset_all();
-        PROCESS_WAIT_WHILE(pbsys_status_test(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING));
-
-        // reset Bluetooth chip
-        pbdrv_bluetooth_power_on(false);
-        PROCESS_WAIT_WHILE(pbdrv_bluetooth_is_ready());
     }
 
     PROCESS_END();

lib/pbio/sys/hmi.c

@@ -155,17 +155,10 @@ static pbio_error_t pbsys_hmi_monitor_bluetooth_state(pbio_os_state_t *state) {
 
     PBIO_OS_ASYNC_BEGIN(state);
 
-    // FIXME: We can drop this once Bluetooth poweron-init is moved to pbdrv.
-    // It waits for Bluetooth to be ready before staring pbsys.
-    static pbio_os_timer_t timer;
-    if (pbdrv_clock_get_ms() < 1000) {
-        PBIO_OS_AWAIT_MS(state, &timer, 2000);
-    }
-
     for (;;) {
 
-        // No need to monitor buttons if connected, so just wait for program
-        // start or disconnect and then re-assess.
+        // No need to monitor Bluetooth button if connected, so just wait for
+        // program start or disconnect.
         if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)) {
             pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
             PBIO_OS_AWAIT_UNTIL(state,
@@ -175,16 +168,37 @@ static pbio_error_t pbsys_hmi_monitor_bluetooth_state(pbio_os_state_t *state) {
             if (pbsys_main_program_start_is_requested()) {
                 // Done, ready to run the program.
                 break;
-            } else {
-                // Disconnected, so start over.
-                continue;
             }
         }
 
-        // Begin advertising.
+        // Start with Bluetooth off.
+        pbdrv_bluetooth_power_on(false);
+        PBIO_OS_AWAIT_UNTIL(state, pbdrv_bluetooth_is_ready());
+        // Hack: this is a remnant of pbsys/bluetooth. It needs to be included
+        // in the pbdrv_bluetooth_power_on(false) once it is made awaitable.
+        static pbio_os_timer_t timer;
+        PBIO_OS_AWAIT_MS(state, &timer, 150);
+
+        // Since bluetooth is off, we just have to wait for a program start
+        // with the buttons or until Bluetooth is enabled with the button or as
+        // loaded from settings.
+        pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
+        PBIO_OS_AWAIT_WHILE(state, pbdrv_button_get_pressed());
+        PBIO_OS_AWAIT_UNTIL(state,
+            pbsys_storage_settings_bluetooth_enabled_get() ||
+            pbsys_hmi_bluetooth_button_is_pressed() ||
+            pbsys_main_program_start_is_requested()
+            );
+        if (pbsys_main_program_start_is_requested()) {
+            // Done, ready to run the program.
+            break;
+        }
+
+        // Enable bluetooth and begin advertising.
+        pbdrv_bluetooth_power_on(true);
+        PBIO_OS_AWAIT_UNTIL(state, pbdrv_bluetooth_is_ready());
         pbdrv_bluetooth_start_advertising();
         pbsys_storage_settings_bluetooth_enabled_set(true);
-        pbsys_status_clear(PBIO_PYBRICKS_STATUS_BLE_HOST_CONNECTED);
         pbsys_status_set(PBIO_PYBRICKS_STATUS_BLE_ADVERTISING);
 
         // Wait for connection, program run, or bluetooth toggle.
@@ -210,18 +224,6 @@ static pbio_error_t pbsys_hmi_monitor_bluetooth_state(pbio_os_state_t *state) {
 
         // Otherwise, we got here because the Bluetooth button was toggled.
         pbsys_storage_settings_bluetooth_enabled_set(false);
-
-        // Bluetooth is now off so we only have to wait for another button
-        // press or a program started with the buttons.
-        PBIO_OS_AWAIT_WHILE(state, pbdrv_button_get_pressed());
-        PBIO_OS_AWAIT_UNTIL(state,
-            pbsys_hmi_bluetooth_button_is_pressed() ||
-            pbsys_main_program_start_is_requested()
-            );
-        if (pbsys_main_program_start_is_requested()) {
-            // Done, ready to run the program.
-            break;
-        }
     }
 
     // Wait for all buttons to be released before starting under all conditions.