tear down Engine god object #4511

just trying different things
This commit is contained in:
Andrey 2022-09-05 03:38:44 -04:00
parent 9a19eaa320
commit f1f447df45
4 changed files with 20 additions and 4 deletions

View File

@ -641,4 +641,8 @@ EngineRotationState * getEngineRotationState() {
return &engine->rpmCalculator;
}
EngineState * getEngineState() {
return &engine->engineState;
}

View File

@ -5,6 +5,7 @@
#pragma once
#include "wall_fuel_state_generated.h"
#include "engine_module.h"
/**

View File

@ -5,8 +5,18 @@
*/
#include "pch.h"
#include "rpm_calculator_api.h"
#include <rusefi/arrays.h>
#include <rusefi/isnan.h>
#include "fuel_schedule.h"
#include "event_registry.h"
#include "fuel_schedule.h"
#include "trigger_decoder.h"
#include "engine_math.h"
// dependency injection
#include "engine_state.h"
#include "rpm_calculator_api.h"
// end of injection
#if EFI_ENGINE_CONTROL
@ -65,10 +75,10 @@ expected<float> InjectionEvent::computeInjectionAngle(int cylinderIndex) const {
// injection phase may be scheduled by injection end, so we need to step the angle back
// for the duration of the injection
angle_t injectionDurationAngle = getInjectionAngleCorrection(engine->engineState.injectionDuration, oneDegreeUs);
angle_t injectionDurationAngle = getInjectionAngleCorrection(getEngineState()->injectionDuration, oneDegreeUs);
// User configured offset - degrees after TDC combustion
floatus_t injectionOffset = engine->engineState.injectionOffset;
floatus_t injectionOffset = getEngineState()->injectionOffset;
if (cisnan(injectionOffset)) {
// injection offset map not ready - we are not ready to schedule fuel events
return unexpected;

View File

@ -2,12 +2,13 @@
* @file fuel_schedule.h
*/
#pragma once
#include "global.h"
#include "efi_gpio.h"
#include "scheduler.h"
#include "fl_stack.h"
#include "trigger_structure.h"
#include "accel_enrichment.h"
#include "wall_fuel.h"
#define MAX_WIRES_COUNT 2