Vibration settings 2

.gitignore

@@ -50,3 +50,5 @@ src/arm-none-eabi
 
 # clangd
 .cache/
+
+node_modules/

src/components/settings/Settings.h

@@ -34,6 +34,7 @@ namespace Pinetime {
         Orange,
         Pink
       };
+      enum class VibrationStrength : uint8_t { Weak = 15, Normal = 35, Strong = 75 };
       enum class PTSGaugeStyle : uint8_t { Full, Half, Numeric };
       enum class PTSWeather : uint8_t { On, Off };
 
@@ -298,6 +299,28 @@ namespace Pinetime {
         return bleRadioEnabled;
       };
 
+      void SetNotifVibration(VibrationStrength strength) {
+        if (strength != settings.notifVibration) {
+          settingsChanged = true;
+        }
+        settings.notifVibration = strength;
+      };
+
+      VibrationStrength GetNotifVibration() const {
+        return settings.notifVibration;
+      }
+
+      void SetChimeVibration(VibrationStrength strength) {
+        if (strength != settings.chimeVibration) {
+          settingsChanged = true;
+        }
+        settings.chimeVibration = strength;
+      };
+
+      VibrationStrength GetChimeVibration() const {
+        return settings.chimeVibration;
+      }
+
     private:
       Pinetime::Controllers::FS& fs;
 
@@ -325,6 +348,9 @@ namespace Pinetime {
         uint16_t shakeWakeThreshold = 150;
 
         Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
+
+        VibrationStrength notifVibration = VibrationStrength::Normal;
+        VibrationStrength chimeVibration = VibrationStrength::Normal;
       };
 
       SettingsData settings;

src/displayapp/DisplayApp.cpp

@@ -49,6 +49,8 @@
 #include "displayapp/screens/settings/SettingChimes.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
 #include "displayapp/screens/settings/SettingBluetooth.h"
+#include "displayapp/screens/settings/SettingNotifVibration.h"
+#include "displayapp/screens/settings/SettingChimeVibration.h"
 
 #include "libs/lv_conf.h"
 #include "UserApps.h"
@@ -372,7 +374,7 @@ void DisplayApp::Refresh() {
         } else {
           LoadNewScreen(Apps::Timer, DisplayApp::FullRefreshDirections::Up);
         }
-        motorController.RunForDuration(35);
+        motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetNotifVibration()));
         break;
       case Messages::AlarmTriggered:
         if (currentApp == Apps::Alarm) {
@@ -384,7 +386,7 @@ void DisplayApp::Refresh() {
         break;
       case Messages::ShowPairingKey:
         LoadNewScreen(Apps::PassKey, DisplayApp::FullRefreshDirections::Up);
-        motorController.RunForDuration(35);
+        motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetNotifVibration()));
         break;
       case Messages::TouchEvent: {
         if (state != States::Running) {
@@ -473,7 +475,7 @@ void DisplayApp::Refresh() {
         break;
       case Messages::Chime:
         LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
-        motorController.RunForDuration(35);
+        motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetChimeVibration()));
         break;
       case Messages::OnChargingEvent:
         motorController.RunForDuration(15);
@@ -563,6 +565,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               settingsController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Normal);
       break;
@@ -571,6 +574,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               settingsController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Preview);
       break;
@@ -623,6 +627,12 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
     case Apps::SettingBluetooth:
       currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController);
       break;
+    case Apps::SettingNotifVibration:
+      currentScreen = std::make_unique<Screens::SettingNotifVibration>(settingsController, motorController);
+      break;
+    case Apps::SettingChimeVibration:
+      currentScreen = std::make_unique<Screens::SettingChimeVibration>(settingsController, motorController);
+      break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(batteryController);
       break;

src/displayapp/apps/Apps.h.in

@@ -42,6 +42,8 @@ namespace Pinetime {
       SettingChimes,
       SettingShakeThreshold,
       SettingBluetooth,
+      SettingNotifVibration,
+      SettingChimeVibration,
       Error
     };
 

src/displayapp/screens/Notifications.cpp

@@ -14,6 +14,7 @@ Notifications::Notifications(DisplayApp* app,
                              Pinetime::Controllers::NotificationManager& notificationManager,
                              Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                              Pinetime::Controllers::MotorController& motorController,
+                             Pinetime::Controllers::Settings& settingsController,
                              System::SystemTask& systemTask,
                              Modes mode)
   : app {app},
@@ -44,7 +45,7 @@ Notifications::Notifications(DisplayApp* app,
     if (notification.category == Controllers::NotificationManager::Categories::IncomingCall) {
       motorController.StartRinging();
     } else {
-      motorController.RunForDuration(35);
+      motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetNotifVibration()));
     }
 
     timeoutLine = lv_line_create(lv_scr_act(), nullptr);

src/displayapp/screens/Notifications.h

@@ -25,6 +25,7 @@ namespace Pinetime {
                                Pinetime::Controllers::NotificationManager& notificationManager,
                                Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                Pinetime::Controllers::MotorController& motorController,
+                               Pinetime::Controllers::Settings& settingsController,
                                System::SystemTask& systemTask,
                                Modes mode);
         ~Notifications() override;

src/displayapp/screens/settings/SettingChimeVibration.cpp

@@ -0,0 +1,68 @@
+#include "displayapp/screens/settings/SettingChimeVibration.h"
+
+#include <lvgl/lvgl.h>
+
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  struct Option {
+    Pinetime::Controllers::Settings::VibrationStrength vibrationStrength;
+    const char* name;
+  };
+
+  constexpr std::array<Option, 3> options = {{
+    {Pinetime::Controllers::Settings::VibrationStrength::Weak, "Weak"},
+    {Pinetime::Controllers::Settings::VibrationStrength::Normal, "Normal"},
+    {Pinetime::Controllers::Settings::VibrationStrength::Strong, "Strong"},
+  }};
+
+  std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {
+    std::array<Pinetime::Applications::Screens::CheckboxList::Item, CheckboxList::MaxItems> optionArray;
+    for (size_t i = 0; i < CheckboxList::MaxItems; i++) {
+      if (i >= options.size()) {
+        optionArray[i].name = "";
+        optionArray[i].enabled = false;
+      } else {
+        optionArray[i].name = options[i].name;
+        optionArray[i].enabled = true;
+      }
+    }
+    return optionArray;
+  }
+
+  uint32_t GetDefaultOption(Pinetime::Controllers::Settings::VibrationStrength currentOption) {
+    for (size_t i = 0; i < options.size(); i++) {
+      if (options[i].vibrationStrength == currentOption) {
+        return i;
+      }
+    }
+    return 0;
+  }
+}
+
+SettingChimeVibration::SettingChimeVibration(Pinetime::Controllers::Settings& settingsController,
+                                             Pinetime::Controllers::MotorController& motorController)
+  : checkboxList(
+      0,
+      1,
+      "Chime strength",
+      Symbols::tachometer,
+      GetDefaultOption(settingsController.GetChimeVibration()),
+      [&settings = settingsController, &motor = motorController](uint32_t index) {
+        // Preview current setting
+        motor.RunForDuration(static_cast<uint8_t>(options[index].vibrationStrength));
+
+        settings.SetChimeVibration(options[index].vibrationStrength);
+        settings.SaveSettings();
+      },
+      CreateOptionArray()) {
+}
+
+SettingChimeVibration::~SettingChimeVibration() {
+  lv_obj_clean(lv_scr_act());
+}

src/displayapp/screens/settings/SettingChimeVibration.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <lvgl/lvgl.h>
+
+#include "components/settings/Settings.h"
+#include "components/motor/MotorController.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/CheckboxList.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingChimeVibration : public Screen {
+      public:
+        explicit SettingChimeVibration(Pinetime::Controllers::Settings& settingsController,
+                                       Pinetime::Controllers::MotorController& motorController);
+        ~SettingChimeVibration() override;
+
+      private:
+        CheckboxList checkboxList;
+      };
+    }
+  }
+}

src/displayapp/screens/settings/SettingNotifVibration.cpp

@@ -0,0 +1,67 @@
+#include "displayapp/screens/settings/SettingNotifVibration.h"
+
+#include <lvgl/lvgl.h>
+
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  struct Option {
+    Pinetime::Controllers::Settings::VibrationStrength vibrationStrength;
+    const char* name;
+  };
+
+  constexpr std::array<Option, 3> options = {{
+    {Pinetime::Controllers::Settings::VibrationStrength::Weak, "Weak"},
+    {Pinetime::Controllers::Settings::VibrationStrength::Normal, "Normal"},
+    {Pinetime::Controllers::Settings::VibrationStrength::Strong, "Strong"},
+  }};
+
+  std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {
+    std::array<Pinetime::Applications::Screens::CheckboxList::Item, CheckboxList::MaxItems> optionArray;
+    for (size_t i = 0; i < CheckboxList::MaxItems; i++) {
+      if (i >= options.size()) {
+        optionArray[i].name = "";
+        optionArray[i].enabled = false;
+      } else {
+        optionArray[i].name = options[i].name;
+        optionArray[i].enabled = true;
+      }
+    }
+    return optionArray;
+  }
+
+  uint32_t GetDefaultOption(Pinetime::Controllers::Settings::VibrationStrength currentOption) {
+    for (size_t i = 0; i < options.size(); i++) {
+      if (options[i].vibrationStrength == currentOption) {
+        return i;
+      }
+    }
+    return 0;
+  }
+}
+
+SettingNotifVibration::SettingNotifVibration(Pinetime::Controllers::Settings& settingsController,
+                                             Pinetime::Controllers::MotorController& motorController)
+  : checkboxList(
+      0,
+      1,
+      "Notif. strength",
+      Symbols::tachometer,
+      GetDefaultOption(settingsController.GetNotifVibration()),
+      [&settings = settingsController, &motor = motorController](uint32_t index) {
+        motor.RunForDuration(static_cast<uint8_t>(options[index].vibrationStrength));
+
+        settings.SetNotifVibration(options[index].vibrationStrength);
+        settings.SaveSettings();
+      },
+      CreateOptionArray()) {
+}
+
+SettingNotifVibration::~SettingNotifVibration() {
+  lv_obj_clean(lv_scr_act());
+}

src/displayapp/screens/settings/SettingNotifVibration.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+#include <lvgl/lvgl.h>
+
+#include "components/settings/Settings.h"
+#include "components/motor/MotorController.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/CheckboxList.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingNotifVibration : public Screen {
+      public:
+        explicit SettingNotifVibration(Pinetime::Controllers::Settings& settingsController,
+                                       Pinetime::Controllers::MotorController& motorController);
+        ~SettingNotifVibration() override;
+
+      private:
+        CheckboxList checkboxList;
+      };
+    }
+  }
+}

src/displayapp/screens/settings/Settings.h

@@ -43,10 +43,12 @@ namespace Pinetime {
           {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
 
           {Symbols::clock, "Chimes", Apps::SettingChimes},
+          {Symbols::tachometer, "Notif. str.", Apps::SettingNotifVibration},
+          {Symbols::tachometer, "Chime strength", Apps::SettingChimeVibration},
           {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
+
           {Symbols::check, "Firmware", Apps::FirmwareValidation},
           {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
-
           {Symbols::list, "About", Apps::SysInfo},
 
           // {Symbols::none, "None", Apps::None},