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

auto-sync

This commit is contained in:
rusEfi 2014-11-04 13:03:07 -06:00
parent b27b0b0685
commit b0ee91f6d2
6 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/controllers/algo/ec2.h
View File

@ -29,10 +29,8 @@ typedef struct {
IgnitionEventList ignitionEvents[2]; IgnitionEventList ignitionEvents[2];
} EventHandlerConfiguration; } EventHandlerConfiguration;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{
#endif /* __cplusplus */ #endif /* __cplusplus */
/** /**
@ -47,22 +45,18 @@ public:
// todo: this should go, too // todo: this should go, too
engine_configuration_s *engineConfiguration; engine_configuration_s *engineConfiguration;
trigger_shape_s triggerShape; trigger_shape_s triggerShape;
EventHandlerConfiguration engineEventConfiguration; EventHandlerConfiguration engineEventConfiguration;
}; };
// todo: eliminate this structure? we have Engine and engineConfiguration2 now references engineConfiguration void initializeIgnitionActions(float advance, float dwellAngle, engine_configuration_s *engineConfiguration,
typedef struct { engine_configuration2_s *engineConfiguration2, IgnitionEventList *list);
engine_configuration_s *engineConfiguration; void addFuelEvents(engine_configuration_s const *e, engine_configuration2_s *engineConfiguration2,
engine_configuration2_s *engineConfiguration2; ActuatorEventList *list, injection_mode_e mode);
} configuration_s;
void initializeIgnitionActions(float advance, float dwellAngle, engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2, IgnitionEventList *list); void registerActuatorEventExt(engine_configuration_s const *engineConfiguration, trigger_shape_s * s, ActuatorEvent *e,
void addFuelEvents(engine_configuration_s const *e, engine_configuration2_s *engineConfiguration2, ActuatorEventList *list, injection_mode_e mode); 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 setDefaultNonPersistentConfiguration(engine_configuration2_s *engineConfiguration2);
void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2); void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2);

4
firmware/controllers/engine_controller.cpp
View File

@ -84,10 +84,6 @@ static engine_configuration2_s ec2 CCM_OPTIONAL
; ;
engine_configuration2_s * engineConfiguration2 = &ec2; 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? * todo: this should probably become 'static', i.e. private, and propagated around explicitly?
*/ */

2
unit_tests/engine_test_helper.cpp
View File

@ -18,8 +18,6 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) {
engine.engineConfiguration = ec; engine.engineConfiguration = ec;
configuration.engineConfiguration = ec;
configuration.engineConfiguration2 = &ec2;
engine.engineConfiguration2 = &ec2; engine.engineConfiguration2 = &ec2;
ec2.engineConfiguration = ec; ec2.engineConfiguration = ec;

2
unit_tests/engine_test_helper.h
View File

@ -20,14 +20,12 @@ public:
persistent_config_s persistentConfig; persistent_config_s persistentConfig;
engine_configuration2_s ec2; engine_configuration2_s ec2;
configuration_s configuration;
Engine engine; Engine engine;
engine_configuration_s *ec; engine_configuration_s *ec;
TriggerCentral triggerCentral; TriggerCentral triggerCentral;
RpmCalculator rpmState; RpmCalculator rpmState;
}; };
#endif /* ENGINE_TEST_HELPER_H_ */ #endif /* ENGINE_TEST_HELPER_H_ */

4
unit_tests/test_trigger_decoder.cpp
View File

@ -407,17 +407,13 @@ static void testRpmCalculator(void) {
engine.engineConfiguration = eth.engine.engineConfiguration; engine.engineConfiguration = eth.engine.engineConfiguration;
engine.engineConfiguration->injectorLag = 0.0; engine.engineConfiguration->injectorLag = 0.0;
configuration_s configuration = { ec, ec2 };
timeNow = 0; timeNow = 0;
assertEquals(0, eth.rpmState.rpm()); assertEquals(0, eth.rpmState.rpm());
eth.fireTriggerEvents(); eth.fireTriggerEvents();
assertEqualsM("RPM", 1500, eth.rpmState.rpm()); assertEqualsM("RPM", 1500, eth.rpmState.rpm());
assertEqualsM("index #1", 15, eth.triggerCentral.triggerState.getCurrentIndex()); assertEqualsM("index #1", 15, eth.triggerCentral.triggerState.getCurrentIndex());
static MainTriggerCallback triggerCallbackInstance; static MainTriggerCallback triggerCallbackInstance;
triggerCallbackInstance.init(&eth.engine, ec2); triggerCallbackInstance.init(&eth.engine, ec2);
eth.triggerCentral.addEventListener((ShaftPositionListener)&onTriggerEvent, "main loop", &triggerCallbackInstance); eth.triggerCentral.addEventListener((ShaftPositionListener)&onTriggerEvent, "main loop", &triggerCallbackInstance);

4
win32_functional_tests/simulator/rusEfiFunctionalTest.cpp
View File

@ -40,10 +40,6 @@ engine_configuration_s * engineConfiguration = &persistentState.persistentConfig
board_configuration_s *boardConfiguration = &persistentState.persistentConfiguration.engineConfiguration.bc; board_configuration_s *boardConfiguration = &persistentState.persistentConfiguration.engineConfiguration.bc;
engine_configuration2_s *engineConfiguration2 = &ec2; engine_configuration2_s *engineConfiguration2 = &ec2;
static configuration_s cfg = {engineConfiguration, engineConfiguration2};
configuration_s * configuration = &cfg;
void setOutputPinValue(io_pin_e pin, int logicValue) { void setOutputPinValue(io_pin_e pin, int logicValue) {
} }