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

wall fuel tweaks (#3617)

This commit is contained in:
Matthew Kennedy 2021-11-25 15:45:44 -08:00 committed by GitHub
parent d262378766
commit dad52dd75a
5 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,8 +70,8 @@ struct TunerStudioOutputChannels : ts_outputs_s {
uint16_t currentEnginePhase; // 70 uint16_t currentEnginePhase; // 70
// Wall model AE // Wall model AE
scaled_ms wallFuelAmount; // 72 scaled_fuel_mass_mg wallFuelAmount; // 72
scaled_channel<int16_t, 1000> wallFuelCorrection; // 74 scaled_fuel_mass_mg wallFuelCorrection; // 74
// TPS/load AE // TPS/load AE
scaled_percent unused76; // 76 scaled_percent unused76; // 76

4
firmware/console/status_loop.cpp
View File

@ -611,8 +611,8 @@ static void updateFuelInfo() {
updateFuelResults(); updateFuelResults();
const auto& wallFuel = engine->injectionEvents.elements[0].wallFuel; const auto& wallFuel = engine->injectionEvents.elements[0].wallFuel;
tsOutputChannels.wallFuelAmount = wallFuel.getWallFuel(); tsOutputChannels.wallFuelAmount = wallFuel.getWallFuel() * 1000; // Convert grams to mg
tsOutputChannels.wallFuelCorrection = wallFuel.wallFuelCorrection; tsOutputChannels.wallFuelCorrection = wallFuel.wallFuelCorrection * 1000; // Convert grams to mg
tsOutputChannels.injectionOffset = engine->engineState.injectionOffset; tsOutputChannels.injectionOffset = engine->engineState.injectionOffset;

31
firmware/controllers/algo/wall_fuel.cpp
View File

@ -11,14 +11,15 @@ void WallFuel::resetWF() {
wallFuel = 0; wallFuel = 0;
} }
floatms_t WallFuel::adjust(floatms_t desiredFuel) { float WallFuel::adjust(float desiredMassGrams) {
invocationCounter++; invocationCounter++;
if (cisnan(desiredFuel)) { if (cisnan(desiredMassGrams)) {
return desiredFuel; return desiredMassGrams;
} }
// disable this correction for cranking // disable this correction for cranking
if (engine->rpmCalculator.isCranking()) { if (engine->rpmCalculator.isCranking()) {
return desiredFuel; return desiredMassGrams;
} }
ScopePerf perf(PE::WallFuelAdjust); ScopePerf perf(PE::WallFuelAdjust);
@ -29,7 +30,7 @@ floatms_t WallFuel::adjust(floatms_t desiredFuel) {
SAE 1999-01-0553 by Peter J Maloney SAE 1999-01-0553 by Peter J Maloney
M_cmd = commanded fuel mass (output of this function) M_cmd = commanded fuel mass (output of this function)
desiredFuel = desired fuel mass (input to this function) desiredMassGrams = desired fuel mass (input to this function)
fuelFilmMass = fuel film mass (how much is currently on the wall) fuelFilmMass = fuel film mass (how much is currently on the wall)
First we compute how much fuel to command, by accounting for First we compute how much fuel to command, by accounting for
@ -57,21 +58,22 @@ floatms_t WallFuel::adjust(floatms_t desiredFuel) {
decreases with decreasing manifold pressure. decreases with decreasing manifold pressure.
*/ */
// if tau is really small, we get div/0. // if tau or beta is really small, we get div/0.
// you probably meant to disable wwae. // you probably meant to disable wwae.
float tau = engineConfiguration->wwaeTau; float tau = engineConfiguration->wwaeTau;
if (tau < 0.01f) { float beta = engineConfiguration->wwaeBeta;
return desiredFuel;
if (tau < 0.01f || beta < 0.01f) {
return desiredMassGrams;
} }
// Ignore really slow RPM // Ignore really slow RPM
int rpm = GET_RPM(); int rpm = GET_RPM();
if (rpm < 100) { if (rpm < 100) {
return desiredFuel; return desiredMassGrams;
} }
float alpha = expf_taylor(-120 / (rpm * tau)); float alpha = expf_taylor(-120 / (rpm * tau));
float beta = engineConfiguration->wwaeBeta;
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
if (engineConfiguration->debugMode == DBG_KNOCK) { if (engineConfiguration->debugMode == DBG_KNOCK) {
@ -89,7 +91,7 @@ floatms_t WallFuel::adjust(floatms_t desiredFuel) {
} }
float fuelFilmMass = wallFuel; float fuelFilmMass = wallFuel;
float M_cmd = (desiredFuel - (1 - alpha) * fuelFilmMass) / (1 - beta); float M_cmd = (desiredMassGrams - (1 - alpha) * fuelFilmMass) / (1 - beta);
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
if (engineConfiguration->debugMode == DBG_KNOCK) { if (engineConfiguration->debugMode == DBG_KNOCK) {
@ -115,13 +117,10 @@ floatms_t WallFuel::adjust(floatms_t desiredFuel) {
#endif // EFI_TUNER_STUDIO #endif // EFI_TUNER_STUDIO
wallFuel = fuelFilmMassNext; wallFuel = fuelFilmMassNext;
wallFuelCorrection = M_cmd - desiredFuel; wallFuelCorrection = M_cmd - desiredMassGrams;
return M_cmd; return M_cmd;
} }
floatms_t WallFuel::getWallFuel() const { float WallFuel::getWallFuel() const {
return wallFuel; return wallFuel;
} }

8
firmware/controllers/algo/wall_fuel.h
View File

@ -12,11 +12,11 @@
class WallFuel : public wall_fuel_state { class WallFuel : public wall_fuel_state {
public: public:
/** /**
* @param target desired squirt duration * @param desiredMassGrams desired fuel quantity, in grams
* @return total adjusted fuel squirt duration once wall wetting is taken into effect * @return total adjusted fuel squirt mass in grams once wall wetting is taken into effect
*/ */
floatms_t adjust(floatms_t target); float adjust(float desiredMassGrams);
floatms_t getWallFuel() const; float getWallFuel() const;
void resetWF(); void resetWF();
int invocationCounter = 0; int invocationCounter = 0;
}; };

4
firmware/tunerstudio/rusefi.input
View File

@ -272,8 +272,8 @@ enable2ndByteCanID = false
fuelPidCorrection2=scalar, S16, 298, "%",{1/@@PACK_MULT_PERCENT@@}, 0 fuelPidCorrection2=scalar, S16, 298, "%",{1/@@PACK_MULT_PERCENT@@}, 0
; Wall model AE ; Wall model AE
wallFuelAmount = scalar, U16, 72, "ms",{1/@@PACK_MULT_MS@@}, 0 wallFuelAmount = scalar, U16, 72, "mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0
wallFuelCorrection=scalar, S16, 74, "ms",0.001, 0 wallFuelCorrection=scalar, S16, 74, "mg",{1/@@PACK_MULT_FUEL_MASS@@}, 0
; TPS/load AE ; TPS/load AE
unusedLoadDelta = scalar, S16, 76, "value",{1/@@PACK_MULT_PERCENT@@}, 0 unusedLoadDelta = scalar, S16, 76, "value",{1/@@PACK_MULT_PERCENT@@}, 0