From f6c4f48c6518e903f4fa06d582866d60577b895c Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 12 Apr 2024 16:48:55 -0400 Subject: [PATCH] pain --- firmware/controllers/algo/event_registry.h | 1 + unit_tests/tests/trigger/test_real_noisy_trigger.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/algo/event_registry.h b/firmware/controllers/algo/event_registry.h index 6e3ddb3fff..e911e3e71d 100644 --- a/firmware/controllers/algo/event_registry.h +++ b/firmware/controllers/algo/event_registry.h @@ -76,6 +76,7 @@ public: * [0, cylindersCount) */ int cylinderIndex = 0; + // previously known as cylinderNumber int8_t coilIndex = 0; char *name = nullptr; IgnitionOutputPin *getOutputForLoggins(); diff --git a/unit_tests/tests/trigger/test_real_noisy_trigger.cpp b/unit_tests/tests/trigger/test_real_noisy_trigger.cpp index 6bfe4ea7ba..c751ce6175 100644 --- a/unit_tests/tests/trigger/test_real_noisy_trigger.cpp +++ b/unit_tests/tests/trigger/test_real_noisy_trigger.cpp @@ -32,11 +32,11 @@ static void testNoOverdwell(const char* file, bool instantRpm) { engine->onIgnitionEvent = [&](IgnitionEvent* event, bool state) { if (state) { - coilStartTimes[event->cylinderNumber] = getTimeNowNt(); + coilStartTimes[event->coilIndex] = getTimeNowNt(); } else { - auto actualDwell = 1e-3 * NT2USF(getTimeNowNt() - coilStartTimes[event->cylinderNumber]); + auto actualDwell = 1e-3 * NT2USF(getTimeNowNt() - coilStartTimes[event->coilIndex]); - EXPECT_LT(actualDwell, 50) << "Overdwell on cylinder " << (int)event->cylinderNumber << " of " << actualDwell << " ms"; + EXPECT_LT(actualDwell, 50) << "Overdwell on cylinder " << (int)event->coilIndex << " of " << actualDwell << " ms"; } };