Move nullptr callbacks after end

Callbacks do need to be set to nullptr but only after the radio isn't at risk of calling callback. Unregister all callbacks incase a different radio type is started.
sparkfun · Jul 22, 2024 · 31a3069 · 31a3069
1 parent c142ce8
commit 31a3069
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Firmware/RTK_Everywhere/Bluetooth.ino b/Firmware/RTK_Everywhere/Bluetooth.ino
@@ -427,7 +427,6 @@ void bluetoothStart()
 // }
 
 // This function stops BT so that it can be restarted later
-// It also releases as many system resources as possible so that WiFi/caster is more stable
 void bluetoothStop()
 {
 #ifdef COMPILE_BT
@@ -438,22 +437,26 @@ void bluetoothStop()
             bluetoothSerialBle->flush(); // Complete any transfers
             bluetoothSerialBle->disconnect(); // Drop any clients
             bluetoothSerialBle->end(); // Release resources
+            bluetoothSerialBle->register_callback(nullptr);
 
             bluetoothSerialSpp->flush(); // Complete any transfers
             bluetoothSerialSpp->disconnect(); // Drop any clients
             bluetoothSerialSpp->end(); // Release resources
+            bluetoothSerialSpp->register_callback(nullptr);
         }
         else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP)
         {
             bluetoothSerialSpp->flush(); // Complete any transfers
             bluetoothSerialSpp->disconnect(); // Drop any clients
             bluetoothSerialSpp->end(); // Release resources
+            bluetoothSerialSpp->register_callback(nullptr);
         }
         else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_BLE)
         {
             bluetoothSerialBle->flush(); // Complete any transfers
             bluetoothSerialBle->disconnect(); // Drop any clients
             bluetoothSerialBle->end(); // Release resources
+            bluetoothSerialBle->register_callback(nullptr);
         }
 
         log_d("Bluetooth turned off");