From 6210eaacf777092c7358be22e2d35569dab7cb56 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 13 Nov 2021 23:10:38 -0500 Subject: [PATCH] script settings need names! --- firmware/controllers/core/fsio_core.cpp | 2 +- firmware/controllers/core/fsio_impl.cpp | 4 ++-- firmware/controllers/engine_cycle/spark_logic.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/controllers/core/fsio_core.cpp b/firmware/controllers/core/fsio_core.cpp index 6c52a139b8..f165b8c092 100644 --- a/firmware/controllers/core/fsio_core.cpp +++ b/firmware/controllers/core/fsio_core.cpp @@ -207,7 +207,7 @@ FsioResult LECalculator::processElement(const LEElement *element DECLARE_ENGINE_ float humanIndex = pop(LE_METHOD_FSIO_SETTING); int index = (int) humanIndex - 1; if (index >= 0 && index < FSIO_COMMAND_COUNT) { - return CONFIG(fsio_setting)[index]; + return CONFIG(scriptSetting)[index]; } else { return unexpected; } diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index 13acb4a0b7..9296d60335 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -538,7 +538,7 @@ static void showFsioInfo(void) { } } for (int i = 0; i < FSIO_COMMAND_COUNT; i++) { - float v = CONFIG(fsio_setting)[i]; + float v = CONFIG(scriptSetting)[i]; if (!cisnan(v)) { efiPrintf("user property #%d: %.2f", i + 1, v); } @@ -562,7 +562,7 @@ static void setFsioSetting(float humanIndexF, float value) { efiPrintf("invalid FSIO index: %d", (int)humanIndexF); return; } - engineConfiguration->fsio_setting[index] = value; + engineConfiguration->scriptSetting[index] = value; showFsioInfo(); #endif } diff --git a/firmware/controllers/engine_cycle/spark_logic.cpp b/firmware/controllers/engine_cycle/spark_logic.cpp index c38db76ac6..048684ce35 100644 --- a/firmware/controllers/engine_cycle/spark_logic.cpp +++ b/firmware/controllers/engine_cycle/spark_logic.cpp @@ -556,7 +556,7 @@ void onTriggerEventSparkLogic(bool limitedSpark, uint32_t trgEventIndex, int rpm if (event->dwellPosition.triggerEventIndex != trgEventIndex) continue; - if (i == 0 && CONFIG(artificialTestMisfire) && (getRevolutionCounter() % ((int)engineConfiguration->fsio_setting[5]) == 0)) { + if (i == 0 && CONFIG(artificialTestMisfire) && (getRevolutionCounter() % ((int)engineConfiguration->scriptSetting[5]) == 0)) { // artificial misfire on cylinder #1 for testing purposes // enable artificialMisfire // set_fsio_setting 6 20