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

refactoring

This commit is contained in:
rusefi 2018-07-28 15:31:01 -04:00
parent 41de529b9e
commit 43ee2a9a75
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unit_tests/engine_test_helper.cpp
View File

@ -23,7 +23,6 @@ extern float testMafValue;
extern engine_configuration_s activeConfiguration; extern engine_configuration_s activeConfiguration;
EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persistentConfig) { EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persistentConfig) {
ec = &persistentConfig.engineConfiguration;
unitTestWarningCounter = 0; unitTestWarningCounter = 0;
testMafValue = 0; testMafValue = 0;
@ -32,8 +31,9 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
schedulingQueue.clear(); schedulingQueue.clear();
enginePins.reset(); enginePins.reset();
engineConfiguration = ec; Engine *engine = &this->engine;
board_configuration_s * boardConfiguration = &engineConfiguration->bc; engine_configuration_s *engineConfiguration = engine->engineConfiguration;
board_configuration_s * boardConfiguration = &persistentConfig.engineConfiguration.bc;
persistent_config_s *config = &persistentConfig; persistent_config_s *config = &persistentConfig;
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5); setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, -40, 1.5);
@ -49,7 +49,6 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 60, 1.03); setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 60, 1.03);
setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 70, 1.01); setCurveValue(config->cltFuelCorrBins, config->cltFuelCorr, CLT_CURVE_SIZE, 70, 1.01);
Engine *engine = &this->engine;
prepareFuelMap(PASS_ENGINE_PARAMETER_SIGNATURE); prepareFuelMap(PASS_ENGINE_PARAMETER_SIGNATURE);
initAccelEnrichment(NULL PASS_ENGINE_PARAMETER_SUFFIX); initAccelEnrichment(NULL PASS_ENGINE_PARAMETER_SUFFIX);
@ -65,8 +64,6 @@ EngineTestHelper::EngineTestHelper(engine_type_e engineType) : engine (&persiste
engine->updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE); engine->updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE);
prepareTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE); prepareTimingMap(PASS_ENGINE_PARAMETER_SIGNATURE);
engine_configuration_s *engineConfiguration = engine->engineConfiguration;
engine->triggerCentral.triggerShape.initializeTriggerShape(NULL PASS_ENGINE_PARAMETER_SUFFIX); engine->triggerCentral.triggerShape.initializeTriggerShape(NULL PASS_ENGINE_PARAMETER_SUFFIX);
engine->triggerCentral.addEventListener(rpmShaftPositionCallback, "rpm reporter", engine); engine->triggerCentral.addEventListener(rpmShaftPositionCallback, "rpm reporter", engine);
engine->triggerCentral.addEventListener(mainTriggerCallback, "main loop", engine); engine->triggerCentral.addEventListener(mainTriggerCallback, "main loop", engine);

8
unit_tests/engine_test_helper.h
View File

@ -13,6 +13,9 @@
#include "main_trigger_callback.h" #include "main_trigger_callback.h"
#include "unit_test_framework.h" #include "unit_test_framework.h"
/**
* Mock engine with trigger signal simulation infrastructure
*/
class EngineTestHelper { class EngineTestHelper {
public: public:
EngineTestHelper(engine_type_e engineType); EngineTestHelper(engine_type_e engineType);
@ -23,11 +26,8 @@ public:
void fireTriggerEvents2(int count, int durationUs); void fireTriggerEvents2(int count, int durationUs);
void clearQueue(); void clearQueue();
persistent_config_s persistentConfig;
Engine engine; Engine engine;
persistent_config_s persistentConfig;
engine_configuration_s *ec;
engine_configuration_s *engineConfiguration;
}; };
#endif /* ENGINE_TEST_HELPER_H_ */ #endif /* ENGINE_TEST_HELPER_H_ */

2
unit_tests/test_speed_density.cpp
View File

@ -26,7 +26,7 @@ void testSpeedDensity(void) {
assertEqualsM("RPM", 1500, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE)); assertEqualsM("RPM", 1500, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_SIGNATURE));
// 427 cubic inches, that's a LOT of engine // 427 cubic inches, that's a LOT of engine
engineConfigurationc->specs.displacement = 6.99728; engineConfiguration->specs.displacement = 6.99728;
engineConfiguration->specs.cylindersCount = 8; engineConfiguration->specs.cylindersCount = 8;
engineConfiguration->injector.flow = gramm_second_to_cc_minute(5.303); engineConfiguration->injector.flow = gramm_second_to_cc_minute(5.303);