diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-26 04:04:07 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-26 04:06:47 (GMT) |
| commit | 5215bc45a6520258c021a6df3940de9f1f16d6ff (patch) | |
| tree | 9a990b2d1f32a51be3ed7f796ac3d33573152a07 | |
| parent | 6ef420d2407a4685b56a233f6b0f849e90c6cf49 (diff) | |
sans steps
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/components/motion/MotionController.cpp | 7 | ||||
| -rw-r--r-- | src/components/motion/MotionController.h | 14 | ||||
| -rw-r--r-- | src/components/settings/Settings.h | 14 | ||||
| -rw-r--r-- | src/displayapp/Apps.h | 2 | ||||
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 9 | ||||
| -rw-r--r-- | src/displayapp/screens/ApplicationList.cpp | 1 | ||||
| -rw-r--r-- | src/displayapp/screens/Steps.cpp | 103 | ||||
| -rw-r--r-- | src/displayapp/screens/Steps.h | 44 | ||||
| -rw-r--r-- | src/displayapp/screens/WatchFaceDigital.cpp | 17 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/SettingSteps.cpp | 92 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/SettingSteps.h | 29 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 2 | ||||
| -rw-r--r-- | src/systemtask/SystemTask.cpp | 2 |
14 files changed, 5 insertions, 333 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 409619b..7d35e1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -398,7 +398,6 @@ list(APPEND SOURCE_FILES displayapp/screens/ApplicationList.cpp displayapp/screens/Notifications.cpp displayapp/screens/List.cpp - displayapp/screens/Steps.cpp displayapp/screens/Error.cpp displayapp/screens/Alarm.cpp displayapp/screens/Styles.cpp @@ -410,7 +409,6 @@ list(APPEND SOURCE_FILES displayapp/screens/settings/SettingTimeFormat.cpp displayapp/screens/settings/SettingWakeUp.cpp displayapp/screens/settings/SettingDisplay.cpp - displayapp/screens/settings/SettingSteps.cpp displayapp/screens/settings/SettingShakeThreshold.cpp ## Watch faces diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp index 4a7a7eb..aa2f3ee 100644 --- a/src/components/motion/MotionController.cpp +++ b/src/components/motion/MotionController.cpp @@ -2,15 +2,10 @@ #include "os/os_cputime.h" using namespace Pinetime::Controllers; -void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) { +void MotionController::Update(int16_t x, int16_t y, int16_t z) { this->x = x; this->y = y; this->z = z; - int32_t deltaSteps = nbSteps - this->nbSteps; - this->nbSteps = nbSteps; - if (deltaSteps > 0) { - currentTripSteps += deltaSteps; - } } bool MotionController::Should_RaiseWake(bool isSleeping) { diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h index 5385658..5200b41 100644 --- a/src/components/motion/MotionController.h +++ b/src/components/motion/MotionController.h @@ -13,7 +13,7 @@ namespace Pinetime { BMA425, }; - void Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps); + void Update(int16_t x, int16_t y, int16_t z); int16_t X() const { return x; @@ -24,16 +24,6 @@ namespace Pinetime { int16_t Z() const { return z; } - uint32_t NbSteps() const { - return nbSteps; - } - - void ResetTrip() { - currentTripSteps = 0; - } - uint32_t GetTripSteps() const { - return currentTripSteps; - } bool Should_ShakeWake(uint16_t thresh); bool Should_RaiseWake(bool isSleeping); @@ -50,8 +40,6 @@ namespace Pinetime { void Init(Pinetime::Drivers::Bma421::DeviceTypes types); private: - uint32_t nbSteps; - uint32_t currentTripSteps = 0; int16_t x; int16_t y; int16_t z; diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 2d26664..8a32efa 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -147,22 +147,10 @@ namespace Pinetime { return settings.brightLevel; }; - void SetStepsGoal(uint32_t goal) { - if (goal != settings.stepsGoal) { - settingsChanged = true; - } - settings.stepsGoal = goal; - }; - - uint32_t GetStepsGoal() const { - return settings.stepsGoal; - }; - private: - static constexpr uint32_t settingsVersion = 0x4001; // infinitime redux settings + static constexpr uint32_t settingsVersion = 0x4011; // infinitime redux settings struct SettingsData { uint32_t version = settingsVersion; - uint32_t stepsGoal = 10000; uint32_t screenTimeOut = 15000; ClockType clockType = ClockType::H24; diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h index df5124b..f189fc5 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h @@ -11,13 +11,11 @@ namespace Pinetime { NotificationsPreview, Notifications, Alarm, - Steps, QuickSettings, Settings, SettingTimeFormat, SettingDisplay, SettingWakeUp, - SettingSteps, SettingShakeThreshold, Error }; diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 8a9875b..603d29f 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -15,7 +15,6 @@ #include "displayapp/screens/Meter.h" #include "displayapp/screens/Notifications.h" #include "displayapp/screens/Tile.h" -#include "displayapp/screens/Steps.h" #include "displayapp/screens/Error.h" #include "drivers/Cst816s.h" @@ -29,7 +28,6 @@ #include "displayapp/screens/settings/SettingTimeFormat.h" #include "displayapp/screens/settings/SettingWakeUp.h" #include "displayapp/screens/settings/SettingDisplay.h" -#include "displayapp/screens/settings/SettingSteps.h" #include "displayapp/screens/settings/SettingShakeThreshold.h" #include "libs/lv_conf.h" @@ -359,17 +357,10 @@ void DisplayApp::LoadApp(Apps app) { currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController); ReturnApp(Apps::Settings); break; - case Apps::SettingSteps: - currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController); - ReturnApp(Apps::Settings); - break; case Apps::SettingShakeThreshold: currentScreen = std::make_unique<Screens::SettingShakeThreshold>(this, settingsController, motionController, *systemTask); ReturnApp(Apps::Settings); break; - case Apps::Steps: - currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController); - break; } currentApp = app; } diff --git a/src/displayapp/screens/ApplicationList.cpp b/src/displayapp/screens/ApplicationList.cpp index b1fdbfd..5daafd1 100644 --- a/src/displayapp/screens/ApplicationList.cpp +++ b/src/displayapp/screens/ApplicationList.cpp @@ -36,7 +36,6 @@ bool ApplicationList::OnTouchEvent(Pinetime::Applications::TouchEvents event) { std::unique_ptr<Screen> ApplicationList::CreateScreen1() { std::array<Screens::Tile::Applications, 6> applications {{ - {Symbols::shoe, Apps::Steps}, {Symbols::clock, Apps::Alarm}, }}; diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp deleted file mode 100644 index 3e7f820..0000000 --- a/src/displayapp/screens/Steps.cpp +++ /dev/null @@ -1,103 +0,0 @@ -#include "displayapp/screens/Steps.h" -#include <lvgl/lvgl.h> -#include "displayapp/DisplayApp.h" -#include "displayapp/screens/Symbols.h" - -using namespace Pinetime::Applications::Screens; - -static void lap_event_handler(lv_obj_t* obj, lv_event_t event) { - auto* steps = static_cast<Steps*>(obj->user_data); - steps->lapBtnEventHandler(event); -} - -Steps::Steps(Pinetime::Applications::DisplayApp* app, - Controllers::MotionController& motionController, - Controllers::Settings& settingsController) - : Screen(app), motionController {motionController}, settingsController {settingsController} { - - stepsArc = lv_arc_create(lv_scr_act(), nullptr); - - lv_obj_set_style_local_bg_opa(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, LV_OPA_0); - lv_obj_set_style_local_border_width(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 2); - lv_obj_set_style_local_radius(stepsArc, LV_ARC_PART_BG, LV_STATE_DEFAULT, 0); - lv_obj_set_style_local_line_color(stepsArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, lv_color_hex(0x0000FF)); - lv_arc_set_end_angle(stepsArc, 200); - lv_obj_set_size(stepsArc, 240, 240); - lv_arc_set_range(stepsArc, 0, 500); - lv_obj_align(stepsArc, nullptr, LV_ALIGN_CENTER, 0, 0); - - stepsCount = motionController.NbSteps(); - currentTripSteps = stepsCount - motionController.GetTripSteps(); - - lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal())); - - lSteps = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00)); - lv_obj_set_style_local_text_font(lSteps, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); - lv_label_set_text_fmt(lSteps, "%li", stepsCount); - lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -40); - - lv_obj_t* lstepsL = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(lstepsL, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111)); - lv_label_set_text_static(lstepsL, "Steps"); - lv_obj_align(lstepsL, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 5); - - lv_obj_t* lstepsGoal = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(lstepsGoal, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_CYAN); - lv_label_set_text_fmt(lstepsGoal, "Goal: %5lu", settingsController.GetStepsGoal()); - lv_label_set_align(lstepsGoal, LV_LABEL_ALIGN_CENTER); - lv_obj_align(lstepsGoal, lSteps, LV_ALIGN_OUT_BOTTOM_MID, 0, 40); - - lv_obj_t* backgroundLabel = lv_label_create(lv_scr_act(), nullptr); - lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP); - lv_obj_set_size(backgroundLabel, 240, 240); - lv_obj_set_pos(backgroundLabel, 0, 0); - lv_label_set_text_static(backgroundLabel, ""); - - resetBtn = lv_btn_create(lv_scr_act(), nullptr); - resetBtn->user_data = this; - lv_obj_set_event_cb(resetBtn, lap_event_handler); - lv_obj_set_height(resetBtn, 50); - lv_obj_set_width(resetBtn, 115); - lv_obj_align(resetBtn, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0); - resetButtonLabel = lv_label_create(resetBtn, nullptr); - lv_label_set_text(resetButtonLabel, "Reset"); - - currentTripSteps = motionController.GetTripSteps(); - - tripLabel = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(tripLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW); - lv_label_set_text_fmt(tripLabel, "Trip: %5li", currentTripSteps); - lv_obj_align(tripLabel, lstepsGoal, LV_ALIGN_IN_LEFT_MID, 0, 20); - - taskRefresh = lv_task_create(RefreshTaskCallback, 100, LV_TASK_PRIO_MID, this); -} - -Steps::~Steps() { - lv_task_del(taskRefresh); - lv_obj_clean(lv_scr_act()); -} - -void Steps::Refresh() { - stepsCount = motionController.NbSteps(); - currentTripSteps = motionController.GetTripSteps(); - - lv_label_set_text_fmt(lSteps, "%li", stepsCount); - lv_obj_align(lSteps, nullptr, LV_ALIGN_CENTER, 0, -40); - - if (currentTripSteps < 100000) { - lv_label_set_text_fmt(tripLabel, "Trip: %5li", currentTripSteps); - } else { - lv_label_set_text_fmt(tripLabel, "Trip: 99999+"); - } - lv_arc_set_value(stepsArc, int16_t(500 * stepsCount / settingsController.GetStepsGoal())); -} - -void Steps::lapBtnEventHandler(lv_event_t event) { - if (event != LV_EVENT_CLICKED) { - return; - } - stepsCount = motionController.NbSteps(); - motionController.ResetTrip(); - Refresh(); -} diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h deleted file mode 100644 index f109e0f..0000000 --- a/src/displayapp/screens/Steps.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -#include <cstdint> -#include <lvgl/lvgl.h> -#include "displayapp/screens/Screen.h" -#include <components/motion/MotionController.h> - -namespace Pinetime { - - namespace Controllers { - class Settings; - } - - namespace Applications { - namespace Screens { - - class Steps : public Screen { - public: - Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings& settingsController); - ~Steps() override; - - void Refresh() override; - void lapBtnEventHandler(lv_event_t event); - - private: - Controllers::MotionController& motionController; - Controllers::Settings& settingsController; - - uint32_t currentTripSteps = 0; - - lv_obj_t* lSteps; - lv_obj_t* lStepsIcon; - lv_obj_t* stepsArc; - lv_obj_t* resetBtn; - lv_obj_t* resetButtonLabel; - lv_obj_t* tripLabel; - - uint32_t stepsCount; - - lv_task_t* taskRefresh; - }; - } - } -} diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 053957e..6720318 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -69,16 +69,6 @@ WatchFaceDigital::WatchFaceDigital(DisplayApp* app, lv_obj_set_pos(backgroundLabel, 0, 0); lv_label_set_text_static(backgroundLabel, ""); - stepValue = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7)); - lv_label_set_text_static(stepValue, "0"); - lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); - - stepIcon = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FFE7)); - lv_label_set_text_static(stepIcon, Symbols::shoe); - lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0); - taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this); Refresh(); } @@ -175,11 +165,4 @@ void WatchFaceDigital::Refresh() { } } - stepCount = motionController.NbSteps(); - motionSensorOk = motionController.IsSensorOk(); - if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) { - lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get()); - lv_obj_realign(stepValue); - lv_obj_realign(stepIcon); - } } diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp deleted file mode 100644 index 5ca3eec..0000000 --- a/src/displayapp/screens/settings/SettingSteps.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include "displayapp/screens/settings/SettingSteps.h" -#include <lvgl/lvgl.h> -#include "displayapp/DisplayApp.h" -#include "displayapp/screens/Symbols.h" - -using namespace Pinetime::Applications::Screens; - -namespace { - void event_handler(lv_obj_t* obj, lv_event_t event) { - SettingSteps* screen = static_cast<SettingSteps*>(obj->user_data); - screen->UpdateSelected(obj, event); - } -} - -SettingSteps::SettingSteps( - 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_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111)); - 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, 30, 60); - lv_obj_set_width(container1, LV_HOR_RES - 50); - lv_obj_set_height(container1, LV_VER_RES - 60); - 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,"Daily steps goal"); - lv_label_set_align(title, LV_LABEL_ALIGN_CENTER); - lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 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::shoe); - lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER); - lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0); - - stepValue = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); - lv_label_set_text_fmt(stepValue, "%lu", settingsController.GetStepsGoal()); - lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER); - lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10); - - btnPlus = lv_btn_create(lv_scr_act(), nullptr); - btnPlus->user_data = this; - lv_obj_set_size(btnPlus, 80, 50); - lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80); - lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+"); - lv_obj_set_event_cb(btnPlus, event_handler); - - btnMinus = lv_btn_create(lv_scr_act(), nullptr); - btnMinus->user_data = this; - lv_obj_set_size(btnMinus, 80, 50); - lv_obj_set_event_cb(btnMinus, event_handler); - lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80); - lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-"); - -} - -SettingSteps::~SettingSteps() { - lv_obj_clean(lv_scr_act()); - settingsController.SaveSettings(); -} - -void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) { - uint32_t value = settingsController.GetStepsGoal(); - if(object == btnPlus && (event == LV_EVENT_PRESSED)) { - value += 1000; - if ( value <= 500000 ) { - settingsController.SetStepsGoal(value); - lv_label_set_text_fmt(stepValue, "%lu", settingsController.GetStepsGoal()); - lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10); - } - } - - if(object == btnMinus && (event == LV_EVENT_PRESSED)) { - value -= 1000; - if ( value >= 1000 ) { - settingsController.SetStepsGoal(value); - lv_label_set_text_fmt(stepValue, "%lu", settingsController.GetStepsGoal()); - lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10); - } - } - -} diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h deleted file mode 100644 index 5fc05de..0000000 --- a/src/displayapp/screens/settings/SettingSteps.h +++ /dev/null @@ -1,29 +0,0 @@ -#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 SettingSteps : public Screen { - public: - SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings& settingsController); - ~SettingSteps() override; - - void UpdateSelected(lv_obj_t* object, lv_event_t event); - - private: - Controllers::Settings& settingsController; - - lv_obj_t* stepValue; - lv_obj_t* btnPlus; - lv_obj_t* btnMinus; - }; - } - } -} diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index d2475f8..01dd534 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -37,7 +37,7 @@ std::unique_ptr<Screen> Settings::CreateScreen1() { {Symbols::sun, "Display", Apps::SettingDisplay}, {Symbols::eye, "Wake Up", Apps::SettingWakeUp}, {Symbols::clock, "Time format", Apps::SettingTimeFormat}, - {Symbols::shoe, "Steps", Apps::SettingSteps} + {Symbols::none, "None", Apps::None} }}; return std::make_unique<Screens::List>(0, 1, app, settingsController, applications); diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index 541244b..c1f178f 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -417,7 +417,7 @@ void SystemTask::UpdateMotion() { auto motionValues = motionSensor.Process(); motionController.IsSensorOk(motionSensor.IsOk()); - motionController.Update(motionValues.x, motionValues.y, motionValues.z, motionValues.steps); + motionController.Update(motionValues.x, motionValues.y, motionValues.z); if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) && motionController.Should_RaiseWake(isSleeping)) { |
