From 2368e90ae7ab4743762db06b8f165299cb3f430e Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Fri, 23 Jul 2021 05:31:23 -0700 Subject: [PATCH] dead (#3016) --- firmware/controllers/algo/auto_generated_codes.cpp | 2 -- firmware/controllers/algo/obd_error_codes.h | 2 +- firmware/controllers/engine_controller.cpp | 4 ---- firmware/controllers/engine_cycle/main_trigger_callback.cpp | 2 +- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.input | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/firmware/controllers/algo/auto_generated_codes.cpp b/firmware/controllers/algo/auto_generated_codes.cpp index dc4c77cdd7..7cad8665e5 100644 --- a/firmware/controllers/algo/auto_generated_codes.cpp +++ b/firmware/controllers/algo/auto_generated_codes.cpp @@ -489,8 +489,6 @@ case CUSTOM_ICU_DRIVER_STATE: return "CUSTOM_ICU_DRIVER_STATE"; case CUSTOM_IDLE_WAVE_CNT: return "CUSTOM_IDLE_WAVE_CNT"; -case CUSTOM_IGN_MATH_STATE: - return "CUSTOM_IGN_MATH_STATE"; case CUSTOM_IH_STACK: return "CUSTOM_IH_STACK"; case CUSTOM_INJ_DURATION: diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h index 605dc9d90e..64021b67c0 100644 --- a/firmware/controllers/algo/obd_error_codes.h +++ b/firmware/controllers/algo/obd_error_codes.h @@ -1982,7 +1982,7 @@ typedef enum { CUSTOM_ERR_6628 = 6628, CUSTOM_STACK_6629 = 6629, - CUSTOM_IGN_MATH_STATE = 6630, + CUSTOM_ERR_6030 = 6630, CUSTOM_ERR_6631 = 6631, CUSTOM_ERR_6632 = 6632, CUSTOM_ANGLE_NAN = 6633, diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index db83a87009..c10bb3a495 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -231,10 +231,6 @@ static void doPeriodicSlowCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) { } } - // for performance reasons this assertion related to mainTriggerCallback should better be here - efiAssertVoid(CUSTOM_IGN_MATH_STATE, !CONFIG(useOnlyRisingEdgeForTrigger) || CONFIG(ignMathCalculateAtIndex) % 2 == 0, "invalid ignMathCalculateAtIndex"); - - /** * Update engine RPM state if needed (check timeouts). */ diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp index 52cc2d75e8..1c6a71e20e 100644 --- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp +++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp @@ -447,7 +447,7 @@ void mainTriggerCallback(uint32_t trgEventIndex, efitick_t edgeTimestamp DECLARE } } - if (trgEventIndex == (uint32_t)CONFIG(ignMathCalculateAtIndex)) { + if (trgEventIndex == 0) { if (isAdcChannelValid(CONFIG(externalKnockSenseAdc))) { float externalKnockValue = getVoltageDivided("knock", engineConfiguration->externalKnockSenseAdc PASS_ENGINE_PARAMETER_SUFFIX); engine->knockLogic(externalKnockValue PASS_ENGINE_PARAMETER_SUFFIX); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index c1ccb8bc41..9bec1545d5 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1157,7 +1157,7 @@ bit unused_1484_bit_31 int16_t primeInjFalloffTemperature;+This sets the temperature above which no priming pulse is used, The value at -40 is reduced until there is no more priming injection at this temperature.;"*C", 1, 0, 0, 1000, 0 - int ignMathCalculateAtIndex;+At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback.;"index", 1, 0, 0, 7000, 0 + int unused1488;;"index", 1, 0, 0, 7000, 0 brain_pin_e[CAM_INPUTS_COUNT iterate] camInputsDebug; uint8_t[CAM_INPUTS_COUNT_padding] camInputsDebugPadding;; diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 5fb14468f1..70cb055853 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -3627,7 +3627,6 @@ cmd_set_engine_type_default = "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00" dialog = parkingLot, "Experimental/Broken" field = "#System hacks" field = "Global fuel correction", globalFuelCorrection - field = "Ignition Math Logic @", ignMathCalculateAtIndex field = "MAP Averaging Logic @", mapAveragingSchedulingAtIndex field = "showHumanReadableWarning (affects Burn)", showHumanReadableWarning field = "Warning Message", warning_message