Ignorw all values below 19 cm

amandel · amandel · commit c61c84b4d49e · 2020-10-13T17:12:41.000+02:00
diff --git a/OpenBikeSensorFirmware/sensor.cpp b/OpenBikeSensorFirmware/sensor.cpp
@@ -45,7 +45,8 @@
 */
 const uint8_t MICRO_SEC_TO_CM_DIVIDER = 58; // sound speed 340M/S, 2 times back and forward
 
-const uint32_t MAX_DURATION_MICRO_SEC = 255 * 58;
+const uint32_t MAX_DURATION_MICRO_SEC = 255 * MICRO_SEC_TO_CM_DIVIDER;
+const uint32_t MIN_SURATION_MICRO_SEC = 19 * MICRO_SEC_TO_CM_DIVIDER;
 
 /*
   https://de.aliexpress.com/item/32737648330.html and other sources give 60ms here
@@ -124,7 +125,7 @@ void HCSR04SensorManager::collectSensorResults() {
   {
     const unsigned long duration = m_sensors[idx].duration;
     uint8_t dist;
-    if (duration == 0 || duration > m_sensors[idx].timeout || duration >= MAX_DURATION_MICRO_SEC)
+    if (duration < MIN_SURATION_MICRO_SEC || duration >= MAX_DURATION_MICRO_SEC)
     {
       dist = MAX_SENSOR_VALUE;
     }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@`
`45`	`45`	`*/`
`46`	`46`	`const uint8_t MICRO_SEC_TO_CM_DIVIDER = 58; // sound speed 340M/S, 2 times back and forward`
`47`	`47`
`48`		`-const uint32_t MAX_DURATION_MICRO_SEC = 255 * 58;`
	`48`	`+const uint32_t MAX_DURATION_MICRO_SEC = 255 * MICRO_SEC_TO_CM_DIVIDER;`
	`49`	`+const uint32_t MIN_SURATION_MICRO_SEC = 19 * MICRO_SEC_TO_CM_DIVIDER;`
`49`	`50`
`50`	`51`	`/*`
`51`	`52`	`https://de.aliexpress.com/item/32737648330.html and other sources give 60ms here`
`@@ -124,7 +125,7 @@ void HCSR04SensorManager::collectSensorResults() {`
`124`	`125`	`{`
`125`	`126`	`const unsigned long duration = m_sensors[idx].duration;`
`126`	`127`	`uint8_t dist;`
`127`		`- if (duration == 0 \|\| duration > m_sensors[idx].timeout \|\| duration >= MAX_DURATION_MICRO_SEC)`
	`128`	`+ if (duration < MIN_SURATION_MICRO_SEC \|\| duration >= MAX_DURATION_MICRO_SEC)`
`128`	`129`	`{`
`129`	`130`	`dist = MAX_SENSOR_VALUE;`
`130`	`131`	`}`