From 76768d6ac45593141ff5f65e78e0efc85886aeb2 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 20 Dec 2021 01:50:23 -0500 Subject: [PATCH] 2 byte table axis #3045 fixing build --- firmware/controllers/math/engine_math.cpp | 4 ++-- firmware/controllers/settings.cpp | 2 +- unit_tests/tests/ignition_injection/test_multispark.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp index d41447323b..98b0eb32a5 100644 --- a/firmware/controllers/math/engine_math.cpp +++ b/firmware/controllers/math/engine_math.cpp @@ -56,11 +56,11 @@ float getIgnitionLoad() { */ void setSingleCoilDwell() { for (int i = 0; i < DWELL_CURVE_SIZE; i++) { - engineConfiguration->sparkDwellRpmBins[i] = i + 1; + engineConfiguration->sparkDwellRpmBins[i] = (i + 1) * 50; engineConfiguration->sparkDwellValues[i] = 4; } - engineConfiguration->sparkDwellRpmBins[5] = 10; + engineConfiguration->sparkDwellRpmBins[5] = 500; engineConfiguration->sparkDwellValues[5] = 4; engineConfiguration->sparkDwellRpmBins[6] = 4500; diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 0f510e348e..a6e3571298 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -895,7 +895,7 @@ const plain_get_integer_s getI_plain[] = { // {"timing_mode", setTimingMode}, // {"engine_type", setEngineType}, {"warning_period", (int*)&engineConfiguration->warningPeriod}, - {"hard_limit", &engineConfiguration->rpmHardLimit}, +// {"hard_limit", &engineConfiguration->rpmHardLimit}, // {"firing_order", setFiringOrder}, // {"injection_pin_mode", setInjectionPinMode}, // {"ignition_pin_mode", setIgnitionPinMode}, diff --git a/unit_tests/tests/ignition_injection/test_multispark.cpp b/unit_tests/tests/ignition_injection/test_multispark.cpp index 9b8bb2a7ac..5125556d87 100644 --- a/unit_tests/tests/ignition_injection/test_multispark.cpp +++ b/unit_tests/tests/ignition_injection/test_multispark.cpp @@ -42,7 +42,7 @@ TEST(Multispark, EnabledNoMaxRpm) { multisparkCfg(); // Practically no RPM limit - engineConfiguration->multisparkMaxRpm = 65000; + engineConfiguration->multisparkMaxRpm = 12500; EXPECT_EQ(0, getMultiSparkCount(0 )); EXPECT_EQ(10, getMultiSparkCount(150 ));