drv/bluetooth: turn off if not connected and user program runs

This turns off Bluetooth if a user program is started without Bluetooth
being already connected.

Fixes: pybricks/pybricks-micropython#11
Fixes: pybricks/support#137

Author: dlech

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -169,6 +169,7 @@ static void init_advertising_data() {
     gap_scan_response_set_data(sizeof(scan_resp_data), (uint8_t *)scan_resp_data);
 }
 
+// TODO: high-level Bluetooth management needs to be moved to pbsys/
 PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
     static struct etimer timer;
 
@@ -187,8 +188,9 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
         gap_advertisements_enable(true);
 
         // TODO: we should have a timeout and stop scanning eventually
+        // TODO: allow user programs to initiate BLE connections
         pbsys_status_set(PBSYS_STATUS_BLE_ADVERTISING);
-        PROCESS_WAIT_UNTIL(con_handle != HCI_CON_HANDLE_INVALID);
+        PROCESS_WAIT_UNTIL(con_handle != HCI_CON_HANDLE_INVALID || pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
         pbsys_status_clear(PBSYS_STATUS_BLE_ADVERTISING);
 
         for (;;) {
@@ -209,6 +211,7 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
         // reset Bluetooth chip
         hci_power_control(HCI_POWER_OFF);
         PROCESS_WAIT_UNTIL(hci_get_state() == HCI_STATE_OFF);
+        PROCESS_WAIT_WHILE(pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
     }
 
     PROCESS_END();

lib/pbio/drv/city_hub/bluetooth.c

@@ -1155,6 +1155,7 @@ static PT_THREAD(uart_service_send_data(struct pt *pt))
     PT_END(pt);
 }
 
+// TODO: high-level Bluetooth management needs to be moved to pbsys/
 PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
     static struct etimer timer;
     static struct pt child_pt;
@@ -1207,8 +1208,9 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
         PROCESS_PT_SPAWN(&child_pt, set_discoverable(&child_pt));
 
         // TODO: we should have a timeout and stop scanning eventually
+        // TODO: allow user programs to initiate BLE connections
         pbsys_status_set(PBSYS_STATUS_BLE_ADVERTISING);
-        PROCESS_WAIT_UNTIL(conn_handle != NO_CONNECTION);
+        PROCESS_WAIT_UNTIL(conn_handle != NO_CONNECTION || pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
         pbsys_status_clear(PBSYS_STATUS_BLE_ADVERTISING);
 
         etimer_set(&timer, clock_from_msec(500));
@@ -1231,6 +1233,7 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
 
         // reset Bluetooth chip
         bluetooth_reset(RESET_STATE_OUT_LOW);
+        PROCESS_WAIT_WHILE(pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
     }
 
     PROCESS_END();

lib/pbio/drv/move_hub/bluetooth.c

@@ -639,6 +639,7 @@ static PT_THREAD(uart_service_send_data(struct pt *pt))
     PT_END(pt);
 }
 
+// TODO: high-level Bluetooth management needs to be moved to pbsys/
 PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
     static struct etimer timer;
     static struct pt child_pt;
@@ -664,8 +665,9 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
         PROCESS_PT_SPAWN(&child_pt, set_discoverable(&child_pt));
 
         // TODO: we should have a timeout and stop scanning eventually
+        // TODO: allow user programs to initiate BLE connections
         pbsys_status_set(PBSYS_STATUS_BLE_ADVERTISING);
-        PROCESS_WAIT_UNTIL(conn_handle);
+        PROCESS_WAIT_UNTIL(conn_handle || pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
         pbsys_status_clear(PBSYS_STATUS_BLE_ADVERTISING);
 
         etimer_set(&timer, clock_from_msec(500));
@@ -688,6 +690,7 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
 
         // reset Bluetooth chip
         GPIOB->BRR = GPIO_BRR_BR_6;
+        PROCESS_WAIT_WHILE(pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
     }
 
     PROCESS_END();

lib/pbio/drv/technic_hub/bluetooth.c

@@ -1152,6 +1152,7 @@ static PT_THREAD(uart_service_send_data(struct pt *pt))
     PT_END(pt);
 }
 
+// TODO: high-level Bluetooth management needs to be moved to pbsys/
 PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
     static struct etimer timer;
     static struct pt child_pt;
@@ -1204,8 +1205,9 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
         PROCESS_PT_SPAWN(&child_pt, set_discoverable(&child_pt));
 
         // TODO: we should have a timeout and stop scanning eventually
+        // TODO: allow user programs to initiate BLE connections
         pbsys_status_set(PBSYS_STATUS_BLE_ADVERTISING);
-        PROCESS_WAIT_UNTIL(conn_handle != NO_CONNECTION);
+        PROCESS_WAIT_UNTIL(conn_handle != NO_CONNECTION || pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
         pbsys_status_clear(PBSYS_STATUS_BLE_ADVERTISING);
 
         etimer_set(&timer, clock_from_msec(500));
@@ -1228,6 +1230,7 @@ PROCESS_THREAD(pbdrv_bluetooth_hci_process, ev, data) {
 
         // reset Bluetooth chip
         bluetooth_reset(RESET_STATE_OUT_LOW);
+        PROCESS_WAIT_WHILE(pbsys_status_test(PBSYS_STATUS_USER_PROGRAM_RUNNING));
     }
 
     PROCESS_END();