3 files changed, 12 insertions(+), 2 deletions(-)

M products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
M products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
M products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp

@@ 107,6 107,7 @@ namespace app::home_screen
     }
     void HomeScreenPresenter::handleAlarmModelReady()
     {
+        setStartupAlarmState();
         getView()->setAlarmTime(alarmModel->getAlarmTime());
         stateController->handleAlarmModelReady();
     }


@@ 145,4 146,13 @@ namespace app::home_screen
     {
         return latchPressed;
     }
+
+    void HomeScreenPresenter::setStartupAlarmState()
+    {
+        static auto isStartup = true;
+        if (isStartup) {
+            alarmModel->activate(!latchPressed);
+            isStartup = false;
+        }
+    }
 } // namespace app::home_screen

@@ 149,6 149,8 @@ namespace app::home_screen
         std::unique_ptr<ProgressTimerWithSnoozeTimer> snoozeTimer;
         bool latchPressed = false;
 
+        void setStartupAlarmState();
+
         static constexpr auto timerName = "HS_timer";
         static constexpr auto snoozeTick = std::chrono::seconds(1);
     };

@@ 83,7 83,6 @@ namespace app::home_screen
                 alarmModel.setDefaultAlarmTime();
                 view.setAlarmTime(alarmModel.getAlarmTime());
             };
-            auto isDeepPress = [](AbstractPresenter &presenter) -> bool { return presenter.isStartupDeepPress(); };
         } // namespace Helpers
 
         namespace Events


@@ 289,7 288,6 @@ namespace app::home_screen
 
                                              "Deactivated"_s + sml::on_entry<_> / Deactivated::entry,
                                              "Deactivated"_s + event<Events::Reset> = "Init"_s,
-                                             "Deactivated"_s [Helpers::isDeepPress] = "DeactivatedWait"_s,
                                              "Deactivated"_s + event<Events::LightPress>/ Helpers::switchToMenu,
                                              "Deactivated"_s + event<Events::RotateLeftPress> / Helpers::makeAlarmEditable = "DeactivatedEdit"_s,
                                              "Deactivated"_s + event<Events::RotateRightPress> / Helpers::makeAlarmEditable = "DeactivatedEdit"_s,