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

refactoring: constexpr fuel computer (#4830) 

* refactoring: constexpr fuel computer

* refactoring: constexpr fuel computer

* refactoring: constexpr fuel computer

Co-authored-by: rusefillc <sdfsdfqsf2334234234>
This commit is contained in:
rusefillc 2022-11-26 12:25:04 -05:00 committed by GitHub
parent d63f1af40d
commit c729b10bbe
10 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/live_data.cpp
View File

@ -57,7 +57,7 @@ const ac_control_s* getLiveDataAddr() {
template<> template<>
const fuel_computer_s* getLiveDataAddr() { const fuel_computer_s* getLiveDataAddr() {
return engine->fuelComputer; return &engine->fuelComputer;
} }
template<> template<>

6
firmware/console/status_loop.cpp
View File

@ -458,11 +458,11 @@ static void updateThrottles() {
static void updateLambda() { static void updateLambda() {
float lambdaValue = Sensor::getOrZero(SensorType::Lambda1); float lambdaValue = Sensor::getOrZero(SensorType::Lambda1);
engine->outputChannels.lambdaValue = lambdaValue; engine->outputChannels.lambdaValue = lambdaValue;
engine->outputChannels.AFRValue = lambdaValue * engine->fuelComputer->stoichiometricRatio; engine->outputChannels.AFRValue = lambdaValue * engine->fuelComputer.stoichiometricRatio;
float lambda2Value = Sensor::getOrZero(SensorType::Lambda2); float lambda2Value = Sensor::getOrZero(SensorType::Lambda2);
engine->outputChannels.lambdaValue2 = lambda2Value; engine->outputChannels.lambdaValue2 = lambda2Value;
engine->outputChannels.AFRValue2 = lambda2Value * engine->fuelComputer->stoichiometricRatio; engine->outputChannels.AFRValue2 = lambda2Value * engine->fuelComputer.stoichiometricRatio;
} }
static void updateFuelSensors() { static void updateFuelSensors() {
@ -576,7 +576,7 @@ static void updateFuelCorrections() {
static void updateFuelResults() { static void updateFuelResults() {
// todo: kill outputChannel while taking care of gauge name and scale! // todo: kill outputChannel while taking care of gauge name and scale!
engine->outputChannels.chargeAirMass = engine->fuelComputer->sdAirMassInOneCylinder; engine->outputChannels.chargeAirMass = engine->fuelComputer.sdAirMassInOneCylinder;
engine->outputChannels.baseFuel = engine->engineState.baseFuel * 1000; // Convert grams to mg engine->outputChannels.baseFuel = engine->engineState.baseFuel * 1000; // Convert grams to mg
engine->outputChannels.fuelRunning = engine->engineState.running.fuel; engine->outputChannels.fuelRunning = engine->engineState.running.fuel;

4
firmware/controllers/algo/engine.h
View File

@ -115,8 +115,8 @@ public:
PinRepository pinRepository; PinRepository pinRepository;
IEtbController *etbControllers[ETB_COUNT] = {nullptr}; IEtbController *etbControllers[ETB_COUNT] = {nullptr};
// we have pointers mixed with... not pointers (reference?) between different controllers
IFuelComputer *fuelComputer = nullptr; FuelComputer fuelComputer;
type_list< type_list<
Mockable<InjectorModel>, Mockable<InjectorModel>,

2
firmware/controllers/algo/engine2.cpp
View File

@ -197,7 +197,7 @@ void EngineState::periodicFastCallback() {
void EngineState::updateTChargeK(int rpm, float tps) { void EngineState::updateTChargeK(int rpm, float tps) {
#if EFI_ENGINE_CONTROL #if EFI_ENGINE_CONTROL
float newTCharge = engine->fuelComputer->getTCharge(rpm, tps); float newTCharge = engine->fuelComputer.getTCharge(rpm, tps);
// convert to microsecs and then to seconds // convert to microsecs and then to seconds
efitick_t curTime = getTimeNowNt(); efitick_t curTime = getTimeNowNt();
float secsPassed = (float)NT2US(curTime - timeSinceLastTChargeK) / US_PER_SECOND_F; float secsPassed = (float)NT2US(curTime - timeSinceLastTChargeK) / US_PER_SECOND_F;

10
firmware/controllers/algo/fuel_math.cpp
View File

@ -176,9 +176,9 @@ static float getBaseFuelMass(int rpm) {
auto airmass = model->getAirmass(rpm); auto airmass = model->getAirmass(rpm);
// Plop some state for others to read // Plop some state for others to read
engine->fuelComputer->sdAirMassInOneCylinder = airmass.CylinderAirmass; engine->fuelComputer.sdAirMassInOneCylinder = airmass.CylinderAirmass;
engine->engineState.fuelingLoad = airmass.EngineLoadPercent; engine->engineState.fuelingLoad = airmass.EngineLoadPercent;
engine->engineState.ignitionLoad = engine->fuelComputer->getLoadOverride(airmass.EngineLoadPercent, engineConfiguration->ignOverrideMode); engine->engineState.ignitionLoad = engine->fuelComputer.getLoadOverride(airmass.EngineLoadPercent, engineConfiguration->ignOverrideMode);
auto gramPerCycle = airmass.CylinderAirmass * engineConfiguration->specs.cylindersCount; auto gramPerCycle = airmass.CylinderAirmass * engineConfiguration->specs.cylindersCount;
auto gramPerMs = rpm == 0 ? 0 : gramPerCycle / getEngineCycleDuration(rpm); auto gramPerMs = rpm == 0 ? 0 : gramPerCycle / getEngineCycleDuration(rpm);
@ -186,7 +186,7 @@ static float getBaseFuelMass(int rpm) {
// convert g/s -> kg/h // convert g/s -> kg/h
engine->engineState.airflowEstimate = gramPerMs * 3600000 /* milliseconds per hour */ / 1000 /* grams per kg */;; engine->engineState.airflowEstimate = gramPerMs * 3600000 /* milliseconds per hour */ / 1000 /* grams per kg */;;
float baseFuelMass = engine->fuelComputer->getCycleFuel(airmass.CylinderAirmass, rpm, airmass.EngineLoadPercent); float baseFuelMass = engine->fuelComputer.getCycleFuel(airmass.CylinderAirmass, rpm, airmass.EngineLoadPercent);
// Fudge it by the global correction factor // Fudge it by the global correction factor
baseFuelMass *= engineConfiguration->globalFuelCorrection; baseFuelMass *= engineConfiguration->globalFuelCorrection;
@ -330,16 +330,12 @@ float getInjectionMass(int rpm) {
#endif #endif
} }
static FuelComputer fuelComputer;
/** /**
* @brief Initialize fuel map data structure * @brief Initialize fuel map data structure
* @note this method has nothing to do with fuel map VALUES - it's job * @note this method has nothing to do with fuel map VALUES - it's job
* is to prepare the fuel map data structure for 3d interpolation * is to prepare the fuel map data structure for 3d interpolation
*/ */
void initFuelMap() { void initFuelMap() {
engine->fuelComputer = &fuelComputer;
mapEstimationTable.init(config->mapEstimateTable, config->mapEstimateTpsBins, config->mapEstimateRpmBins); mapEstimationTable.init(config->mapEstimateTable, config->mapEstimateTpsBins, config->mapEstimateRpmBins);
} }

4
firmware/controllers/can/can_dash.cpp
View File

@ -1284,8 +1284,8 @@ static void populateFrame(Aim5f7& msg) {
msg.LambdaErr1 = 0; msg.LambdaErr1 = 0;
msg.LambdaErr2 = 0; msg.LambdaErr2 = 0;
// both targets are the same for now // both targets are the same for now
msg.LambdaTarget1 = (float)engine->fuelComputer->targetLambda; msg.LambdaTarget1 = (float)engine->fuelComputer.targetLambda;
msg.LambdaTarget2 = (float)engine->fuelComputer->targetLambda; msg.LambdaTarget2 = (float)engine->fuelComputer.targetLambda;
} }
void canDashboardAim(CanCycle cycle) { void canDashboardAim(CanCycle cycle) {

2
firmware/controllers/can/can_verbose.cpp
View File

@ -134,7 +134,7 @@ struct Fueling {
}; };
static void populateFrame(Fueling& msg) { static void populateFrame(Fueling& msg) {
msg.cylAirmass = engine->fuelComputer->sdAirMassInOneCylinder; msg.cylAirmass = engine->fuelComputer.sdAirMassInOneCylinder;
msg.estAirflow = engine->engineState.airflowEstimate; msg.estAirflow = engine->engineState.airflowEstimate;
msg.fuel_pulse = (float)engine->outputChannels.actualLastInjection; msg.fuel_pulse = (float)engine->outputChannels.actualLastInjection;
msg.knockCount = engine->module<KnockController>()->getKnockCount(); msg.knockCount = engine->module<KnockController>()->getKnockCount();

2
firmware/controllers/math/closed_loop_fuel_cell.cpp
View File

@ -53,7 +53,7 @@ float ClosedLoopFuelCellImpl::getLambdaError() const {
return 0; return 0;
} }
return lambda.Value - engine->fuelComputer->targetLambda; return lambda.Value - engine->fuelComputer.targetLambda;
} }
#define MAX_ADJ (0.25f) #define MAX_ADJ (0.25f)

2
firmware/controllers/tcu/tc_4l6x.cpp
View File

@ -143,7 +143,7 @@ void Gm4l6xTransmissionController::setPcState(gear_e gear) {
return; return;
} }
float duty = 0.01f * interpolate2d(engine->fuelComputer->sdAirMassInOneCylinder, config->tcu_pcAirmassBins, *pcts); float duty = 0.01f * interpolate2d(engine->fuelComputer.sdAirMassInOneCylinder, config->tcu_pcAirmassBins, *pcts);
pcPwm.setSimplePwmDutyCycle(duty); pcPwm.setSimplePwmDutyCycle(duty);
} }

4
unit_tests/tests/test_engine_math.cpp
View File

@ -16,7 +16,7 @@ TEST(misc, testIgnitionPlanning) {
EngineTestHelper eth(FORD_ESCORT_GT); EngineTestHelper eth(FORD_ESCORT_GT);
engine->periodicFastCallback(); engine->periodicFastCallback();
assertEqualsM("testIgnitionPlanning_AFR", 13.5, engine->fuelComputer->targetAFR); assertEqualsM("testIgnitionPlanning_AFR", 13.5, engine->fuelComputer.targetAFR);
ASSERT_EQ(IM_BATCH, engineConfiguration->injectionMode); ASSERT_EQ(IM_BATCH, engineConfiguration->injectionMode);
} }
@ -33,7 +33,7 @@ TEST(misc, testEngineMath) {
ASSERT_NEAR( 50, getOneDegreeTimeMs(600) * 180, EPS4D) << "600 RPM"; ASSERT_NEAR( 50, getOneDegreeTimeMs(600) * 180, EPS4D) << "600 RPM";
ASSERT_EQ( 5, getOneDegreeTimeMs(6000) * 180) << "6000 RPM"; ASSERT_EQ( 5, getOneDegreeTimeMs(6000) * 180) << "6000 RPM";
IFuelComputer *fuelComputer = engine->fuelComputer; auto fuelComputer = &engine->fuelComputer;
Sensor::setMockValue(SensorType::Clt, 300); Sensor::setMockValue(SensorType::Clt, 300);
Sensor::setMockValue(SensorType::Iat, 350); Sensor::setMockValue(SensorType::Iat, 350);