summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
authorjlukanc <27705324+jlukanc1@users.noreply.github.com>2021-01-15 22:49:37 -0500
committerjlukanc <27705324+jlukanc1@users.noreply.github.com>2021-01-15 22:49:37 -0500
commitb5992fd7ec369d057ce4fe1b10bbc52ed4f6f988 (patch)
treed52601ff23e020cc057e9b9625be2c7d4db387df /src/displayapp
parentce6c5d3bd3691b283ac2102d1ed7b9a298928b6c (diff)
add motor to notifs, fix tabs in motorcontroller.h
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/screens/Notifications.cpp4
-rw-r--r--src/displayapp/screens/Notifications.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 51a601c4..cfcecec2 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -7,6 +7,9 @@ Notifications::Notifications(DisplayApp *app, Pinetime::Controllers::Notificatio
Screen(app), notificationManager{notificationManager}, mode{mode} {
notificationManager.ClearNewNotificationFlag();
auto notification = notificationManager.GetLastNotification();
+
+ motorController.Init(); //start the vibration timer setups
+
if(notification.valid) {
currentId = notification.id;
currentItem.reset(new NotificationItem("\nNotification", notification.message.data(), notification.index, notificationManager.NbNotifications(), mode));
@@ -22,6 +25,7 @@ Notifications::Notifications(DisplayApp *app, Pinetime::Controllers::Notificatio
style_line.line.width = 3;
style_line.line.rounded = 0;
+ motorController.SetDuration(35);
timeoutLine = lv_line_create(lv_scr_act(), nullptr);
lv_line_set_style(timeoutLine, LV_LINE_STYLE_MAIN, &style_line);
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index f5c6a860..345ad15a 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -5,6 +5,7 @@
#include <memory>
#include "Screen.h"
#include "components/ble/NotificationManager.h"
+#include "components/motor/MotorController.h"
namespace Pinetime {
namespace Applications {
@@ -45,6 +46,7 @@ namespace Pinetime {
const char* text;
};
Pinetime::Controllers::NotificationManager& notificationManager;
+ Pinetime::Controllers::MotorController motorController;
Modes mode = Modes::Normal;
std::unique_ptr<NotificationItem> currentItem;
Controllers::NotificationManager::Notification::Id currentId;