CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash upon leaving app.

Browse Source 
Code formatting
This commit is contained in:
Tim Keller
2021-09-30 00:04:51 +00:00
parent d6b22645e3
commit 5c13200238
3 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/motion/MotionController.cpp
View File

@@ -48,20 +48,21 @@ bool MotionController::Should_ShakeWake(uint16_t thresh) {
bool wake = false;
auto diff = xTaskGetTickCount() - lastShakeTime;
lastShakeTime = xTaskGetTickCount();
int32_t speed = std::abs(z + (y/2) + (x/4)- lastYForShake - lastZForShake) / diff * 100;
/* 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);
//implemented without floats as .25Alpha
accumulatedspeed = (speed/5) + ((accumulatedspeed/5)*4);
// implemented without floats as .25Alpha
accumulatedspeed = (speed / 5) + ((accumulatedspeed / 5) * 4);
if (accumulatedspeed > thresh) {
if (accumulatedspeed > thresh) {
wake = true;
}
lastXForShake = x/4;
lastYForShake = y/2;
lastXForShake = x / 4;
lastYForShake = y / 2;
lastZForShake = z;
return wake;
}
int32_t MotionController::currentShakeSpeed(){
int32_t MotionController::currentShakeSpeed() {
return accumulatedspeed;
}