From 3b6ecb432b1831d366fe59806f6b42c4f68026a9 Mon Sep 17 00:00:00 2001
From: Andrey <rusefillc@gmail.com>
Date: Thu, 20 Jan 2022 22:38:08 -0500
Subject: [PATCH] migrating to SensorType::Rpm API

---
 firmware/controllers/can/can_dash.cpp          | 4 ++--
 firmware/controllers/gauges/lcd_controller.cpp | 4 ++--
 firmware/controllers/math/closed_loop_fuel.cpp | 2 +-
 firmware/controllers/sensors/vr_pwm.cpp        | 2 +-
 firmware/development/logic_analyzer.cpp        | 2 +-
 firmware/hw_layer/sensors/hip9011.cpp          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/firmware/controllers/can/can_dash.cpp b/firmware/controllers/can/can_dash.cpp
index dfa0624c45..9c56b09ac1 100644
--- a/firmware/controllers/can/can_dash.cpp
+++ b/firmware/controllers/can/can_dash.cpp
@@ -404,8 +404,8 @@ void canDashboardBMWE90(CanCycle cycle)
 				rpmcounter = 0xF0;
 			CanTxMessage msg(E90_RPM, 3);
 			msg[0] = rpmcounter;
-			msg[1] = (Sensor::getOrZero(SensorType::Rpm) * 4) & 0xFF;
-			msg[2] = (Sensor::getOrZero(SensorType::Rpm) * 4) >> 8;
+			msg[1] = ((int)(Sensor::getOrZero(SensorType::Rpm)) * 4) & 0xFF;
+			msg[2] = ((int)(Sensor::getOrZero(SensorType::Rpm)) * 4) >> 8;
 		}
 
 		{ //oil & coolant temp (all in C, despite gauge being F)
diff --git a/firmware/controllers/gauges/lcd_controller.cpp b/firmware/controllers/gauges/lcd_controller.cpp
index 475a5b5531..92a64478b9 100644
--- a/firmware/controllers/gauges/lcd_controller.cpp
+++ b/firmware/controllers/gauges/lcd_controller.cpp
@@ -144,7 +144,7 @@ static void showLine(lcd_line_e line, int /*screenY*/) {
 	case LL_RPM:
 	{
 		int seconds = minI(9999, getTimeNowSeconds());
-		lcdPrintf("RPM %d %d ", GET_RPM(), seconds);
+		lcdPrintf("RPM %d %d ", (int)Sensor::getOrZero(SensorType::Rpm), seconds);
 	}
 #if EFI_FILE_LOGGING
 		{
@@ -300,7 +300,7 @@ void updateHD44780lcd(void) {
 //	}
 //	lcd_HD44780_set_position(0, 10);
 //
-//	char * ptr = itoa10(buffer, GET_RPM());
+//	char * ptr = itoa10(buffer, Sensor::getOrZero(SensorType::Rpm));
 //	ptr[0] = 0;
 //	int len = ptr - buffer;
 //	for (int i = 0; i < 6 - len; i++) {
diff --git a/firmware/controllers/math/closed_loop_fuel.cpp b/firmware/controllers/math/closed_loop_fuel.cpp
index f2cfd8c2b0..2098f95706 100644
--- a/firmware/controllers/math/closed_loop_fuel.cpp
+++ b/firmware/controllers/math/closed_loop_fuel.cpp
@@ -91,7 +91,7 @@ ClosedLoopFuelResult fuelClosedLoopCorrection() {
 		return {};
 	}
 
-	size_t binIdx = computeStftBin(GET_RPM(), getFuelingLoad(), engineConfiguration->stft);
+	size_t binIdx = computeStftBin(Sensor::getOrZero(SensorType::Rpm), getFuelingLoad(), engineConfiguration->stft);
 
 #if EFI_TUNER_STUDIO
 	engine->outputChannels.fuelClosedLoopBinIdx = binIdx;
diff --git a/firmware/controllers/sensors/vr_pwm.cpp b/firmware/controllers/sensors/vr_pwm.cpp
index c52ebabd66..710917099f 100644
--- a/firmware/controllers/sensors/vr_pwm.cpp
+++ b/firmware/controllers/sensors/vr_pwm.cpp
@@ -22,7 +22,7 @@ static void updateVrPwm(int rpm, size_t index) {
 }
 
 void updateVrPwm() {
-	auto rpm = GET_RPM();
+	auto rpm = Sensor::getOrZero(SensorType::Rpm);
 
 	for (size_t i = 0; i < efi::size(engineConfiguration->vrThreshold); i++) {
 		updateVrPwm(rpm, i);
diff --git a/firmware/development/logic_analyzer.cpp b/firmware/development/logic_analyzer.cpp
index bf3b9ffdc8..b0c5c53066 100644
--- a/firmware/development/logic_analyzer.cpp
+++ b/firmware/development/logic_analyzer.cpp
@@ -192,7 +192,7 @@ static void reportWave(Logging *logging, int index) {
 		logging->appendPrintf("%s", LOG_DELIMITER);
 
 		uint32_t offsetUs = getWaveOffset(index);
-		int rpm = GET_RPM();
+		int rpm = Sensor::getOrZero(SensorType::Rpm);
 		if (rpm != 0) {
 			float oneDegreeUs = getOneDegreeTimeUs(rpm);
 
diff --git a/firmware/hw_layer/sensors/hip9011.cpp b/firmware/hw_layer/sensors/hip9011.cpp
index 1357be796a..d1b6a28881 100644
--- a/firmware/hw_layer/sensors/hip9011.cpp
+++ b/firmware/hw_layer/sensors/hip9011.cpp
@@ -448,7 +448,7 @@ static msg_t hipThread(void *arg) {
 		msg_t msg;
 
 		/* load new/updated settings */
-		instance.handleSettings(GET_RPM() DEFINE_PARAM_SUFFIX(PASS_HIP_PARAMS));
+		instance.handleSettings(Sensor::getOrZero(SensorType::Rpm) DEFINE_PARAM_SUFFIX(PASS_HIP_PARAMS));
 		/* in advanced more driver will set channel while reading integrator value */
 		if (!instance.adv_mode) {
 			/* switch input channel */