shakewake: Fix names according to style guide
This commit is contained in:
parent
ada182336f
commit
f993311830
|
@ -43,17 +43,17 @@ bool MotionController::Should_RaiseWake(bool isSleeping) {
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MotionController::Should_ShakeWake(uint16_t thresh) {
|
||||
bool MotionController::ShouldShakeWake(uint16_t thresh) {
|
||||
bool wake = false;
|
||||
auto diff = xTaskGetTickCount() - lastShakeTime;
|
||||
lastShakeTime = xTaskGetTickCount();
|
||||
/* Currently Polling at 10hz, If this ever goes faster scalar and EMA might need adjusting */
|
||||
int32_t speed = std::abs(z + (y / 2) + (x / 4) - lastYForShake - lastZForShake) / diff * 100;
|
||||
//(.2 * speed) + ((1 - .2) * accumulatedspeed);
|
||||
//(.2 * speed) + ((1 - .2) * accumulatedSpeed);
|
||||
// implemented without floats as .25Alpha
|
||||
accumulatedspeed = (speed / 5) + ((accumulatedspeed / 5) * 4);
|
||||
accumulatedSpeed = (speed / 5) + ((accumulatedSpeed / 5) * 4);
|
||||
|
||||
if (accumulatedspeed > thresh) {
|
||||
if (accumulatedSpeed > thresh) {
|
||||
wake = true;
|
||||
}
|
||||
lastXForShake = x / 4;
|
||||
|
@ -62,10 +62,6 @@ bool MotionController::Should_ShakeWake(uint16_t thresh) {
|
|||
return wake;
|
||||
}
|
||||
|
||||
int32_t MotionController::currentShakeSpeed() {
|
||||
return accumulatedspeed;
|
||||
}
|
||||
|
||||
void MotionController::IsSensorOk(bool isOk) {
|
||||
isSensorOk = isOk;
|
||||
}
|
||||
|
|
|
@ -40,9 +40,13 @@ namespace Pinetime {
|
|||
return currentTripSteps;
|
||||
}
|
||||
|
||||
bool Should_ShakeWake(uint16_t thresh);
|
||||
bool ShouldShakeWake(uint16_t thresh);
|
||||
bool Should_RaiseWake(bool isSleeping);
|
||||
int32_t currentShakeSpeed();
|
||||
|
||||
int32_t CurrentShakeSpeed() const {
|
||||
return accumulatedSpeed;
|
||||
}
|
||||
|
||||
void IsSensorOk(bool isOk);
|
||||
|
||||
bool IsSensorOk() const {
|
||||
|
@ -70,7 +74,7 @@ namespace Pinetime {
|
|||
int16_t lastXForShake = 0;
|
||||
int16_t lastYForShake = 0;
|
||||
int16_t lastZForShake = 0;
|
||||
int32_t accumulatedspeed = 0;
|
||||
int32_t accumulatedSpeed = 0;
|
||||
uint32_t lastShakeTime = 0;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -96,16 +96,16 @@ void SettingShakeThreshold::Refresh() {
|
|||
}
|
||||
if (calibrating == 2) {
|
||||
|
||||
if ((motionController.currentShakeSpeed() - 300) > lv_arc_get_value(positionArc)) {
|
||||
lv_arc_set_value(positionArc, (int16_t) motionController.currentShakeSpeed() - 300);
|
||||
if ((motionController.CurrentShakeSpeed() - 300) > lv_arc_get_value(positionArc)) {
|
||||
lv_arc_set_value(positionArc, (int16_t) motionController.CurrentShakeSpeed() - 300);
|
||||
}
|
||||
if (xTaskGetTickCount() - vCalTime > pdMS_TO_TICKS(7500)) {
|
||||
lv_btn_set_state(calButton, LV_STATE_DEFAULT);
|
||||
lv_event_send(calButton, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||
}
|
||||
}
|
||||
if (motionController.currentShakeSpeed() - 300 > lv_arc_get_value(animArc)) {
|
||||
lv_arc_set_value(animArc, (uint16_t) motionController.currentShakeSpeed() - 300);
|
||||
if (motionController.CurrentShakeSpeed() - 300 > lv_arc_get_value(animArc)) {
|
||||
lv_arc_set_value(animArc, (uint16_t) motionController.CurrentShakeSpeed() - 300);
|
||||
vDecay = xTaskGetTickCount();
|
||||
} else if ((xTaskGetTickCount() - vDecay) > pdMS_TO_TICKS(1500)) {
|
||||
lv_arc_set_value(animArc, lv_arc_get_value(animArc) - 25);
|
||||
|
|
|
@ -470,7 +470,7 @@ void SystemTask::UpdateMotion() {
|
|||
if ((settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::RaiseWrist) &&
|
||||
motionController.Should_RaiseWake(state == SystemTaskState::Sleeping)) ||
|
||||
(settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake) &&
|
||||
motionController.Should_ShakeWake(settingsController.GetShakeThreshold()))) {
|
||||
motionController.ShouldShakeWake(settingsController.GetShakeThreshold()))) {
|
||||
GoToRunning();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user