From b0ee91f6d23b7e8f0ae6899911d4b17bd8d53536 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Tue, 4 Nov 2014 13:03:07 -0600 Subject: [PATCH] auto-sync --- firmware/controllers/algo/ec2.h | 20 +++++++------------ firmware/controllers/engine_controller.cpp | 4 ---- unit_tests/engine_test_helper.cpp | 2 -- unit_tests/engine_test_helper.h | 2 -- unit_tests/test_trigger_decoder.cpp | 4 ---- .../simulator/rusEfiFunctionalTest.cpp | 4 ---- 6 files changed, 7 insertions(+), 29 deletions(-) diff --git a/firmware/controllers/algo/ec2.h b/firmware/controllers/algo/ec2.h index 738173344d..89b3022a58 100644 --- a/firmware/controllers/algo/ec2.h +++ b/firmware/controllers/algo/ec2.h @@ -29,10 +29,8 @@ typedef struct { IgnitionEventList ignitionEvents[2]; } EventHandlerConfiguration; - #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* __cplusplus */ /** @@ -47,22 +45,18 @@ public: // todo: this should go, too engine_configuration_s *engineConfiguration; - trigger_shape_s triggerShape; EventHandlerConfiguration engineEventConfiguration; }; -// todo: eliminate this structure? we have Engine and engineConfiguration2 now references engineConfiguration -typedef struct { - engine_configuration_s *engineConfiguration; - engine_configuration2_s *engineConfiguration2; -} configuration_s; +void initializeIgnitionActions(float advance, float dwellAngle, engine_configuration_s *engineConfiguration, + engine_configuration2_s *engineConfiguration2, IgnitionEventList *list); +void addFuelEvents(engine_configuration_s const *e, engine_configuration2_s *engineConfiguration2, + ActuatorEventList *list, injection_mode_e mode); -void initializeIgnitionActions(float advance, float dwellAngle, engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2, IgnitionEventList *list); -void addFuelEvents(engine_configuration_s const *e, engine_configuration2_s *engineConfiguration2, ActuatorEventList *list, injection_mode_e mode); - -void registerActuatorEventExt(engine_configuration_s const *engineConfiguration, trigger_shape_s * s, ActuatorEvent *e, OutputSignal *actuator, float angleOffset); +void registerActuatorEventExt(engine_configuration_s const *engineConfiguration, trigger_shape_s * s, ActuatorEvent *e, + OutputSignal *actuator, float angleOffset); void setDefaultNonPersistentConfiguration(engine_configuration2_s *engineConfiguration2); void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2); diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index e6ecd66ac0..43a3069276 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -84,10 +84,6 @@ static engine_configuration2_s ec2 CCM_OPTIONAL ; engine_configuration2_s * engineConfiguration2 = &ec2; -static configuration_s cfg = { &persistentState.persistentConfiguration.engineConfiguration, &ec2 }; - -configuration_s * configuration = &cfg; - /** * todo: this should probably become 'static', i.e. private, and propagated around explicitly? */ diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp index 5a934f4412..4818925834 100644 --- a/unit_tests/engine_test_helper.cpp +++ b/unit_tests/engine_test_helper.cpp @@ -18,8 +18,6 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) { engine.engineConfiguration = ec; - configuration.engineConfiguration = ec; - configuration.engineConfiguration2 = &ec2; engine.engineConfiguration2 = &ec2; ec2.engineConfiguration = ec; diff --git a/unit_tests/engine_test_helper.h b/unit_tests/engine_test_helper.h index a3c7aff8d8..1f7d97705f 100644 --- a/unit_tests/engine_test_helper.h +++ b/unit_tests/engine_test_helper.h @@ -20,14 +20,12 @@ public: persistent_config_s persistentConfig; engine_configuration2_s ec2; - configuration_s configuration; Engine engine; engine_configuration_s *ec; TriggerCentral triggerCentral; RpmCalculator rpmState; - }; #endif /* ENGINE_TEST_HELPER_H_ */ diff --git a/unit_tests/test_trigger_decoder.cpp b/unit_tests/test_trigger_decoder.cpp index 480f5d82b9..7d03a7b21b 100644 --- a/unit_tests/test_trigger_decoder.cpp +++ b/unit_tests/test_trigger_decoder.cpp @@ -407,17 +407,13 @@ static void testRpmCalculator(void) { engine.engineConfiguration = eth.engine.engineConfiguration; engine.engineConfiguration->injectorLag = 0.0; - - configuration_s configuration = { ec, ec2 }; timeNow = 0; assertEquals(0, eth.rpmState.rpm()); eth.fireTriggerEvents(); assertEqualsM("RPM", 1500, eth.rpmState.rpm()); - assertEqualsM("index #1", 15, eth.triggerCentral.triggerState.getCurrentIndex()); - static MainTriggerCallback triggerCallbackInstance; triggerCallbackInstance.init(ð.engine, ec2); eth.triggerCentral.addEventListener((ShaftPositionListener)&onTriggerEvent, "main loop", &triggerCallbackInstance); diff --git a/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp b/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp index 30872bae8f..5b1f9dc7e7 100644 --- a/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp +++ b/win32_functional_tests/simulator/rusEfiFunctionalTest.cpp @@ -40,10 +40,6 @@ engine_configuration_s * engineConfiguration = &persistentState.persistentConfig board_configuration_s *boardConfiguration = &persistentState.persistentConfiguration.engineConfiguration.bc; engine_configuration2_s *engineConfiguration2 = &ec2; -static configuration_s cfg = {engineConfiguration, engineConfiguration2}; - -configuration_s * configuration = &cfg; - void setOutputPinValue(io_pin_e pin, int logicValue) { }