add motor to notifs, fix tabs in motorcontroller.h
This commit is contained in:
parent
ce6c5d3bd3
commit
b5992fd7ec
|
@ -7,50 +7,50 @@ namespace Pinetime {
|
|||
static constexpr uint8_t pinMotor = 16;
|
||||
|
||||
class MotorController {
|
||||
public:
|
||||
void Init();
|
||||
void SetDuration(uint8_t motorDuration);
|
||||
#ifndef NRF_CLOCK_ENABLED
|
||||
#define NRF_CLOCK_ENABLED 1
|
||||
#endif
|
||||
public:
|
||||
void Init();
|
||||
void SetDuration(uint8_t motorDuration);
|
||||
#ifndef NRF_CLOCK_ENABLED
|
||||
#define NRF_CLOCK_ENABLED 1
|
||||
#endif
|
||||
|
||||
#ifndef CLOCK_CONFIG_LF_SRC
|
||||
#define CLOCK_CONFIG_LF_SRC 1
|
||||
#endif
|
||||
#ifndef CLOCK_CONFIG_LF_SRC
|
||||
#define CLOCK_CONFIG_LF_SRC 1
|
||||
#endif
|
||||
|
||||
#ifndef CLOCK_CONFIG_IRQ_PRIORITY
|
||||
#define CLOCK_CONFIG_IRQ_PRIORITY 6
|
||||
#endif
|
||||
#ifndef CLOCK_CONFIG_IRQ_PRIORITY
|
||||
#define CLOCK_CONFIG_IRQ_PRIORITY 6
|
||||
#endif
|
||||
|
||||
#define APP_TIMER_ENABLED 1
|
||||
#define APP_TIMER_CONFIG_RTC_FREQUENCY 15 //2048hz
|
||||
#define APP_TIMER_CONFIG_IRQ_PRIORITY 6
|
||||
#define APP_TIMER_ENABLED 1
|
||||
#define APP_TIMER_CONFIG_RTC_FREQUENCY 15 //2048hz
|
||||
#define APP_TIMER_CONFIG_IRQ_PRIORITY 6
|
||||
|
||||
#ifndef APP_TIMER_CONFIG_OP_QUEUE_SIZE
|
||||
#define APP_TIMER_CONFIG_OP_QUEUE_SIZE 10
|
||||
#endif
|
||||
#ifndef APP_TIMER_CONFIG_OP_QUEUE_SIZE
|
||||
#define APP_TIMER_CONFIG_OP_QUEUE_SIZE 10
|
||||
#endif
|
||||
|
||||
#ifndef APP_TIMER_CONFIG_USE_SCHEDULER
|
||||
#define APP_TIMER_CONFIG_USE_SCHEDULER 0
|
||||
#endif
|
||||
#ifndef APP_TIMER_CONFIG_USE_SCHEDULER
|
||||
#define APP_TIMER_CONFIG_USE_SCHEDULER 0
|
||||
#endif
|
||||
|
||||
#ifndef APP_TIMER_KEEPS_RTC_ACTIVE
|
||||
#define APP_TIMER_KEEPS_RTC_ACTIVE 0
|
||||
#endif
|
||||
#ifndef APP_TIMER_KEEPS_RTC_ACTIVE
|
||||
#define APP_TIMER_KEEPS_RTC_ACTIVE 0
|
||||
#endif
|
||||
|
||||
#ifndef APP_TIMER_SAFE_WINDOW_MS
|
||||
#define APP_TIMER_SAFE_WINDOW_MS 300000
|
||||
#endif
|
||||
#ifndef APP_TIMER_SAFE_WINDOW_MS
|
||||
#define APP_TIMER_SAFE_WINDOW_MS 300000
|
||||
#endif
|
||||
|
||||
#ifndef APP_TIMER_WITH_PROFILER
|
||||
#define APP_TIMER_WITH_PROFILER 0
|
||||
#endif
|
||||
#ifndef APP_TIMER_WITH_PROFILER
|
||||
#define APP_TIMER_WITH_PROFILER 0
|
||||
#endif
|
||||
|
||||
#ifndef APP_TIMER_CONFIG_SWI_NUMBER
|
||||
#define APP_TIMER_CONFIG_SWI_NUMBER 0
|
||||
#endif
|
||||
#ifndef APP_TIMER_CONFIG_SWI_NUMBER
|
||||
#define APP_TIMER_CONFIG_SWI_NUMBER 0
|
||||
#endif
|
||||
|
||||
private:
|
||||
private:
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user