diff --git a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp index 502d2f2930..c72ffb4a2d 100644 --- a/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp +++ b/unit_tests/tests/ignition_injection/test_fuel_wall_wetting.cpp @@ -35,7 +35,7 @@ TEST(fuel, testWallWettingEnrichmentScheduling) { eth.fireTriggerEvents2(/* count */ 4, 25 /* ms */); - ASSERT_EQ( 1200, GET_RPM()) << "RPM"; + ASSERT_EQ( 1200, Sensor::getOrZero(SensorType::Rpm)) << "RPM"; int expectedInvocationCounter = 1; diff --git a/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp b/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp index 1180ea20ff..a0484e8ef0 100644 --- a/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp +++ b/unit_tests/tests/ignition_injection/test_ignition_scheduling.cpp @@ -65,7 +65,7 @@ TEST(ignition, trailingSpark) { eth.fireTriggerEventsWithDuration(20); // still no RPM since need to cycles measure cycle duration eth.fireTriggerEventsWithDuration(20); - ASSERT_EQ( 3000, GET_RPM()) << "RPM#0"; + ASSERT_EQ( 3000, Sensor::getOrZero(SensorType::Rpm)) << "RPM#0"; eth.clearQueue(); /** diff --git a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp index c3c8183ba5..79aeb4797b 100644 --- a/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp +++ b/unit_tests/tests/ignition_injection/test_one_cylinder_logic.cpp @@ -20,7 +20,7 @@ TEST(issues, issueOneCylinderSpecialCase968) { ASSERT_EQ( 0, engine->executor.size()) << "start"; eth.fireTriggerEvents2(/* count */ 2, 50 /* ms */); - ASSERT_EQ( 0, GET_RPM()) << "RPM"; + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "RPM"; ASSERT_EQ( 0, engine->executor.size()) << "first revolution(s)"; eth.fireTriggerEvents2(/* count */ 1, 50 /* ms */); diff --git a/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp b/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp index faceafa5be..8b6a724602 100644 --- a/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp +++ b/unit_tests/tests/ignition_injection/test_startOfCrankingPrimingPulse.cpp @@ -14,15 +14,15 @@ TEST(engine, testPlainCrankingWithoutAdvancedFeatures) { engineConfiguration->cranking.baseFuel = 12; setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð); - ASSERT_EQ( 0, GET_RPM()) << "RPM=0"; + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "RPM=0"; eth.fireTriggerEventsWithDuration(/* durationMs */ 200); // still no RPM since need to cycles measure cycle duration - ASSERT_EQ( 0, GET_RPM()) << "start-RPM#1"; + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "start-RPM#1"; eth.fireRise(/* delayMs */ 200); - ASSERT_EQ( 300, GET_RPM()) << "RPM#2"; + ASSERT_EQ( 300, Sensor::getOrZero(SensorType::Rpm)) << "RPM#2"; // two simultaneous injections ASSERT_EQ( 4, engine->executor.size()) << "plain#2"; @@ -35,7 +35,7 @@ TEST(engine, testPlainCrankingWithoutAdvancedFeatures) { TEST(priming, startScheduling) { EngineTestHelper eth(TEST_ENGINE); - ASSERT_EQ( 0, GET_RPM()) << "RPM=0"; + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "RPM=0"; // Turn on the ignition switch! engine->module()->onIgnitionStateChanged(true); diff --git a/unit_tests/tests/test_accel_enrichment.cpp b/unit_tests/tests/test_accel_enrichment.cpp index 11193c6086..f17b8ad6c0 100644 --- a/unit_tests/tests/test_accel_enrichment.cpp +++ b/unit_tests/tests/test_accel_enrichment.cpp @@ -50,7 +50,7 @@ TEST(fuel, testTpsAccelEnrichmentScheduling) { Sensor::setMockValue(SensorType::Tps1, 7); eth.fireTriggerEvents2(/* count */ 4, 25 /* ms */); - ASSERT_EQ( 1200, GET_RPM()) << "RPM"; + ASSERT_EQ( 1200, Sensor::getOrZero(SensorType::Rpm)) << "RPM"; int expectedInvocationCounter = 1; ASSERT_EQ(expectedInvocationCounter, engine->tpsAccelEnrichment.onUpdateInvocationCounter); diff --git a/unit_tests/tests/test_tacho.cpp b/unit_tests/tests/test_tacho.cpp index 4902d61467..a69499c1ca 100644 --- a/unit_tests/tests/test_tacho.cpp +++ b/unit_tests/tests/test_tacho.cpp @@ -29,7 +29,7 @@ TEST(tachometer, testPulsePerRev) { eth.fireTriggerEvents(48); // ensure engine speed - ASSERT_EQ(1500, GET_RPM()) << "RPM"; + ASSERT_EQ(1500, Sensor::getOrZero(SensorType::Rpm)) << "RPM"; ASSERT_EQ(engine->triggerCentral.triggerState.getShaftSynchronized(), true); // Poke the fast callback to update the tach diff --git a/unit_tests/tests/trigger/test_2jz_vvt.cpp b/unit_tests/tests/trigger/test_2jz_vvt.cpp index 473f94f654..91ffbaf8fb 100644 --- a/unit_tests/tests/trigger/test_2jz_vvt.cpp +++ b/unit_tests/tests/trigger/test_2jz_vvt.cpp @@ -16,14 +16,14 @@ TEST(sensors, test2jz) { engineConfiguration->useOnlyRisingEdgeForTrigger = true; eth.setTriggerType(TT_ONE); - ASSERT_EQ( 0, GET_RPM()) << "test2jz RPM"; + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "test2jz RPM"; for (int i = 0; i < 2;i++) { eth.fireRise(25); - ASSERT_EQ( 0, GET_RPM()) << "test2jz RPM at " << i; + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "test2jz RPM at " << i; } eth.fireRise(25); // first time we have RPM - ASSERT_EQ(2400, GET_RPM()) << "test2jz RPM"; + ASSERT_EQ(2400, Sensor::getOrZero(SensorType::Rpm)) << "test2jz RPM"; eth.moveTimeForwardUs(MS2US(3)); // shifting VVT phase a few angles diff --git a/unit_tests/tests/trigger/test_map_cam.cpp b/unit_tests/tests/trigger/test_map_cam.cpp index 59a5177ac3..605ec38335 100644 --- a/unit_tests/tests/trigger/test_map_cam.cpp +++ b/unit_tests/tests/trigger/test_map_cam.cpp @@ -15,7 +15,7 @@ TEST(trigger, map_cam_by_magic_point) { engineConfiguration->mapCamDetectionAnglePosition = 90; eth.smartFireTriggerEvents2(/*count*/10, /*delayMs*/200); - ASSERT_EQ(150, GET_RPM()) << "RPM"; + ASSERT_EQ(150, Sensor::getOrZero(SensorType::Rpm)) << "RPM"; ASSERT_EQ(1, engine->outputChannels.TEMPLOG_map_peak); ASSERT_EQ(0, engine->outputChannels.vvtSyncCounter); diff --git a/unit_tests/tests/trigger/test_quad_cam.cpp b/unit_tests/tests/trigger/test_quad_cam.cpp index 078c8cbb79..923a67f027 100644 --- a/unit_tests/tests/trigger/test_quad_cam.cpp +++ b/unit_tests/tests/trigger/test_quad_cam.cpp @@ -24,14 +24,14 @@ TEST(trigger, testQuadCam) { engineConfiguration->useOnlyRisingEdgeForTrigger = true; engineConfiguration->vvtCamSensorUseRise = true; - ASSERT_EQ(0, GET_RPM()); + ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)); for (int i = 0; i < 2;i++) { eth.fireRise(25); - ASSERT_EQ( 0, GET_RPM()); + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)); } eth.fireRise(25); // first time we have RPM - ASSERT_EQ(2400, GET_RPM()); + ASSERT_EQ(2400, Sensor::getOrZero(SensorType::Rpm)); // need to be out of VVT sync to see VVT sync in action eth.fireRise(25); diff --git a/unit_tests/tests/trigger/test_rpm_multiplier.cpp b/unit_tests/tests/trigger/test_rpm_multiplier.cpp index 744b6c00f5..81ed779b19 100644 --- a/unit_tests/tests/trigger/test_rpm_multiplier.cpp +++ b/unit_tests/tests/trigger/test_rpm_multiplier.cpp @@ -15,7 +15,7 @@ static void runRpmTest(operation_mode_e mode, int expected) { eth.setTriggerType(TT_ONE); eth.smartFireTriggerEvents2(/*count*/200, /*delay*/ 40); - ASSERT_EQ(expected, GET_RPM()); + ASSERT_EQ(expected, Sensor::getOrZero(SensorType::Rpm)); } // todo: google test profiles one day? diff --git a/unit_tests/tests/trigger/test_trigger_input_adc.cpp b/unit_tests/tests/trigger/test_trigger_input_adc.cpp index 61dccdfb38..b2d90c26b3 100644 --- a/unit_tests/tests/trigger/test_trigger_input_adc.cpp +++ b/unit_tests/tests/trigger/test_trigger_input_adc.cpp @@ -84,7 +84,7 @@ TEST(big, testTriggerInputAdc) { eth.setTriggerType(TT_TOOTHED_WHEEL_60_2); ASSERT_EQ(0, engine->triggerCentral.triggerState.totalTriggerErrorCounter); - ASSERT_EQ(0, GET_RPM()) << "testTriggerInputAdc RPM #1"; + ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)) << "testTriggerInputAdc RPM #1"; trigAdcState.init(); setTriggerAdcMode(TRIGGER_ADC_ADC); @@ -95,6 +95,6 @@ TEST(big, testTriggerInputAdc) { simulateTrigger(trigAdcState, reader, 2.0f, 3.3f); ASSERT_EQ(0, engine->triggerCentral.triggerState.totalTriggerErrorCounter); - ASSERT_EQ(0, GET_RPM()) << "testTriggerInputAdc RPM #2"; + ASSERT_EQ(0, Sensor::getOrZero(SensorType::Rpm)) << "testTriggerInputAdc RPM #2"; } diff --git a/unit_tests/tests/trigger/test_trigger_noiseless.cpp b/unit_tests/tests/trigger/test_trigger_noiseless.cpp index df16494945..a74fd674f0 100644 --- a/unit_tests/tests/trigger/test_trigger_noiseless.cpp +++ b/unit_tests/tests/trigger/test_trigger_noiseless.cpp @@ -98,7 +98,7 @@ static void testNoiselessDecoderProcedure(EngineTestHelper ð, int errorTolera // check if we're imitating the 60-2 signal correctly ASSERT_EQ( 0, eth.engine.triggerCentral.triggerState.getCurrentIndex()) << "index #1"; // check rpm (60secs / (1000us * 60teeth)) = 1000rpm - ASSERT_EQ( 1000, GET_RPM()) << "testNoiselessDecoder RPM"; + ASSERT_EQ( 1000, Sensor::getOrZero(SensorType::Rpm)) << "testNoiselessDecoder RPM"; // add noise1 - 1 spike in the middle of the 2nd rising pulse fireNoisyCycle60_2(ð, 2, 1000, 2, 10, 500, 1); @@ -171,7 +171,7 @@ TEST(big, testNoiselessDecoder) { eth.setTriggerType(TT_TOOTHED_WHEEL_60_2); ASSERT_EQ(0, engine->triggerCentral.triggerState.totalTriggerErrorCounter); - ASSERT_EQ( 0, GET_RPM()) << "testNoiselessDecoder RPM"; + ASSERT_EQ( 0, Sensor::getOrZero(SensorType::Rpm)) << "testNoiselessDecoder RPM"; //printTriggerDebug = true;