Skip to content

Commit

Permalink
raisewake: Improve raise to wake algorithm
Browse files Browse the repository at this point in the history
This new algorithm calculates the number of degrees that the wrist has
rolled, and checks if that is above a threshold.

First it checks if the wrist is still enough for the acceleration values
to be considered mostly from gravity. It does this by calculating the
mean over the past 2 SystemTask loops, and checking that the variance
from that mean is below a threshold.
Then it calculates the angle the wrist is being held at, and calculates
the difference from the angle some time ago. If this difference is above
the threshold, it wakes the watch.
  • Loading branch information
FintasticMan authored and JF002 committed Aug 17, 2023
1 parent cfe2110 commit 2b1eae7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 21 deletions.
32 changes: 14 additions & 18 deletions src/components/motion/MotionController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,26 +87,22 @@ MotionController::AccelStats MotionController::GetAccelStats() const {
return stats;
}

bool MotionController::ShouldRaiseWake(bool isSleeping) {
if ((x + 335) <= 670 && zHistory[0] < 0) {
if (!isSleeping) {
if (yHistory[0] <= 0) {
return false;
}
lastYForRaiseWake = 0;
return false;
}
bool MotionController::ShouldRaiseWake() const {
constexpr uint32_t varianceThresh = 56 * 56;
constexpr int16_t xThresh = 384;
constexpr int16_t yThresh = -64;
constexpr int16_t rollDegreesThresh = -45;

if (x < -xThresh || x > xThresh) {
return false;
}

if (yHistory[0] >= 0) {
lastYForRaiseWake = 0;
return false;
}
if (yHistory[0] + 230 < lastYForRaiseWake) {
lastYForRaiseWake = yHistory[0];
return true;
}
// if the variance is below the threshold, the accelerometer values can be considered to be from acceleration due to gravity
if (stats.yVariance > varianceThresh || (stats.yMean < -724 && stats.zVariance > varianceThresh) || stats.yMean > yThresh) {
return false;
}
return false;

return DegreesRolled(stats.yMean, stats.zMean, stats.prevYMean, stats.prevZMean) < rollDegreesThresh;
}

bool MotionController::ShouldShakeWake(uint16_t thresh) {
Expand Down
3 changes: 1 addition & 2 deletions src/components/motion/MotionController.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace Pinetime {
}

bool ShouldShakeWake(uint16_t thresh);
bool ShouldRaiseWake(bool isSleeping);
bool ShouldRaiseWake() const;

int32_t CurrentShakeSpeed() const {
return accumulatedSpeed;
Expand Down Expand Up @@ -86,7 +86,6 @@ namespace Pinetime {

int16_t lastX = 0;
int16_t x = 0;
int16_t lastYForRaiseWake = 0;
static constexpr uint8_t histSize = 8;
Utility::CircularBuffer<int16_t, histSize> yHistory = {};
Utility::CircularBuffer<int16_t, histSize> zHistory = {};
Expand Down
2 changes: 1 addition & 1 deletion src/systemtask/SystemTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ void SystemTask::UpdateMotion() {

if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep) {
if ((settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) &&
motionController.ShouldRaiseWake(state == SystemTaskState::Sleeping)) ||
motionController.ShouldRaiseWake()) ||
(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) &&
motionController.ShouldShakeWake(settingsController.GetShakeThreshold()))) {
GoToRunning();
Expand Down

0 comments on commit 2b1eae7

Please sign in to comment.