Merge pull request #813 from SteveAmor/chimes

Chimes option

src/CMakeLists.txt

@@ -447,6 +447,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingSteps.cpp
         displayapp/screens/settings/SettingSetDate.cpp
         displayapp/screens/settings/SettingSetTime.cpp
+        displayapp/screens/settings/SettingChimes.cpp
 
         ## Watch faces
         displayapp/icons/bg_clock.c

src/components/datetime/DateTimeController.cpp

@@ -75,6 +75,24 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
   minute = time.minutes().count();
   second = time.seconds().count();
 
+  if (minute == 0 && !isHourAlreadyNotified) {
+    isHourAlreadyNotified = true;
+    if (systemTask != nullptr) {
+      systemTask->PushMessage(System::Messages::OnNewHour);
+    }
+  } else if (minute != 0) {
+    isHourAlreadyNotified = false;
+  }
+
+  if ((minute == 0 || minute == 30) && !isHalfHourAlreadyNotified) {
+    isHalfHourAlreadyNotified = true;
+    if (systemTask != nullptr) {
+      systemTask->PushMessage(System::Messages::OnNewHalfHour);
+    }
+  } else if (minute != 0 && minute != 30) {
+    isHalfHourAlreadyNotified = false;
+  }
+
   // Notify new day to SystemTask
   if (hour == 0 and not isMidnightAlreadyNotified) {
     isMidnightAlreadyNotified = true;
@@ -100,4 +118,3 @@ const char* DateTime::MonthShortToStringLow(Months month) {
 void DateTime::Register(Pinetime::System::SystemTask* systemTask) {
   this->systemTask = systemTask;
 }
-

src/components/datetime/DateTimeController.h

@@ -86,6 +86,8 @@ namespace Pinetime {
       std::chrono::seconds uptime {0};
 
       bool isMidnightAlreadyNotified = false;
+      bool isHourAlreadyNotified = true;
+      bool isHalfHourAlreadyNotified = true;
       System::SystemTask* systemTask = nullptr;
     };
   }

src/components/settings/Settings.h

@@ -11,6 +11,7 @@ namespace Pinetime {
     public:
       enum class ClockType : uint8_t { H24, H12 };
       enum class Notification : uint8_t { ON, OFF };
+      enum class ChimesOption : uint8_t { None, Hours, HalfHours };
       enum class WakeUpMode : uint8_t {
         SingleTap = 0,
         DoubleTap = 1,
@@ -40,6 +41,16 @@ namespace Pinetime {
         return settings.clockFace;
       };
 
+      void SetChimeOption(ChimesOption chimeOption) {
+        if (chimeOption != settings.chimesOption) {
+          settingsChanged = true;
+        }
+        settings.chimesOption = chimeOption;
+      };
+      ChimesOption GetChimeOption() const {
+        return settings.chimesOption;
+      };
+
       void SetPTSColorTime(Colors colorTime) {
         if (colorTime != settings.PTS.ColorTime)
           settingsChanged = true;
@@ -162,7 +173,7 @@ namespace Pinetime {
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0002;
+      static constexpr uint32_t settingsVersion = 0x0003;
       struct SettingsData {
         uint32_t version = settingsVersion;
         uint32_t stepsGoal = 10000;
@@ -172,6 +183,7 @@ namespace Pinetime {
         Notification notificationStatus = Notification::ON;
 
         uint8_t clockFace = 0;
+        ChimesOption chimesOption = ChimesOption::None;
 
         PineTimeStyle PTS;
 

src/displayapp/Apps.h

@@ -36,6 +36,7 @@ namespace Pinetime {
       SettingSteps,
       SettingSetDate,
       SettingSetTime,
+      SettingChimes,
       Error,
     };
   }

src/displayapp/DisplayApp.cpp

@@ -47,6 +47,7 @@
 #include "displayapp/screens/settings/SettingSteps.h"
 #include "displayapp/screens/settings/SettingSetDate.h"
 #include "displayapp/screens/settings/SettingSetTime.h"
+#include "displayapp/screens/settings/SettingChimes.h"
 
 #include "libs/lv_conf.h"
 
@@ -292,6 +293,9 @@ void DisplayApp::Refresh() {
         // Added to remove warning
         // What should happen here?
         break;
+      case Messages::Clock:
+        LoadApp(Apps::Clock, DisplayApp::FullRefreshDirections::None);
+        break;
     }
   }
 
@@ -415,6 +419,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
+    case Apps::SettingChimes:
+      currentScreen = std::make_unique<Screens::SettingChimes>(this, settingsController);
+      ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
+      break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);

src/displayapp/Messages.h

@@ -20,7 +20,8 @@ namespace Pinetime {
         DimScreen,
         RestoreBrightness,
         ShowPairingKey,
-        AlarmTriggered
+        AlarmTriggered,
+        Clock
       };
     }
   }

src/displayapp/screens/settings/SettingChimes.cpp

@@ -0,0 +1,96 @@
+#include "displayapp/screens/settings/SettingChimes.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t* obj, lv_event_t event) {
+    SettingChimes* screen = static_cast<SettingChimes*>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+  : Screen(app), settingsController {settingsController} {
+
+  lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+
+  lv_obj_set_pos(container1, 10, 60);
+  lv_obj_set_width(container1, LV_HOR_RES - 20);
+  lv_obj_set_height(container1, LV_VER_RES - 50);
+  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_text_static(title, "Chimes");
+  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 15);
+
+  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+  lv_label_set_text_static(icon, Symbols::clock);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+  optionsTotal = 0;
+  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text_static(cbOption[optionsTotal], " Off");
+  cbOption[optionsTotal]->user_data = this;
+  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
+  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::None) {
+    lv_checkbox_set_checked(cbOption[optionsTotal], true);
+  }
+
+  optionsTotal++;
+  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text_static(cbOption[optionsTotal], " Every hour");
+  cbOption[optionsTotal]->user_data = this;
+  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
+  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours) {
+    lv_checkbox_set_checked(cbOption[optionsTotal], true);
+  }
+
+  optionsTotal++;
+  cbOption[optionsTotal] = lv_checkbox_create(container1, nullptr);
+  lv_checkbox_set_text_static(cbOption[optionsTotal], " Every 30 mins");
+  cbOption[optionsTotal]->user_data = this;
+  lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
+  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours) {
+    lv_checkbox_set_checked(cbOption[optionsTotal], true);
+  }
+
+  optionsTotal++;
+}
+
+SettingChimes::~SettingChimes() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+void SettingChimes::UpdateSelected(lv_obj_t* object, lv_event_t event) {
+  if (event == LV_EVENT_VALUE_CHANGED) {
+    for (uint8_t i = 0; i < optionsTotal; i++) {
+      if (object == cbOption[i]) {
+        lv_checkbox_set_checked(cbOption[i], true);
+        if (i == 0) {
+          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::None);
+        }
+        if (i == 1) {
+          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::Hours);
+        }
+        if (i == 2) {
+          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::HalfHours);
+        }
+      } else {
+        lv_checkbox_set_checked(cbOption[i], false);
+      }
+    }
+  }
+}

src/displayapp/screens/settings/SettingChimes.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingChimes : public Screen {
+      public:
+        SettingChimes(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        ~SettingChimes() override;
+
+        void UpdateSelected(lv_obj_t* object, lv_event_t event);
+
+      private:
+        Controllers::Settings& settingsController;
+        uint8_t optionsTotal;
+        lv_obj_t* cbOption[2];
+      };
+    }
+  }
+}

src/displayapp/screens/settings/Settings.cpp

@@ -60,11 +60,12 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
 std::unique_ptr<Screen> Settings::CreateScreen3() {
 
   std::array<Screens::List::Applications, 4> applications {{
+
+    {Symbols::clock, "Chimes", Apps::SettingChimes},
     {Symbols::check, "Firmware", Apps::FirmwareValidation},
     {Symbols::list, "About", Apps::SysInfo},
-    {Symbols::none, "None", Apps::None},
     {Symbols::none, "None", Apps::None}
   }};
 
   return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
-}
+}

src/systemtask/Messages.h

@@ -21,6 +21,8 @@ namespace Pinetime {
         EnableSleeping,
         DisableSleeping,
         OnNewDay,
+        OnNewHour,
+        OnNewHalfHour,
         OnChargingEvent,
         OnPairing,
         SetOffAlarm,

src/systemtask/SystemTask.cpp

@@ -403,6 +403,26 @@ void SystemTask::Work() {
           // Remember we'll have to reset the counter next time we're awake
           stepCounterMustBeReset = true;
           break;
+        case Messages::OnNewHour:
+          using Pinetime::Controllers::AlarmController;
+          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours && alarmController.State() != AlarmController::AlarmState::Alerting) {
+            if (isSleeping && !isWakingUp) {
+              GoToRunning();
+              displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);
+            }
+            motorController.RunForDuration(35);
+          }
+          break;
+        case Messages::OnNewHalfHour:
+          using Pinetime::Controllers::AlarmController;
+          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours && alarmController.State() != AlarmController::AlarmState::Alerting) {
+            if (isSleeping && !isWakingUp) {
+              GoToRunning();
+              displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);
+            }
+            motorController.RunForDuration(35);
+          }
+          break;
         case Messages::OnChargingEvent:
           batteryController.ReadPowerState();
           motorController.RunForDuration(15);