From 4294ca83f425c3379f1f58fef2cab8e02e213797 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 16 Dec 2014 18:03:47 -0600 Subject: [PATCH] auto-sync --- firmware/controllers/math/engine_math.h | 7 +++++-- firmware/rusefi.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/math/engine_math.h b/firmware/controllers/math/engine_math.h index 79dfee1f80..75930e8258 100644 --- a/firmware/controllers/math/engine_math.h +++ b/firmware/controllers/math/engine_math.h @@ -48,11 +48,14 @@ extern "C" #define getOneDegreeTimeMs(rpm) (1000.0f * 60 / 360 / (rpm)) /** - * @return time needed to rotate crankshaft by one degree, in microseconds. + * @return float, time needed to rotate crankshaft by one degree, in microseconds. */ #define getOneDegreeTimeUs(rpm) (1000000.0f * 60 / 360 / (rpm)) -#define getOneDegreeTimeNt(rpm) (US2NT(1000000.0f) * 60 / 360 / (rpm)) +/** + * @return float, time needed to rotate crankshaft by one degree, in native clicks. + */ +#define getOneDegreeTimeNt(rpm) (US2NT(1000000) * 60.0f / 360 / (rpm)) float getCrankshaftRevolutionTimeMs(int rpm); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 71b0086f9c..1920fb7810 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -265,5 +265,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE == 0) return 1; // this is here to make the compiler happy about the unused array - return 20141215; + return 20141216; }