From f857a757a7184726093a7085cdb3d74b728a22e4 Mon Sep 17 00:00:00 2001
From: Mark Russell <mruss660@gmail.com>
Date: Thu, 16 Sep 2021 15:38:31 -0400
Subject: Fixes per Riksu9000's feedback

---
 src/components/alarm/AlarmController.cpp | 6 +++---
 src/components/alarm/AlarmController.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/components/alarm')

diff --git a/src/components/alarm/AlarmController.cpp b/src/components/alarm/AlarmController.cpp
index 2532a4a1..67ca05a9 100644
--- a/src/components/alarm/AlarmController.cpp
+++ b/src/components/alarm/AlarmController.cpp
@@ -43,11 +43,9 @@ void AlarmController::Init(System::SystemTask* systemTask) {
   this->systemTask = systemTask;
 }
 
-void AlarmController::SetAlarm(uint8_t alarmHr, uint8_t alarmMin) {
+void AlarmController::SetAlarmTime(uint8_t alarmHr, uint8_t alarmMin) {
   hours = alarmHr;
   minutes = alarmMin;
-  state = AlarmState::Set;
-  ScheduleAlarm();
 }
 
 void AlarmController::ScheduleAlarm() {
@@ -84,6 +82,8 @@ void AlarmController::ScheduleAlarm() {
   alarmTime = std::chrono::system_clock::from_time_t(std::mktime(tmAlarmTime));
   auto mSecToAlarm = std::chrono::duration_cast<std::chrono::milliseconds>(alarmTime - now).count();
   app_timer_start(alarmAppTimer, APP_TIMER_TICKS(mSecToAlarm), this);
+
+  state = AlarmState::Set;
 }
 
 uint32_t AlarmController::SecondsToAlarm() {
diff --git a/src/components/alarm/AlarmController.h b/src/components/alarm/AlarmController.h
index 7c43b89e..bf85d431 100644
--- a/src/components/alarm/AlarmController.h
+++ b/src/components/alarm/AlarmController.h
@@ -31,7 +31,8 @@ namespace Pinetime {
       AlarmController(Controllers::DateTime& dateTimeController);
 
       void Init(System::SystemTask* systemTask);
-      void SetAlarm(uint8_t alarmHr, uint8_t alarmMin);
+      void SetAlarmTime(uint8_t alarmHr, uint8_t alarmMin);
+      void ScheduleAlarm();
       void DisableAlarm();
       void SetOffAlarmNow();
       uint32_t SecondsToAlarm();
@@ -57,12 +58,11 @@ namespace Pinetime {
     private:
       Controllers::DateTime& dateTimeController;
       System::SystemTask* systemTask = nullptr;
-      uint8_t hours;
-      uint8_t minutes;
+      uint8_t hours = 7;
+      uint8_t minutes = 0;
       std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> alarmTime;
       AlarmState state = AlarmState::Not_Set;
       RecurType recurrence = RecurType::None;
-      void ScheduleAlarm();
     };
   }
 }
-- 
cgit v1.2.3-70-g09d2