rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove deprecated getEngineLoadT (#2676) 

* remove

* few more
This commit is contained in:
Matthew Kennedy 2021-05-10 05:30:41 -07:00 committed by GitHub
parent 6a060e5cae
commit da6518dcb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/tunerstudio_outputs.h
View File

@ -106,7 +106,7 @@ typedef struct {
scaled_pressure baroPressure; // 32
scaled_lambda lambda; // 34
scaled_channel<uint16_t, 100> engineLoad; // 36
uint16_t unused36; // 36
// misc sensors
scaled_voltage vBatt; // 38

1
firmware/console/binary_log/binary_logging.cpp
View File

@ -69,7 +69,6 @@ static constexpr LogField fields[] = {
{tsOutputChannels.flexPercent, GAUGE_NAME_FLEX, "%", 1},
{tsOutputChannels.fuelFlowRate, GAUGE_NAME_FUEL_FLOW, "g/s", 3},
{tsOutputChannels.totalFuelConsumption, GAUGE_NAME_FUEL_CONSUMPTION, "g", 1},
{tsOutputChannels.engineLoad, GAUGE_NAME_ENGINE_LOAD, "%", 1},
{tsOutputChannels.knockLevel, GAUGE_NAME_KNOCK_LEVEL, "dBv", 0},
};

3
firmware/console/status_loop.cpp
View File

@ -541,9 +541,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->lambda2 = lambda2Value;
tsOutputChannels->airFuelRatio2 = lambda2Value * ENGINE(engineState.stoichiometricRatio);
// offset 24
tsOutputChannels->engineLoad = getEngineLoadT(PASS_ENGINE_PARAMETER_SIGNATURE);
tsOutputChannels->fuelingLoad = getFuelingLoad(PASS_ENGINE_PARAMETER_SIGNATURE);
tsOutputChannels->ignitionLoad = getIgnitionLoad(PASS_ENGINE_PARAMETER_SIGNATURE);
tsOutputChannels->veTableYAxis = ENGINE(engineState.currentVeLoad);

20
firmware/controllers/math/engine_math.cpp
View File

@ -57,26 +57,6 @@ float getIgnitionLoad(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return ENGINE(engineState.ignitionLoad);
}
/**
* @brief Returns engine load according to selected engine_load_mode
*
*/
float getEngineLoadT(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
efiAssert(CUSTOM_ERR_ASSERT, engine!=NULL, "engine 2NULL", NAN);
efiAssert(CUSTOM_ERR_ASSERT, engineConfiguration!=NULL, "engineConfiguration 2NULL", NAN);
switch (engineConfiguration->fuelAlgorithm) {
case LM_SPEED_DENSITY:
return Sensor::get(SensorType::Map).value_or(0);
case LM_ALPHA_N:
return Sensor::get(SensorType::Tps1).value_or(0);
case LM_REAL_MAF:
return Sensor::get(SensorType::Maf).value_or(0);
default:
firmwareError(CUSTOM_UNKNOWN_ALGORITHM, "Unexpected engine load parameter: %d", engineConfiguration->fuelAlgorithm);
return 0;
}
}
/**
* see also setConstantDwell
*/

2
firmware/controllers/math/engine_math.h
View File

@ -39,8 +39,6 @@ floatms_t getEngineCycleDuration(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX);
float getFuelingLoad(DECLARE_ENGINE_PARAMETER_SIGNATURE);
float getIgnitionLoad(DECLARE_ENGINE_PARAMETER_SIGNATURE);
// getEngineLoadT is deprecated - please use one of the above functions, getFuelingLoad or getIgnitionMode
float getEngineLoadT(DECLARE_ENGINE_PARAMETER_SIGNATURE);
floatms_t getSparkDwell(int rpm DECLARE_ENGINE_PARAMETER_SUFFIX);

1
firmware/integration/rusefi_config.txt
View File

@ -1683,7 +1683,6 @@ end_struct
#define GAUGE_NAME_TPS2 "TPS2"
#define GAUGE_NAME_MAP "MAP"
#define GAUGE_NAME_MAF "MAF"
#define GAUGE_NAME_ENGINE_LOAD "Engine Load"
#define GAUGE_NAME_CPU_TEMP "CPU Temperature"
#define GAUGE_NAME_ETB_TARGET "ETB position target"
#define GAUGE_NAME_WG_POSITION "Wastegate position sensor"

2
firmware/tunerstudio/rusefi.input
View File

@ -232,7 +232,6 @@ enable2ndByteCanID = false
MAPValue = scalar, U16, 30, "kPa",{1/@@PACK_MULT_PRESSURE@@}, 0.0
baroPressure = scalar, U16, 32, "kPa",{1/@@PACK_MULT_PRESSURE@@}, 0.0
lambdaValue = scalar, U16, 34, "",{1/@@PACK_MULT_LAMBDA@@}, 0.0
engineLoad = scalar, U16, 36, "%",{1/@@PACK_MULT_PERCENT@@}, 0.0 ; Blend of MAP and TPS, depends on algorithm
; misc sensors
VBatt = scalar, U16, 38, "V",{1/@@PACK_MULT_VOLTAGE@@}, 0.0
@ -1240,7 +1239,6 @@ gaugeCategory = DynoView
entry = lambdaValue, @@GAUGE_NAME_LAMBDA@@, float, "%.2f"
entry = lambdaValue2, @@GAUGE_NAME_LAMBDA2@@, float, "%.2f"
entry = VBatt, @@GAUGE_NAME_VBAT@@, float, "%.2f"
entry = engineLoad, @@GAUGE_NAME_ENGINE_LOAD@@, float, "%.1f"
entry = fuelingLoad, @@GAUGE_NAME_FUEL_LOAD@@, float, "%.1f"
entry = ignitionLoad, @@GAUGE_NAME_IGNITION_LOAD@@, float, "%.1f"
entry = ignitionAdvance, @@GAUGE_NAME_TIMING_ADVANCE@@, float, "%.2f"