Fix merge conflict.

2021-02-14 14:19:30 +01:00
parent 4c3803450e 1e2cc3ce91
commit 5fdfb2112e
10 changed files with 80 additions and 7 deletions
--- a/src/components/ble/NotificationManager.h
+++ b/src/components/ble/NotificationManager.h
@@ -28,6 +28,8 @@ namespace Pinetime {
      Notification GetPrevious(Notification::Id id);
      bool ClearNewNotificationFlag();
      bool AreNewNotificationsAvailable();
+      bool IsVibrationEnabled();
+      void ToggleVibrations();

      static constexpr size_t MaximumMessageSize() { return MessageSize; };
      size_t NbNotifications() const;
@@ -40,6 +42,7 @@ namespace Pinetime {
        uint8_t writeIndex = 0;
        bool empty = true;
        std::atomic<bool> newNotification{false};
+        bool vibrationEnabled = true;
    };
  }
 }