shakewake: Slightly improve accuracy

The accumulated speed was calculated by dividing first and multiplying
after, which results in more rounding errors than if you multiply first
and then divide. The values aren't big enough to overflow.
This commit is contained in:
Finlay Davidson 2023-04-05 10:32:27 +02:00 committed by JF
parent 6d5847e046
commit 47ca403857

View file

@ -54,10 +54,9 @@ bool MotionController::ShouldRaiseWake(bool isSleeping) {
bool MotionController::ShouldShakeWake(uint16_t thresh) { bool MotionController::ShouldShakeWake(uint16_t thresh) {
/* Currently Polling at 10hz, If this ever goes faster scalar and EMA might need adjusting */ /* Currently Polling at 10hz, If this ever goes faster scalar and EMA might need adjusting */
int32_t speed = std::abs(z - lastZ + (y / 2) - (lastY / 2) + (x / 4) - (lastX / 4)) / (time - lastTime) * 100; int32_t speed = std::abs(z - lastZ + (y - lastY) / 2 + (x - lastX) / 4) * 100 / (time - lastTime);
//(.2 * speed) + ((1 - .2) * accumulatedSpeed); // (.2 * speed) + ((1 - .2) * accumulatedSpeed);
// implemented without floats as .25Alpha accumulatedSpeed = speed / 5 + accumulatedSpeed * 4 / 5;
accumulatedSpeed = (speed / 5) + ((accumulatedSpeed / 5) * 4);
return accumulatedSpeed > thresh; return accumulatedSpeed > thresh;
} }