From a57296d6415f7ce4ced2aa99356f3cad68cb487a Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Thu, 3 Dec 2020 13:30:17 -0500
Subject: [PATCH] avoid float -> int64 conversion #1977 both cases have to be
 relatively small durations of time cherry picking...

---
 firmware/controllers/engine_cycle/rpm_calculator.cpp      | 3 ++-
 firmware/controllers/system/timer/pwm_generator_logic.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/firmware/controllers/engine_cycle/rpm_calculator.cpp b/firmware/controllers/engine_cycle/rpm_calculator.cpp
index b028692f14..b7677b012d 100644
--- a/firmware/controllers/engine_cycle/rpm_calculator.cpp
+++ b/firmware/controllers/engine_cycle/rpm_calculator.cpp
@@ -386,7 +386,8 @@ efitick_t scheduleByAngle(scheduling_s *timer, efitick_t edgeTimestamp, angle_t
 		action_s action DECLARE_ENGINE_PARAMETER_SUFFIX) {
 	float delayUs = ENGINE(rpmCalculator.oneDegreeUs) * angle;
 
-	efitime_t delayNt = US2NT(delayUs);
+    // 'delayNt' is below 10 seconds here so we use 32 bit type for performance reasons
+	int32_t delayNt = USF2NT(delayUs);
 	efitime_t delayedTime = edgeTimestamp + delayNt;
 
 	ENGINE(executor.scheduleByTimestampNt(timer, delayedTime, action));
diff --git a/firmware/controllers/system/timer/pwm_generator_logic.cpp b/firmware/controllers/system/timer/pwm_generator_logic.cpp
index 84ad78ef57..19738e0f1e 100644
--- a/firmware/controllers/system/timer/pwm_generator_logic.cpp
+++ b/firmware/controllers/system/timer/pwm_generator_logic.cpp
@@ -136,8 +136,9 @@ void PwmConfig::setFrequency(float frequency) {
 	}
 	/**
 	 * see #handleCycleStart()
+	 * 'periodNt' is below 10 seconds here so we use 32 bit type for performance reasons
 	 */
-	periodNt = US2NT(frequency2periodUs(frequency));
+	periodNt = USF2NT(frequency2periodUs(frequency));
 }
 
 void PwmConfig::stop() {