From 074e85b523c79408fb13a31155ec72bf7ac4b4f9 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 14 Nov 2021 11:40:19 -0500 Subject: [PATCH] Epic: Remove FSIO #2928 --- firmware/controllers/core/fsio_core.cpp | 13 ++----------- firmware/controllers/core/fsio_core.h | 2 +- firmware/controllers/core/fsio_impl.cpp | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/firmware/controllers/core/fsio_core.cpp b/firmware/controllers/core/fsio_core.cpp index 468bca7355..e25187d88d 100644 --- a/firmware/controllers/core/fsio_core.cpp +++ b/firmware/controllers/core/fsio_core.cpp @@ -206,17 +206,8 @@ FsioResult LECalculator::processElement(const LEElement *element DECLARE_ENGINE_ case LE_METHOD_FSIO_SETTING: { return unexpected; } - case LE_METHOD_SCRIPT_TABLE_: { - float i = pop(LE_METHOD_SCRIPT_TABLE_); - float yValue = pop(LE_METHOD_SCRIPT_TABLE_); - float xValue = pop(LE_METHOD_SCRIPT_TABLE_); - int index = (int) i; - if (index < 1 || index > MAX_TABLE_INDEX) { - return unexpected; - } else { - // index parameter is 1-based, getscriptTable is 0-based - return getscriptTable(index - 1)->getValue(xValue, yValue); - } + case LE_METHOD_SCRIPT_TABLE: { + return unexpected; } case LE_METHOD_FSIO_DIGITAL_INPUT: // todo: implement code for digital input!!! diff --git a/firmware/controllers/core/fsio_core.h b/firmware/controllers/core/fsio_core.h index d19103c46f..31bb37adf5 100644 --- a/firmware/controllers/core/fsio_core.h +++ b/firmware/controllers/core/fsio_core.h @@ -40,7 +40,7 @@ typedef enum { LE_METHOD_VBATT = 109, LE_METHOD_AC_TOGGLE = 110, LE_METHOD_TIME_SINCE_AC_TOGGLE = 111, - LE_METHOD_SCRIPT_TABLE_ = 113, + LE_METHOD_SCRIPT_TABLE = 113, LE_METHOD_SELF = 114, LE_METHOD_MAP = 115, LE_METHOD_FSIO_ANALOG_INPUT = 116, diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp index 58df9442cd..8fda12d0ac 100644 --- a/firmware/controllers/core/fsio_impl.cpp +++ b/firmware/controllers/core/fsio_impl.cpp @@ -57,7 +57,6 @@ static LENameOrdinalPair leAcToggle(LE_METHOD_AC_TOGGLE, "ac_on_switch"); static LENameOrdinalPair leTimeSinceAcToggle(LE_METHOD_TIME_SINCE_AC_TOGGLE, "time_since_ac_on_switch"); static LENameOrdinalPair leTimeSinceBoot(LE_METHOD_TIME_SINCE_BOOT, "time_since_boot"); static LENameOrdinalPair leFsioSetting(LE_METHOD_FSIO_SETTING, FSIO_METHOD_FSIO_SETTING); -static LENameOrdinalPair lescriptTable(LE_METHOD_SCRIPT_TABLE_, FSIO_METHOD_SCRIPT_TABLE_); static LENameOrdinalPair leFsioAnalogInput(LE_METHOD_FSIO_ANALOG_INPUT, FSIO_METHOD_FSIO_ANALOG_INPUT); static LENameOrdinalPair leFsioDigitalInput(LE_METHOD_FSIO_DIGITAL_INPUT, FSIO_METHOD_FSIO_DIGITAL_INPUT); static LENameOrdinalPair leIntakeVVT(LE_METHOD_INTAKE_VVT, "ivvt");