dev: personal preferences

Author: vkareh

src/components/settings/Settings.h

@@ -359,7 +359,7 @@ namespace Pinetime {
       struct SettingsData {
         uint32_t version = settingsVersion;
         uint32_t stepsGoal = 10000;
-        uint32_t screenTimeOut = 15000;
+        uint32_t screenTimeOut = 10000;
 
         bool alwaysOnDisplay = false;
 
@@ -376,10 +376,10 @@ namespace Pinetime {
 
         WatchFaceInfineat watchFaceInfineat;
 
-        std::bitset<5> wakeUpMode {0};
-        uint16_t shakeWakeThreshold = 150;
+        std::bitset<5> wakeUpMode {0b10110};
+        uint16_t shakeWakeThreshold = 16;
 
-        Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
+        Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Low;
 
         bool dfuAndFsEnabledOnBoot = false;
         uint16_t heartRateBackgroundPeriod = std::numeric_limits<uint16_t>::max(); // Disabled by default

src/displayapp/screens/Alarm.cpp

@@ -159,8 +159,13 @@ static void switchEventHandler(lv_obj_t* obj, lv_event_t event) {
 Alarm::Alarm(Controllers::AlarmController& alarmController,
              Controllers::Settings::ClockType clockType,
              System::SystemTask& systemTask,
-             Controllers::MotorController& motorController)
-  : alarmController {alarmController}, wakeLock(systemTask), motorController {motorController}, clockType {clockType} {
+             Controllers::MotorController& motorController,
+             Controllers::Settings& settingsController)
+  : alarmController {alarmController},
+    wakeLock(systemTask),
+    motorController {motorController},
+    settingsController {settingsController},
+    clockType {clockType} {
 
   // Decide which UI to show
   if (alarmController.IsAlerting()) {
@@ -512,7 +517,7 @@ void Alarm::SetAlerting() {
   hourCounter.HideControls();
   minuteCounter.HideControls();
   lv_obj_set_hidden(btnStop, false);
-  taskStopAlarm = lv_task_create(StopAlarmTaskCallback, pdMS_TO_TICKS(60 * 1000), LV_TASK_PRIO_MID, this);
+  taskStopAlarm = lv_task_create(StopAlarmTaskCallback, pdMS_TO_TICKS(600 * 1000), LV_TASK_PRIO_MID, this);
   motorController.StartRinging();
   wakeLock.Lock();
 }
@@ -526,6 +531,13 @@ void Alarm::StopAlerting() {
   }
   wakeLock.Release();
   lv_indev_wait_release(lv_indev_get_act());
+
+  // Move out of sleep mode
+  if (settingsController.GetNotificationStatus() == Controllers::Settings::Notification::Sleep) {
+    settingsController.SetNotificationStatus(Controllers::Settings::Notification::On);
+  }
+
+  running = false; // Return to watchface on dismiss
 }
 
 void Alarm::SetSwitchState(lv_anim_enable_t anim) {

src/displayapp/screens/Alarm.h

@@ -34,7 +34,8 @@ namespace Pinetime {
         explicit Alarm(Controllers::AlarmController& alarmController,
                        Controllers::Settings::ClockType clockType,
                        System::SystemTask& systemTask,
-                       Controllers::MotorController& motorController);
+                       Controllers::MotorController& motorController,
+                       Controllers::Settings& settingsController);
         ~Alarm() override;
         void Refresh() override;
         void SetAlerting();
@@ -51,6 +52,7 @@ namespace Pinetime {
         Controllers::AlarmController& alarmController;
         System::WakeLock wakeLock;
         Controllers::MotorController& motorController;
+        Controllers::Settings& settingsController;
         Controllers::Settings::ClockType clockType;
 
         bool launcherMode = true;
@@ -104,7 +106,8 @@ namespace Pinetime {
         return new Screens::Alarm(controllers.alarmController,
                                   controllers.settingsController.GetClockType(),
                                   *controllers.systemTask,
-                                  controllers.motorController);
+                                  controllers.motorController,
+                                  controllers.settingsController);
       };
 
       static bool IsAvailable(Pinetime::Controllers::FS& /*filesystem*/) {

src/displayapp/screens/WatchFaceDigital.cpp

@@ -87,7 +87,7 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
   lv_label_set_text_static(stepIcon, Symbols::shoe);
   lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
-  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
+  taskRefresh = lv_task_create(RefreshTaskCallback, 500, LV_TASK_PRIO_MID, this);
   Refresh();
 }