diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index ef9263d0d6..a6119ba95c 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -596,7 +596,7 @@ static void initStatusLeds(void) { static bool isTriggerErrorNow() { #if EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT - bool justHadError = (getTimeNowNt() - engine->triggerCentral.triggerState.lastDecodingErrorTime) < US2NT(MS2US(200)); + bool justHadError = (getTimeNowNt() - engine->triggerCentral.triggerState.lastDecodingErrorTime) < MS2NT(200); return justHadError || isTriggerDecoderError(); #else return false; diff --git a/firmware/controllers/gauges/malfunction_indicator.cpp b/firmware/controllers/gauges/malfunction_indicator.cpp index 3b33ac3f8b..bda744dade 100644 --- a/firmware/controllers/gauges/malfunction_indicator.cpp +++ b/firmware/controllers/gauges/malfunction_indicator.cpp @@ -87,7 +87,7 @@ private: void PeriodicTask(efitick_t nowNt) override { UNUSED(nowNt); - if (nowNt - engine->triggerCentral.triggerState.mostRecentSyncTime < US2NT(MS2US(500))) { + if (nowNt - engine->triggerCentral.triggerState.mostRecentSyncTime < MS2NT(500)) { enginePins.checkEnginePin.setValue(1); chThdSleepMilliseconds(500); enginePins.checkEnginePin.setValue(0); diff --git a/firmware/util/efitime.h b/firmware/util/efitime.h index fe0f7597c4..5a11e869ef 100644 --- a/firmware/util/efitime.h +++ b/firmware/util/efitime.h @@ -19,6 +19,9 @@ #define MS2US(MS_TIME) ((MS_TIME) * 1000) +// milliseconds to ticks +#define MS2NT(msTime) US2NT(MS2US(msTime)) + // todo: implement a function to work with times considering counter overflow #define overflowDiff(now, time) ((now) - (time))