6 files changed, 18 insertions(+), 9 deletions(-)

M module-apps/application-settings/ApplicationSettings.cpp
M module-apps/application-settings/windows/bluetooth/PhoneNameWindow.cpp
M module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp
M module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.cpp
M module-services/service-bluetooth/ServiceBluetooth.cpp
M module-services/service-bluetooth/service-bluetooth/ServiceBluetooth.hpp

@@ 398,8 398,8 @@ namespace app
         windowsFactory.attach(gui::window::name::all_devices, [this](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::AllDevicesWindow>(app, bluetoothSettingsModel);
         });
-        windowsFactory.attach(gui::window::name::phone_name, [](ApplicationCommon *app, const std::string &name) {
-            return std::make_unique<gui::PhoneNameWindow>(app);
+        windowsFactory.attach(gui::window::name::phone_name, [this](ApplicationCommon *app, const std::string &name) {
+            return std::make_unique<gui::PhoneNameWindow>(app, bluetoothSettingsModel);
         });
         windowsFactory.attach(gui::window::name::bluetooth_check_passkey,
                               [](ApplicationCommon *app, const std::string &name) {

@@ 10,9 10,10 @@
 
 namespace gui
 {
-    PhoneNameWindow::PhoneNameWindow(app::ApplicationCommon *app) : AppWindow(app, gui::window::name::phone_name)
+    PhoneNameWindow::PhoneNameWindow(app::ApplicationCommon *app,
+                                     std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel)
+        : AppWindow(app, gui::window::name::phone_name), bluetoothSettingsModel(bluetoothSettingsModel)
     {
-        bluetoothSettingsModel = std::make_unique<BluetoothSettingsModel>(application);
         bluetoothSettingsModel->requestDeviceName();
         buildInterface();
     }

@@ 10,7 10,7 @@ namespace gui
     class PhoneNameWindow : public AppWindow
     {
       public:
-        explicit PhoneNameWindow(app::ApplicationCommon *app);
+        PhoneNameWindow(app::ApplicationCommon *app, std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel);
 
       private:
         void buildInterface() override;


@@ 19,7 19,7 @@ namespace gui
         auto onInput(const InputEvent &inputEvent) -> bool override;
 
         Text *inputField = nullptr;
-        std::unique_ptr<BluetoothSettingsModel> bluetoothSettingsModel;
+        std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel;
 
         static constexpr auto maxNameLength = 248; // Max 248 bytes according to Bluetooth Core Specification v5.2
     };

@@ 138,7 138,7 @@ namespace bluetooth
                 LOG_INFO("Your initscripts is for %s chipset",
                          btstack_chipset_cc256x_lmp_subversion() < lmp_subversion ? "an older" : "a newer");
                 LOG_INFO("Please update Makefile to include the appropriate bluetooth_init_cc256???.c file");
-                exit(10);
+                return;
             }
             LOG_INFO("Using 921600 baud");
             config.baudrate_main = 921600;

@@ 46,6 46,8 @@ namespace
     constexpr auto BluetoothServiceStackDepth = 2560U;
     inline constexpr auto nameSettings        = "ApplicationSettings";
     inline constexpr auto connectionTimeout   = std::chrono::minutes{30};
+    inline constexpr auto btRestartDelay      = std::chrono::milliseconds{500};
+
 } // namespace
 
 ServiceBluetooth::ServiceBluetooth() : sys::Service(service::name::bluetooth, "", BluetoothServiceStackDepth)


@@ 268,7 270,13 @@ auto ServiceBluetooth::handle(message::bluetooth::SetDeviceName *msg) -> std::sh
     bluetooth::set_name(newName);
     settingsHolder->setValue(bluetooth::Settings::DeviceName, newName);
     sendWorkerCommand(bluetooth::Command(bluetooth::Command::Type::PowerOff));
-    sendWorkerCommand(bluetooth::Command(bluetooth::Command::Type::PowerOn));
+
+    btRestartTimer =
+        sys::TimerFactory::createSingleShotTimer(this, "btRestartTimer", btRestartDelay, [this](sys::Timer &_) {
+            sendWorkerCommand(bluetooth::Command(bluetooth::Command::Type::PowerOn));
+        });
+    btRestartTimer.start();
+
     return sys::MessageNone{};
 }
 

@@ 80,7 80,7 @@ class ServiceBluetooth : public sys::Service
   private:
     std::unique_ptr<BluetoothWorker> worker;
     std::shared_ptr<sys::CpuSentinel> cpuSentinel;
-    sys::TimerHandle connectionTimeoutTimer;
+    sys::TimerHandle connectionTimeoutTimer, btRestartTimer;
     std::shared_ptr<BluetoothDevicesModel> bluetoothDevicesModel{};
 
     void startTimeoutTimer();