fixed reed noise filtering - prevent calculating

Author: Random90

main/Tasks/core/calcRideParamsOnISR.task.c

@@ -26,7 +26,6 @@ static void vOnSyncFinishHandle(void* handler_args, esp_event_base_t base, int32
 
     if (reset){
         rideParams.rotations = 0;
-        rideParams.msBetweenRotationTicks = 0;
         rideParams.totalRideTimeMs = 0;
         rideParams.speed = 0.0;
         rideParams.distance = 0.0;
@@ -40,6 +39,7 @@ static void vOnSyncFinishHandle(void* handler_args, esp_event_base_t base, int32
 void vCalcRideParamsOnISRTask(void* data)
 {
     float currentSpeed;
+    uint16_t msBetweenRotationTicks;
 
     ESP_LOGI(TAG, "Init reed switch");
 
@@ -54,30 +54,33 @@ void vCalcRideParamsOnISRTask(void* data)
                 if (!rideParams.moving) {
                     esp_event_post_to(obc_events_loop, OBC_EVENTS, RIDE_START_EVENT, NULL, 0, portMAX_DELAY);
                 }
-                rideParams.moving = true;
-                rideParams.rotations++;
-                rideParams.msBetweenRotationTicks = ((int) rideParams.rotationTickCount - (int) rideParams.prevRotationTickCount) * (int) portTICK_RATE_MS;
-                rideParams.totalRideTimeMs += rideParams.msBetweenRotationTicks;
+                msBetweenRotationTicks = ((int) rideParams.rotationTickCount - (int) rideParams.prevRotationTickCount) * (int) portTICK_RATE_MS;
+                rideParams.totalRideTimeMs += msBetweenRotationTicks;
                 // TODO sometimes tick count doesn't update even with queue? prevent speed = inf for now
-                if (rideParams.msBetweenRotationTicks > 0.00) {
-                    currentSpeed = ( (float) CIRCUMFERENCE/1000000 ) / ( (float) rideParams.msBetweenRotationTicks / 3600000 ); //km/h
+                if (msBetweenRotationTicks > 0.00) {
+                    currentSpeed = ( (float) CIRCUMFERENCE/1000000 ) / ( (float) msBetweenRotationTicks / 3600000 ); //km/h
                     // simple, soft filtering of noise (from cables?) - should't introduce any discrepancy to actual data
                     // and also could be used to detect unplanned, immediate stops
-                    if (abs(currentSpeed - rideParams.speed) < 50) {
-                        rideParams.speed = currentSpeed;
+                    // max reasonable acceleration is 5.8 m/s/s
+                    if (abs(currentSpeed - rideParams.speed) > 30) {
+                        continue;
+                    }
+
+                    rideParams.moving = true;
+                    rideParams.rotations++;
+                    rideParams.speed = currentSpeed;
+                    rideParams.distance += (float)CIRCUMFERENCE/1000000;
+                    rideParams.totalDistance += (float)CIRCUMFERENCE/1000000;
+                    rideParams.avgSpeed = rideParams.distance / ( (float) rideParams.totalRideTimeMs / 3600000 );
+                    if (rideParams.speed > rideParams.maxSpeed) {
+                        rideParams.maxSpeed = rideParams.speed;
                     }
-                    
-                }
-                if (rideParams.speed > rideParams.maxSpeed) {
-                    rideParams.maxSpeed = rideParams.speed;
                 }
-                rideParams.distance += (float)CIRCUMFERENCE/1000000;
-                rideParams.totalDistance += (float)CIRCUMFERENCE/1000000;
-                rideParams.avgSpeed = rideParams.distance / ( (float) rideParams.totalRideTimeMs / 3600000 );
+                
             }
             rideParams.prevRotationTickCount = rideParams.rotationTickCount;    
 
-            // ESP_LOGI(TAG, "[REED] count: %d, speed: %0.2f, diff: %d, distance: %0.2f", rideParams.rotations, rideParams.speed, rideParams.msBetweenRotationTicks, rideParams.distance);
+            // ESP_LOGI(TAG, "[REED] count: %d, speed: %0.2f, diff: %d, distance: %0.2f", rideParams.rotations, rideParams.speed, msBetweenRotationTicks, rideParams.distance);
             // ESP_LOGI(TAG, "[AVGS] speed: %0.2f", rideParams.avgSpeed);
         }
     }

main/Tasks/core/rideStatusWatchdog.task.c

@@ -28,7 +28,6 @@ void vRideStatusWatchdogTask(void *arg) {
         if(rideParams.moving && !msg_count && timeInactive > RIDE_TIMEOUT_MS) {
             ESP_LOGI(TAG, "[RIDE_STATUS] Stopped moving");
             rideParams.speed = 0.0;
-            rideParams.msBetweenRotationTicks = 0;
             rideParams.moving = false;
             rideParams.prevRotationTickCount = 0;
 

main/obc.h

@@ -12,7 +12,6 @@
     uint32_t rotations;
     portTickType prevRotationTickCount;
     portTickType rotationTickCount;
-    uint16_t msBetweenRotationTicks;
     uint32_t totalRideTimeMs;
     float speed;
     float avgSpeed;