From d97bcec161bc52d4b254983441eeb634c25998ec Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 9 Aug 2022 20:32:39 -0400 Subject: [PATCH] refactoring: better field name --- firmware/controllers/trigger/trigger_decoder.cpp | 2 +- firmware/controllers/trigger/trigger_state.txt | 2 +- firmware/controllers/trigger/trigger_state_generated.h | 2 +- unit_tests/tests/trigger/test_map_cam.cpp | 4 ++-- unit_tests/tests/trigger/test_real_nb2_cranking.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp index cd392c5c39..070fb550dd 100644 --- a/firmware/controllers/trigger/trigger_decoder.cpp +++ b/firmware/controllers/trigger/trigger_decoder.cpp @@ -390,7 +390,7 @@ angle_t PrimaryTriggerDecoder::syncEnginePhase(int divider, int remainder, angle m_hasSynchronizedPhase = true; if (totalShift > 0) { - vvtSyncCounter++; + camResyncCounter++; } return totalShift; diff --git a/firmware/controllers/trigger/trigger_state.txt b/firmware/controllers/trigger/trigger_state.txt index 5f22eb4167..1ff4cc52d5 100644 --- a/firmware/controllers/trigger/trigger_state.txt +++ b/firmware/controllers/trigger/trigger_state.txt @@ -7,6 +7,6 @@ struct_no_prefix trigger_state_s uint8_t triggerStateIndex uint8_t vvtCounter - uint8_t vvtSyncCounter + uint8_t camResyncCounter uint8_t vvtStateIndex end_struct diff --git a/firmware/controllers/trigger/trigger_state_generated.h b/firmware/controllers/trigger/trigger_state_generated.h index 437bfd051d..0f2fcbe1cb 100644 --- a/firmware/controllers/trigger/trigger_state_generated.h +++ b/firmware/controllers/trigger/trigger_state_generated.h @@ -38,7 +38,7 @@ struct trigger_state_s { /** * offset 22 */ - uint8_t vvtSyncCounter = (uint8_t)0; + uint8_t camResyncCounter = (uint8_t)0; /** * offset 23 */ diff --git a/unit_tests/tests/trigger/test_map_cam.cpp b/unit_tests/tests/trigger/test_map_cam.cpp index ac581a99b0..6a86244b91 100644 --- a/unit_tests/tests/trigger/test_map_cam.cpp +++ b/unit_tests/tests/trigger/test_map_cam.cpp @@ -25,7 +25,7 @@ TEST(trigger, map_cam_by_magic_point) { ASSERT_EQ(150, Sensor::getOrZero(SensorType::Rpm)) << "RPM"; ASSERT_EQ(1, engine->triggerCentral.mapVvt_map_peak); - ASSERT_EQ(0, engine->triggerCentral.triggerState.vvtSyncCounter); + ASSERT_EQ(0, engine->triggerCentral.triggerState.camResyncCounter); // Nothing should have been scheduled yet ASSERT_EQ(1, engine->executor.size()); @@ -36,7 +36,7 @@ TEST(trigger, map_cam_by_magic_point) { eth.smartFireTriggerEvents2(/*count*/4, /*delayMs*/200); ASSERT_EQ(2, engine->triggerCentral.mapVvt_map_peak); - ASSERT_EQ(1, engine->triggerCentral.triggerState.vvtSyncCounter); + ASSERT_EQ(1, engine->triggerCentral.triggerState.camResyncCounter); ASSERT_EQ(10, engine->triggerCentral.mapVvt_MAP_AT_CYCLE_COUNT); ASSERT_EQ(ClearReason::None, eth.engine.limpManager.allowIgnition().reason); diff --git a/unit_tests/tests/trigger/test_real_nb2_cranking.cpp b/unit_tests/tests/trigger/test_real_nb2_cranking.cpp index 36cd22aca8..6e21eeaccc 100644 --- a/unit_tests/tests/trigger/test_real_nb2_cranking.cpp +++ b/unit_tests/tests/trigger/test_real_nb2_cranking.cpp @@ -24,7 +24,7 @@ TEST(realCrankingNB2, normalCranking) { // Check the number of times VVT information was used to adjust crank phase // This should happen exactly once: once we sync, we shouldn't lose it. - EXPECT_EQ(engine->triggerCentral.triggerState.vvtSyncCounter, 2); + EXPECT_EQ(engine->triggerCentral.triggerState.camResyncCounter, 2); ASSERT_EQ(942, round(Sensor::getOrZero(SensorType::Rpm)));