8 files changed, 17 insertions(+), 8 deletions(-)

M module-bsp/board/rt1051/bellpx/hal/battery_charger/BatteryCharger.cpp
M module-services/service-evtmgr/EventManager.cpp
M products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp
M products/BellHybrid/apps/application-bell-alarm/include/application-bell-alarm/ApplicationBellAlarm.hpp
M products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
M products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp
M products/PurePhone/services/evtmgr/EventManager.cpp
M products/PurePhone/services/evtmgr/include/evtmgr/EventManager.hpp

@@ 17,7 17,6 @@ namespace hal::battery
         // Mocking initial state to make system run
         Store::Battery::modify().state = Store::Battery::State::Discharging;
         Store::Battery::modify().level = getBatteryVoltage();
-        eventsHandler.onStatusChanged();
     }
 
     int BatteryCharger::getBatteryVoltage()

@@ 233,7 233,6 @@ sys::ReturnCodes EventManagerCommon::DeinitHandler()
 
 void EventManagerCommon::ProcessCloseReason(sys::CloseReason closeReason)
 {
-    bsp::torch::turn(bsp::torch::State::off);
     sendCloseReadyMessage(this);
 }
 

@@ 26,8 26,9 @@ namespace app
                                                std::string parent,
                                                sys::phone_modes::PhoneMode mode,
                                                sys::bluetooth::BluetoothMode bluetoothMode,
-                                               StartInBackground startInBackground)
-        : Application(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground),
+                                               StartInBackground startInBackground,
+                                               uint32_t stackDepth)
+        : Application(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground, stackDepth),
           priv{std::make_unique<app::internal::BellAlarmPriv>()}
     {}
     ApplicationBellAlarm::~ApplicationBellAlarm() = default;

@@ 30,7 30,8 @@ namespace app
             std::string parent                          = "",
             sys::phone_modes::PhoneMode mode            = sys::phone_modes::PhoneMode::Offline,
             sys::bluetooth::BluetoothMode bluetoothMode = sys::bluetooth::BluetoothMode::Disabled,
-            StartInBackground startInBackground         = {false});
+            StartInBackground startInBackground         = {false},
+            std::uint32_t stackDepth                    = 8192);
 
         ~ApplicationBellAlarm() override;
         sys::ReturnCodes InitHandler() override;

@@ 19,8 19,9 @@ namespace app
                                              std::string parent,
                                              sys::phone_modes::PhoneMode mode,
                                              sys::bluetooth::BluetoothMode bluetoothMode,
-                                             StartInBackground startInBackground)
-        : Application(name, parent, mode, bluetoothMode, startInBackground)
+                                             StartInBackground startInBackground,
+                                             std::uint32_t stackDepth)
+        : Application(name, parent, mode, bluetoothMode, startInBackground, stackDepth)
     {
         bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);
         addActionReceiver(manager::actions::ShowAlarm, [this](auto &&data) {

@@ 24,7 24,8 @@ namespace app
             std::string parent                          = "",
             sys::phone_modes::PhoneMode mode            = sys::phone_modes::PhoneMode::Offline,
             sys::bluetooth::BluetoothMode bluetoothMode = sys::bluetooth::BluetoothMode::Disabled,
-            StartInBackground startInBackground         = {false});
+            StartInBackground startInBackground         = {false},
+            std::uint32_t stackDepth                    = 8192);
 
         sys::ReturnCodes InitHandler() override;
 

@@ 133,6 133,12 @@ void EventManager::toggleTorchColor()
     }
 }
 
+void EventManager::ProcessCloseReason(sys::CloseReason closeReason)
+{
+    bsp::torch::turn(bsp::torch::State::off);
+    EventManagerCommon::ProcessCloseReason(closeReason);
+}
+
 sys::MessagePointer EventManager::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
 {
 

@@ 20,6 20,7 @@ class EventManager : public EventManagerCommon
     sys::MessagePointer DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp) override;
     void toggleTorchOnOff();
     void toggleTorchColor();
+    void ProcessCloseReason(sys::CloseReason closeReason) override;
     void handleKeyEvent(sys::Message *msg) override;
     void handleKeyMoveEvent(RawKey key);