From 17b5160727c071e4913a65d481ad12878a281532 Mon Sep 17 00:00:00 2001
From: cyberneel <neelesh.chevuri25@gmail.com>
Date: Sun, 24 Nov 2024 16:32:13 -0600
Subject: [PATCH] Undid some edits that were for testing

---
 src/components/infinisleep/InfiniSleepController.cpp | 2 ++
 src/components/infinisleep/InfiniSleepController.h   | 3 ++-
 src/displayapp/DisplayApp.cpp                        | 2 ++
 src/displayapp/screens/Sleep.cpp                     | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/infinisleep/InfiniSleepController.cpp b/src/components/infinisleep/InfiniSleepController.cpp
index 46361f65c9..d1b93e3664 100644
--- a/src/components/infinisleep/InfiniSleepController.cpp
+++ b/src/components/infinisleep/InfiniSleepController.cpp
@@ -196,7 +196,9 @@ void InfiniSleepController::SetOffGradualWakeNow() {
   // isGradualWakeAlerting = true;
 
   systemTask->PushMessage(System::Messages::SetOffGradualWake);
+}
 
+void InfiniSleepController::UpdateGradualWake() {
   // make sure graudal wake steps are possible
   while (gradualWakeStep > 0 && SecondsToWakeAlarm() <= gradualWakeSteps[gradualWakeStep - 1]) {
     gradualWakeStep--;
diff --git a/src/components/infinisleep/InfiniSleepController.h b/src/components/infinisleep/InfiniSleepController.h
index 21f318679e..69aa809004 100644
--- a/src/components/infinisleep/InfiniSleepController.h
+++ b/src/components/infinisleep/InfiniSleepController.h
@@ -40,6 +40,7 @@ namespace Pinetime {
       void EnableWakeAlarm();
       void SetOffWakeAlarmNow();
       void SetOffGradualWakeNow();
+      void UpdateGradualWake();
       uint32_t SecondsToWakeAlarm() const;
       void StopAlerting();
       // enum class RecurType { None, Daily, Weekdays };
@@ -164,7 +165,7 @@ namespace Pinetime {
 
       uint16_t GetSleepCycles() {
         uint16_t totalMinutes = GetTotalSleep();
-        return (totalMinutes * 100 / SLEEP_CYCLE_DURATION);
+        return (totalMinutes * 100 / infiniSleepSettings.sleepCycleDuration);
       }
 
       uint16_t GetTotalSleep() const {
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 877ea87832..c9be24ad7c 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -409,6 +409,8 @@ void DisplayApp::Refresh() {
         }
         motorController.RunForDuration(infiniSleepController.gradualWakeVibrationDurations[-1 + infiniSleepController.gradualWakeStep]);
 
+        infiniSleepController.UpdateGradualWake();
+
         NRF_LOG_INFO("Gradual wake triggered");
 
         break;
diff --git a/src/displayapp/screens/Sleep.cpp b/src/displayapp/screens/Sleep.cpp
index 638ffb210b..d2995cecfb 100644
--- a/src/displayapp/screens/Sleep.cpp
+++ b/src/displayapp/screens/Sleep.cpp
@@ -559,7 +559,7 @@ void Sleep::UpdateWakeAlarmTime() {
 void Sleep::SetAlerting() {
   lv_obj_set_hidden(enableSwitch, true);
   lv_obj_set_hidden(btnStop, false);
-  taskSnoozeWakeAlarm = lv_task_create(SnoozeAlarmTaskCallback, pdMS_TO_TICKS(5 * 1000), LV_TASK_PRIO_MID, this);
+  taskSnoozeWakeAlarm = lv_task_create(SnoozeAlarmTaskCallback, pdMS_TO_TICKS(120 * 1000), LV_TASK_PRIO_MID, this);
   motorController.StartAlarm();
   wakeLock.Lock();
 }