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

refactoring

This commit is contained in:
rusefi 2019-12-02 23:08:18 -05:00
parent d007a7f902
commit 1c96d9541e
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -646,7 +646,7 @@ void initElectronicThrottle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
for (int i = 0 ; i < ETB_COUNT; i++) {
etbController[i].init(&etbHardware[i].dcMotor, i);
etbController[i].etbPid.initPidClass(&engineConfiguration->etb);
INJECT_ENGINE_REFERENCE(etbController[i]);
INJECT_ENGINE_REFERENCE(&etbController[i]);
}

2
firmware/controllers/actuators/idle_thread.cpp
View File

@ -578,7 +578,7 @@ void initIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
void startIdleThread(Logging*sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
logger = sharedLogger;
INJECT_ENGINE_REFERENCE(idleControllerInstance);
INJECT_ENGINE_REFERENCE(&idleControllerInstance);
idlePid.initPidClass(&engineConfiguration->idleRpmPid);

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

@ -28,9 +28,7 @@ public:
bool isSimultanious;
InjectorOutputPin *outputs[MAX_WIRES_COUNT];
int ownIndex;
#if EFI_UNIT_TEST
Engine *engine;
#endif
DECLARE_ENGINE_PTR;
event_trigger_position_s injectionStart;
scheduling_s signalTimerUp;
@ -108,9 +106,7 @@ public:
*/
int cylinderIndex = 0;
char *name = nullptr;
#if EFI_UNIT_TEST
Engine *engine;
#endif
DECLARE_ENGINE_PTR;
IgnitionOutputPin *getOutputForLoggins();
};

10
firmware/controllers/core/common_headers.h
View File

@ -72,11 +72,11 @@
board_configuration_s *boardConfiguration = nullptr;
#define INJECT_ENGINE_REFERENCE(x) \
x.engine = engine; \
x.engineConfiguration = engineConfiguration; \
x.config = config; \
x.boardConfiguration = boardConfiguration;
#define INJECT_ENGINE_REFERENCE(x) \
(x)->engine = engine; \
(x)->engineConfiguration = engineConfiguration; \
(x)->config = config; \
(x)->boardConfiguration = boardConfiguration;
#define EXPAND_Engine \
engine_configuration_s *engineConfiguration = engine->engineConfigurationPtr; \

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

@ -196,9 +196,7 @@ bool FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_SUFF
InjectionEvent *ev = &elements[i];
ev->ownIndex = i;
#if EFI_UNIT_TEST
ev->engine = engine;
#endif
INJECT_ENGINE_REFERENCE(ev);
fixAngle(angle, "addFuel#1", CUSTOM_ERR_6554);
ev->outputs[0] = output;