diff --git a/common/speedometer.cpp b/common/speedometer.cpp index a24d685..4296b10 100644 --- a/common/speedometer.cpp +++ b/common/speedometer.cpp @@ -24,11 +24,11 @@ #include "speedometer.hpp" -#include "static_scheduling/gear_device.hpp" - #include #include +#include "static_scheduling/gear_device.hpp" + // from disco_h747i/wrappers #include "joystick.hpp" #include "mbed_trace.h" @@ -108,10 +108,14 @@ void Speedometer::computeSpeed() { // ~= 560 m / min = 33.6 km/h // TODO : done - //Distance run with one pedal turn = tray size / rear gear size * circumference of the wheel + // Distance run with one pedal turn = tray size / rear gear size * circumference of + // the wheel constexpr float ms_in_hour = static_cast(3600 * 1000); - float pedal_rotation_per_hour = ms_in_hour / std::chrono::duration_cast(_pedalRotationTime).count(); - float gear_ratio = static_cast(kTraySize) / static_cast(this->_gearSize); + float pedal_rotation_per_hour = + ms_in_hour / + std::chrono::duration_cast(_pedalRotationTime).count(); + float gear_ratio = + static_cast(kTraySize) / static_cast(this->_gearSize); float wheel_dist_km = static_cast(this->kWheelCircumference) / 1000.0; this->_currentSpeed = gear_ratio * wheel_dist_km * pedal_rotation_per_hour; } @@ -129,10 +133,10 @@ void Speedometer::computeDistance() { Speedometer::computeSpeed(); // compute distance - const std::chrono::microseconds timeNow = _timer.elapsed_time(); + const std::chrono::microseconds timeNow = _timer.elapsed_time(); const std::chrono::microseconds timeDiff = timeNow - _lastTime; - constexpr float ms_in_hour = static_cast(3600 * 1000); - float traveled_dist = _currentSpeed * timeDiff.count() / (ms_in_hour*1000.0/*μs*/); + constexpr float ms_in_hour = static_cast(3600 * 1000); + float traveled_dist = _currentSpeed * timeDiff.count() / (ms_in_hour * 1000.0 /*μs*/); this->_totalDistanceMutex.lock(); this->_totalDistance += traveled_dist;