From 8642a0a6c7c790e88423afb4a940413aef7eb4fa Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Wed, 25 Mar 2020 20:00:17 -0700 Subject: [PATCH] TS cleanup pass (#1225) * remove biquad config * fuel pump clarity * one code usage * minimal generate for ci * and don't build it either * remove commented out code --- firmware/config/engines/dodge_neon.cpp | 6 ------ firmware/hw_layer/adc_inputs.cpp | 2 -- firmware/integration/rusefi_config.txt | 12 ++---------- firmware/tunerstudio/rusefi.input | 19 ++++++++++--------- firmware/util/util.mk | 1 - 5 files changed, 12 insertions(+), 28 deletions(-) diff --git a/firmware/config/engines/dodge_neon.cpp b/firmware/config/engines/dodge_neon.cpp index c2b441c480..4398a29b6f 100644 --- a/firmware/config/engines/dodge_neon.cpp +++ b/firmware/config/engines/dodge_neon.cpp @@ -265,12 +265,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->specs.displacement = 1.996; engineConfiguration->specs.cylindersCount = 4; - engineConfiguration->biQuad.a0 = 0.0000024635293743901; - engineConfiguration->biQuad.a1 = 0.00000492705874878021; - engineConfiguration->biQuad.a2 = 0.0000024635293743901; - engineConfiguration->biQuad.b1 = -1.9968534854; - engineConfiguration->biQuad.b2 = 0.9968633396; - /** * 77C * 1200 rpm diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index fc8bad8a52..90dafb2f21 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -42,8 +42,6 @@ #define ADC_BUF_DEPTH_SLOW 8 #define ADC_BUF_DEPTH_FAST 4 -//static Biquad biq[ADC_MAX_CHANNELS_COUNT]; - static adc_channel_mode_e adcHwChannelEnabled[HW_MAX_ADC_INDEX]; static const char * adcHwChannelUsage[HW_MAX_ADC_INDEX]; diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index fff9f63eb9..151eb59803 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -309,14 +309,6 @@ float[VBAT_INJECTOR_CURVE_SIZE] battLagCorr;ms delay between injector open and c end_struct -struct bi_quard_s - float a0;;"v", 1, 0, -1000, 1000, 9 - float a1;;"v", 1, 0, -1000, 1000, 9 - float a2;;"v", 1, 0, -1000, 1000, 9 - float b1;;"v", 1, 0, -1000, 1000, 9 - float b2;;"v", 1, 0, -1000, 1000, 9 - -end_struct injector_s injector @@ -330,7 +322,7 @@ bit activateAuxPid3; bit isVerboseAuxPid3; bit activateAuxPid4; bit isVerboseAuxPid4; -bit useBiQuadAnalogFiltering; +bit unused76b9; bit cj125isUaDivided;+Is your UA CJ125 output wired to MCU via resistor divider? bit cj125isLsu49; bit etb_use_two_wires; @@ -1049,7 +1041,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygenBins;Narrow Band WBO Approximation;"V", 1, 0, -10.0, 10.0, 3 float[NARROW_BAND_WIDE_BAND_CONVERSION_SIZE] narrowToWideOxygen;;"ratio", 1, 0, -40.0, 40.0, 2 vvt_mode_e vvtMode;set vvt_mode X - bi_quard_s biQuad; + uint8_t[20] unusedOldBiquad float[CLT_TIMING_CURVE_SIZE] cltTimingBins;CLT-based timing correction;"C", 1, 0, -100.0, 250.0, 1 float[CLT_TIMING_CURVE_SIZE] cltTimingExtra;;"degree", 1, 0, -400.0, 400.0, 0 int nbVvtIndex;;"index", 1, 0, 0, 4.0, 0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 34aa523ed0..57b54f114c 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1101,7 +1101,7 @@ menuDialog = main # Digital outputs subMenu = mainRelay, "Main relay" subMenu = starterRelay, "Starter Disable relay" - subMenu = fuelPump, "Fuel rail" + subMenu = fuelPump, "Fuel pump & rail" subMenu = fanSetting, "Fan" subMenu = tachSettings, "Tachometer" subMenu = malfunction, "Check engine light" @@ -2060,13 +2060,20 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "On temperature", fanOnTemperature field = "Off temperature", fanOffTemperature - dialog = fuelPump, "Fuel Rail" + dialog = fuelPumpConfig, "Fuel Pump" field = "Pin", fuelPumpPin field = "Pin mode", fuelPumpPinMode field = "Prime duration", startUpFuelPumpDuration + + dialog = fuelRailConfig, "Fuel Rail" field = "Absolute Fuel Pressure", absoluteFuelPressure field = "Fuel Rail pressure", fuelRailPressure, {absoluteFuelPressure == 1} + dialog = fuelPump, "" + panel = fuelPumpConfig + panel = fuelRailConfig + + ; Controller->Actuator Outputs dialog = mainRelay, "Main relay output" field = "Pin", mainRelayPin @@ -2232,13 +2239,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!ECU reboot needed to apply these settings" field = "Use fixed baro corr from MAP", useFixedBaroCorrFromMap field = "Analog divider ratio", analogInputDividerCoefficient@@if_ts_show_analog_divider - field = "Use BiQuad averaging", useBiQuadAnalogFiltering - field = "Smoothing factor", slowAdcAlpha, {useBiQuadAnalogFiltering == 0} - field = "Bi_Q a0", biQuad_a0, {useBiQuadAnalogFiltering == 1} - field = "Bi_Q a1", biQuad_a1, {useBiQuadAnalogFiltering == 1} - field = "Bi_Q a2", biQuad_a2, {useBiQuadAnalogFiltering == 1} - field = "Bi_Q b1", biQuad_b1, {useBiQuadAnalogFiltering == 1} - field = "Bi_Q b2", biQuad_b2, {useBiQuadAnalogFiltering == 1} + field = "Smoothing factor", slowAdcAlpha dialog = tachSettings, "Tachometer output" field = "!See also dizzySparkOutputPin" diff --git a/firmware/util/util.mk b/firmware/util/util.mk index 5b47622abf..d70103429d 100644 --- a/firmware/util/util.mk +++ b/firmware/util/util.mk @@ -15,7 +15,6 @@ UTILSRC_CPP = \ $(UTIL_DIR)/math/pid.cpp \ $(UTIL_DIR)/math/avg_values.cpp \ $(UTIL_DIR)/math/interpolation.cpp \ - $(UTIL_DIR)/math/biquad.cpp \ $(PROJECT_DIR)/util/datalogging.cpp \ $(PROJECT_DIR)/util/loggingcentral.cpp \ $(PROJECT_DIR)/util/cli_registry.cpp \