pbio/sys/hmi: Save bluetooth enabled setting persistently.

Author: laurensvalk

lib/pbio/include/pbsys/storage_settings.h

@@ -48,20 +48,20 @@ void pbsys_storage_settings_set_defaults(pbsys_storage_settings_t *settings);
 
 void pbsys_storage_settings_apply_loaded_settings(pbsys_storage_settings_t *settings);
 
-bool pbsys_storage_settings_bluetooth_enabled(void);
+bool pbsys_storage_settings_bluetooth_enabled_get(void);
 
-void pbsys_storage_settings_bluetooth_enabled_request_toggle(void);
+void pbsys_storage_settings_bluetooth_enabled_set(bool enable);
 
 #else
 
 static inline void pbsys_storage_settings_set_defaults(pbsys_storage_settings_t *settings) {
 }
 static inline void pbsys_storage_settings_apply_loaded_settings(pbsys_storage_settings_t *settings) {
 }
-static inline bool pbsys_storage_settings_bluetooth_enabled(void) {
+static inline bool pbsys_storage_settings_bluetooth_enabled_get(void) {
     return true;
 }
-static inline void pbsys_storage_settings_bluetooth_enabled_request_toggle(void) {
+static inline void pbsys_storage_settings_bluetooth_enabled_set(bool enable) {
 }
 
 #endif // PBSYS_CONFIG_STORAGE

lib/pbio/sys/hmi.c

@@ -183,6 +183,7 @@ static pbio_error_t pbsys_hmi_monitor_bluetooth_state(pbio_os_state_t *state) {
 
         // Begin advertising.
         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);
 
@@ -208,6 +209,8 @@ 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());

lib/pbio/sys/storage_settings.c

@@ -45,7 +45,7 @@ void pbsys_storage_settings_apply_loaded_settings(pbsys_storage_settings_t *sett
     #endif // PBIO_CONFIG_IMU
 }
 
-bool pbsys_storage_settings_bluetooth_enabled(void) {
+bool pbsys_storage_settings_bluetooth_enabled_get(void) {
     #if PBSYS_CONFIG_BLUETOOTH_TOGGLE
     pbsys_storage_settings_t *settings = pbsys_storage_settings_get_settings();
     if (!settings) {
@@ -56,30 +56,21 @@ bool pbsys_storage_settings_bluetooth_enabled(void) {
     return true;
     #endif // PBSYS_CONFIG_BLUETOOTH_TOGGLE
 }
-
-void pbsys_storage_settings_bluetooth_enabled_request_toggle(void) {
+void pbsys_storage_settings_bluetooth_enabled_set(bool enable) {
     #if PBSYS_CONFIG_BLUETOOTH_TOGGLE
     pbsys_storage_settings_t *settings = pbsys_storage_settings_get_settings();
 
-    // Ignore toggle request in all but idle system status.
-    if (!settings
-        || pbsys_status_test(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING)
-        || pbsys_status_test(PBIO_PYBRICKS_STATUS_POWER_BUTTON_PRESSED)
-        || pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN)
-        || pbsys_status_test(PBIO_PYBRICKS_STATUS_SHUTDOWN_REQUEST)
-        // Ignore toggle is Bluetooth is currently being used in a connection.
-        || pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_LE)
-        || pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PERIPHERAL)
-        // Ignore if last request not yet finished processing.
-        || pbsys_storage_settings_bluetooth_enabled() != pbdrv_bluetooth_is_ready()
-        ) {
+    bool current_value = pbsys_storage_settings_bluetooth_enabled_get();
+    if (enable == current_value) {
         return;
     }
 
-    // Toggle the user enabled state and poll process to take action.
-    settings->flags ^= PBSYS_STORAGE_SETTINGS_FLAGS_BLUETOOTH_ENABLED;
+    if (enable) {
+        settings->flags |= PBSYS_STORAGE_SETTINGS_FLAGS_BLUETOOTH_ENABLED;
+    } else {
+        settings->flags &= ~PBSYS_STORAGE_SETTINGS_FLAGS_BLUETOOTH_ENABLED;
+    }
     pbsys_storage_request_write();
-    pbsys_bluetooth_process_poll();
     #endif
 }
 

pybricks/common/pb_type_ble.c

@@ -561,7 +561,7 @@ mp_obj_t pb_type_BLE_new(mp_obj_t broadcast_channel_in, mp_obj_t observe_channel
 
     // Raise if Bluetooth is attempted to be used while not enabled.
     #if PBSYS_CONFIG_BLUETOOTH_TOGGLE
-    if (!pbsys_storage_settings_bluetooth_enabled() && (num_observe_channels > 0 || broadcast_channel_in != mp_const_none)) {
+    if (!pbsys_storage_settings_bluetooth_enabled_get() && (num_observe_channels > 0 || broadcast_channel_in != mp_const_none)) {
         mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Bluetooth not enabled"));
     }
     #endif // PBSYS_CONFIG_BLUETOOTH_TOGGLE

pybricks/iodevices/pb_type_iodevices_lwp3device.c

@@ -405,7 +405,7 @@ static mp_obj_t pb_type_pupdevices_Remote_make_new(const mp_obj_type_t *type, si
         PB_ARG_DEFAULT_INT(timeout, 10000));
 
     #if PBSYS_CONFIG_BLUETOOTH_TOGGLE
-    if (!pbsys_storage_settings_bluetooth_enabled()) {
+    if (!pbsys_storage_settings_bluetooth_enabled_get()) {
         mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Bluetooth not enabled"));
     }
     #endif // PBSYS_CONFIG_BLUETOOTH_TOGGLE

pybricks/iodevices/pb_type_iodevices_xbox_controller.c

@@ -288,7 +288,7 @@ static mp_obj_t pb_type_xbox_make_new(const mp_obj_type_t *type, size_t n_args,
         );
 
     #if PBSYS_CONFIG_BLUETOOTH_TOGGLE
-    if (!pbsys_storage_settings_bluetooth_enabled()) {
+    if (!pbsys_storage_settings_bluetooth_enabled_get()) {
         mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("Bluetooth not enabled"));
     }
     #endif // PBSYS_CONFIG_BLUETOOTH_TOGGLE