From f008a98b9418fbd4002ee5348468d83aa2e4face Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 3 Sep 2022 17:12:47 -0400 Subject: [PATCH] refactoring: reducing outputChannels copy --- firmware/console/binary/output_channels.txt | 3 --- firmware/console/status_loop.cpp | 6 ------ firmware/controllers/algo/engine_state.txt | 6 +++--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 8c5bed4ce7..41e869ffee 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -92,9 +92,6 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0 ! Corrections ! todo: inline this further to injectorModel deadTime uint16_t autoscale injectorLagMs;@@GAUGE_NAME_INJECTOR_LAG@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 - uint16_t autoscale iatCorrection;@@GAUGE_NAME_FUEL_IAT_CORR@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 - uint16_t autoscale cltCorrection;@@GAUGE_NAME_FUEL_CLT_CORR@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 - uint16_t autoscale baroCorrection;@@GAUGE_NAME_FUEL_BARO_CORR@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 ! Wall model AE uint16_t autoscale wallFuelAmount;@@GAUGE_NAME_FUEL_WALL_AMOUNT@@;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 int16_t autoscale wallFuelCorrection;@@GAUGE_NAME_FUEL_WALL_CORRECTION@@;"mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0, 0, 0, 0 diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index fb1feb97a6..8fdfb6bb80 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -305,8 +305,6 @@ static void showFuelInfo2(float rpm, float engineLoad) { efiPrintf("injection phase=%.2f/global fuel correction=%.2f", getInjectionOffset(rpm, getFuelingLoad()), engineConfiguration->globalFuelCorrection); - efiPrintf("baro correction=%.2f", engine->engineState.baroCorrection); - #if EFI_ENGINE_CONTROL efiPrintf("base cranking fuel %.2f", engineConfiguration->cranking.baseFuel); efiPrintf("cranking fuel: %.2f", engine->engineState.cranking.fuel); @@ -620,10 +618,6 @@ static void updateSensors() { } static void updateFuelCorrections() { - engine->outputChannels.baroCorrection = engine->engineState.baroCorrection; - engine->outputChannels.iatCorrection = engine->engineState.running.intakeTemperatureCoefficient; - engine->outputChannels.cltCorrection = engine->engineState.running.coolantTemperatureCoefficient; - engine->outputChannels.fuelPidCorrection[0] = 100.0f * (engine->stftCorrection[0] - 1.0f); engine->outputChannels.fuelPidCorrection[1] = 100.0f * (engine->stftCorrection[1] - 1.0f); diff --git a/firmware/controllers/algo/engine_state.txt b/firmware/controllers/algo/engine_state.txt index 5fe4e14aee..4700402a5f 100644 --- a/firmware/controllers/algo/engine_state.txt +++ b/firmware/controllers/algo/engine_state.txt @@ -41,7 +41,7 @@ float tpsVoltageBoard float currentBaroCorrectedVE; float injectorFlowCorrection; -float baroCorrection; +float baroCorrection;@@GAUGE_NAME_FUEL_BARO_CORR@@ struct cranking_fuel_s @@ -62,8 +62,8 @@ cranking_fuel_s cranking struct running_fuel_s float postCrankingFuelCorrection - float intakeTemperatureCoefficient - float coolantTemperatureCoefficient + float intakeTemperatureCoefficient;@@GAUGE_NAME_FUEL_IAT_CORR@@ + float coolantTemperatureCoefficient@@GAUGE_NAME_FUEL_CLT_CORR@@ float timeSinceCrankingInSecs floatms_t baseFuel;