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

---
 firmware/controllers/actuators/vvt.cpp | 4 ++--
 unit_tests/tests/test_vvt.cpp          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/firmware/controllers/actuators/vvt.cpp b/firmware/controllers/actuators/vvt.cpp
index fd6571c071..43006b483d 100644
--- a/firmware/controllers/actuators/vvt.cpp
+++ b/firmware/controllers/actuators/vvt.cpp
@@ -52,7 +52,7 @@ expected<angle_t> VvtController::observePlant() const {
 }
 
 expected<angle_t> VvtController::getSetpoint() {
-	int rpm = GET_RPM();
+	int rpm = Sensor::getOrZero(SensorType::Rpm);
 	float load = getFuelingLoad();
 	float target = m_targetMap->getValue(rpm, load);
 
@@ -90,7 +90,7 @@ expected<percent_t> VvtController::getClosedLoop(angle_t target, angle_t observa
 }
 
 void VvtController::setOutput(expected<percent_t> outputValue) {
-	float rpm = GET_RPM();
+	float rpm = Sensor::getOrZero(SensorType::Rpm);
 
 	// todo: make this configurable?
 	bool enabledAtCurrentRpm = rpm > engineConfiguration->cranking.rpm;
diff --git a/unit_tests/tests/test_vvt.cpp b/unit_tests/tests/test_vvt.cpp
index 2eb55cc0a1..a73d247f0a 100644
--- a/unit_tests/tests/test_vvt.cpp
+++ b/unit_tests/tests/test_vvt.cpp
@@ -5,7 +5,7 @@
 using ::testing::StrictMock;
 using ::testing::Return;
 
-TEST(Vvt, setpoint) {
+TEST(Vvt, TestSetPoint) {
 	EngineTestHelper eth(TEST_ENGINE);
 
 	// Set up a mock target map
@@ -15,7 +15,7 @@ TEST(Vvt, setpoint) {
 
 	// Mock necessary inputs
 	engine->engineState.fuelingLoad = 55;
-	engine->rpmCalculator.mockRpm = 4321;
+	Sensor::setMockValue(SensorType::Rpm,  4321);
 
 	VvtController dut;
 	dut.init(0, 0, 0, &targetMap);