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

auto-sync

This commit is contained in:
rusEfi 2016-09-03 13:02:55 -04:00
parent 83e99bff75
commit d1f73f19ad
4 changed files with 145 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
unit_tests/global.h
View File

@ -44,11 +44,14 @@ class Engine;
#define PASS_ENGINE_PARAMETER_F engine, engineConfiguration, config, boardConfiguration
#define PASS_ENGINE_PARAMETER , engine, engineConfiguration, config, boardConfiguration
#define EXPAND_EngineTestHelper Engine *engine = &eth.engine; \
engine_configuration_s *engineConfiguration = engine->engineConfiguration; \
#define EXPAND_Engine engine_configuration_s *engineConfiguration = engine->engineConfiguration; \
persistent_config_s *config = engine->config; \
board_configuration_s *boardConfiguration = &engineConfiguration->bc;
#define EXPAND_EngineTestHelper Engine *engine = &eth.engine; \
EXPAND_Engine
#define CONFIG(x) engineConfiguration->x
#define ENGINE(x) engine->x
#define TRIGGER_SHAPE(x) engine->triggerShape.x

3
unit_tests/main.cpp
View File

@ -122,7 +122,8 @@ int getRevolutionCounter(void) {
}
int main(void) {
testFuelSchedulerBug299();
testFuelSchedulerBug299smallAndMedium();
testFuelSchedulerBug299smallAndLarge();
testLogicExpressions();
testOverflow64Counter();
testInterpolate3d();

170
unit_tests/test_trigger_decoder.cpp
View File

@ -581,7 +581,7 @@ extern fuel_Map3D_t fuelMap;
static void assertEvent(const char *msg, int index, void *callback, efitime_t start, efitime_t momentX, long param) {
assertTrueM(msg, schedulingQueue.size() > index);
scheduling_s *ev = schedulingQueue.getForUnitText(index);
assertTrueM(msg, (void*)ev->callback == (void*) callback);
assertEqualsM4(msg, "up/down", (void*)ev->callback == (void*) callback, 1);
assertEqualsM(msg, momentX, ev->momentX - start);
assertEqualsLM(msg, param, (long)ev->param);
}
@ -594,22 +594,24 @@ static void assertInjectorDownEvent(const char *msg, int eventIndex, efitime_t m
assertEvent(msg, eventIndex, (void*)seTurnPinLow, timeNow, momentX, (long)&enginePins.injectors[injectorIndex]);
}
static void assertInjectionEvent(InjectionEvent *ev, int injectorIndex, int eventIndex, angle_t angleOffset, bool isOverlapping) {
assertEqualsM("inj index", injectorIndex, ev->injectorIndex);
assertEqualsM("event index", eventIndex, ev->injectionStart.eventIndex);
assertEqualsM("event offset", angleOffset, ev->injectionStart.angleOffset);
static void assertInjectionEvent(const char *msg, InjectionEvent *ev, int injectorIndex, int eventIndex, angle_t angleOffset, bool isOverlapping) {
assertEqualsM4(msg, "inj index", injectorIndex, ev->injectorIndex);
assertEqualsM4(msg, "event index", eventIndex, ev->injectionStart.eventIndex);
assertEqualsM4(msg, "event offset", angleOffset, ev->injectionStart.angleOffset);
assertTrueM("is overlapping", isOverlapping == ev->isOverlapping);
}
void testFuelSchedulerBug299(void) {
printf("*************************************************** testFuelSchedulerBug299\r\n");
EngineTestHelper eth(TEST_ENGINE);
EXPAND_EngineTestHelper;
static void setTestBug299(EngineTestHelper *eth) {
Engine *engine = &eth->engine;
EXPAND_Engine
FuelSchedule * t;
assertEquals(LM_PLAIN_MAF, engineConfiguration->fuelAlgorithm);
engineConfiguration->isIgnitionEnabled = false;
engineConfiguration->specs.cylindersCount = 4;
engineConfiguration->injectionMode = IM_BATCH;
FuelSchedule * t;
timeNow = 0;
schedulingQueue.clear();
@ -624,14 +626,14 @@ void testFuelSchedulerBug299(void) {
engineConfiguration->trigger.type = TT_ONE;
incrementGlobalConfigurationVersion();
eth.applyTriggerShape();
eth->applyTriggerShape();
assertEqualsM("RPM=0", 0, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
eth.fireTriggerEvents2(1, MS2US(20));
assertEqualsM("RPM=0", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
eth->fireTriggerEvents2(1, MS2US(20));
// still no RPM since need to cycles measure cycle duration
assertEqualsM("RPM#1", 0, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
eth.fireTriggerEvents2(1, MS2US(20));
assertEqualsM("RPM#2", 3000, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
assertEqualsM("RPM#1", 0, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
eth->fireTriggerEvents2(1, MS2US(20));
assertEqualsM("RPM#2", 3000, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
schedulingQueue.executeAll(99999999); // this is needed to clear 'isScheduled' flag
engine->iHead = NULL; // let's drop whatever was scheduled just to start from a clean state
@ -640,7 +642,7 @@ void testFuelSchedulerBug299(void) {
* Trigger up - scheduling fuel for full engine cycle
*/
timeNow += MS2US(20);
eth.firePrimaryTriggerRise();
eth->firePrimaryTriggerRise();
// fuel schedule - short pulses.
// time...|0.......|10......|20......|30......|40
// inj #0 |.......#|........|.......#|........|
@ -659,16 +661,16 @@ void testFuelSchedulerBug299(void) {
t = ENGINE(engineConfiguration2)->injectionEvents;
assertEqualsM("t.s#0", 4, t->injectionEvents.size);
assertInjectionEvent(&t->injectionEvents.elements[0], 0, 0, 513, false);
assertInjectionEvent(&t->injectionEvents.elements[1], 1, 0, 693, false);
assertInjectionEvent(&t->injectionEvents.elements[2], 0, 0, 153, false);
assertInjectionEvent(&t->injectionEvents.elements[3], 1, 0, 153 + 180, false);
assertInjectionEvent("#0", &t->injectionEvents.elements[0], 0, 0, 513, false);
assertInjectionEvent("#0", &t->injectionEvents.elements[1], 1, 0, 693, false);
assertInjectionEvent("#0", &t->injectionEvents.elements[2], 0, 0, 153, false);
assertInjectionEvent("#0", &t->injectionEvents.elements[3], 1, 0, 153 + 180, false);
/**
* Trigger down - no new events, executing some
*/
timeNow += MS2US(20);
eth.firePrimaryTriggerFall();
eth->firePrimaryTriggerFall();
// same exact picture
// time...|-20.....|-10.....|0.......|10......|20
// inj #0 |.......#|........|.......#|........|
@ -690,7 +692,7 @@ void testFuelSchedulerBug299(void) {
* Trigger up again
*/
timeNow += MS2US(20);
eth.firePrimaryTriggerRise();
eth->firePrimaryTriggerRise();
assertEqualsM("qs#0-2", 8, schedulingQueue.size());
// fuel schedule - short pulses. and more realistic schedule this time
// time...|-20.....|-10.....|0.......|10......|20
@ -708,7 +710,7 @@ void testFuelSchedulerBug299(void) {
timeNow += MS2US(20);
eth.firePrimaryTriggerFall();
eth->firePrimaryTriggerFall();
// fuel schedule - short pulses. and more realistic schedule this time
// time...|-20.....|-10.....|0.......|10......|20
// inj #0 |.......#|........|........|........|
@ -729,14 +731,24 @@ void testFuelSchedulerBug299(void) {
assertEqualsM("cltC", 1, engine->engineState.cltFuelCorrection);
assertEqualsM("lag", 0, engine->engineState.injectorLag);
assertEqualsM("RPM", 3000, eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
assertEqualsM("RPM", 3000, engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F));
assertEqualsM("fuel#1", 1.5, engine->fuelMs);
assertEqualsM("duty for maf=0", 7.5, getInjectorDutyCycle(eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F) PASS_ENGINE_PARAMETER));
assertEqualsM("duty for maf=0", 7.5, getInjectorDutyCycle(engine->rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F) PASS_ENGINE_PARAMETER));
testMafValue = 3;
assertEqualsM("maf", 3, getMaf(PASS_ENGINE_PARAMETER_F));
}
void testFuelSchedulerBug299smallAndMedium(void) {
printf("*************************************************** testFuelSchedulerBug299 small to medium\r\n");
EngineTestHelper eth(TEST_ENGINE);
EXPAND_EngineTestHelper
setTestBug299(&eth);
FuelSchedule * t;
int engineLoadIndex = findIndex(config->fuelLoadBins, FUEL_LOAD_COUNT, testMafValue);
assertEquals(8, engineLoadIndex);
@ -797,10 +809,10 @@ void testFuelSchedulerBug299(void) {
t = ENGINE(engineConfiguration2)->injectionEvents;
assertEqualsM("t.s", 4, t->injectionEvents.size);
assertInjectionEvent(&t->injectionEvents.elements[0], 0, 0, 315, false);
assertInjectionEvent(&t->injectionEvents.elements[1], 1, 0, 495, false);
assertInjectionEvent(&t->injectionEvents.elements[2], 0, 0, 675, true);
assertInjectionEvent(&t->injectionEvents.elements[3], 1, 0, 45 + 90, false);
assertInjectionEvent("#1", &t->injectionEvents.elements[0], 0, 0, 315, false);
assertInjectionEvent("#1", &t->injectionEvents.elements[1], 1, 0, 495, false);
assertInjectionEvent("#1", &t->injectionEvents.elements[2], 0, 0, 675, true);
assertInjectionEvent("#1", &t->injectionEvents.elements[3], 1, 0, 45 + 90, false);
timeNow += MS2US(20);
eth.firePrimaryTriggerRise();
@ -839,19 +851,109 @@ void testFuelSchedulerBug299(void) {
timeNow += MS2US(20);
eth.firePrimaryTriggerRise();
assertEqualsM("qs#3", 8, schedulingQueue.size());
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_F);
t = ENGINE(engineConfiguration2)->injectionEvents;
assertEqualsM("t.s", 4, t->injectionEvents.size);
assertInjectionEvent(&t->injectionEvents.elements[0], 0, 0, 315, false);
assertInjectionEvent(&t->injectionEvents.elements[1], 1, 0, 495, false);
assertInjectionEvent(&t->injectionEvents.elements[2], 0, 0, 675, true);
assertInjectionEvent(&t->injectionEvents.elements[3], 1, 0, 45 + 90, false);
assertInjectionEvent("#2", &t->injectionEvents.elements[0], 0, 0, 315, false);
assertInjectionEvent("#2", &t->injectionEvents.elements[1], 1, 0, 495, false);
assertInjectionEvent("#2", &t->injectionEvents.elements[2], 0, 0, 675, true);
assertInjectionEvent("#2", &t->injectionEvents.elements[3], 1, 0, 45 + 90, false);
setArrayValues(fuelMap.pointers[engineLoadIndex], FUEL_RPM_COUNT, 35);
setArrayValues(fuelMap.pointers[engineLoadIndex + 1], FUEL_RPM_COUNT, 35);
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_F);
assertEqualsM("fuel#3", 17.5, engine->fuelMs);
// duty cycle above 75% is a special use-case because 'special' fuel event overlappes the next normal event in batch mode
assertEqualsM("duty for maf=3", 87.5, getInjectorDutyCycle(eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F) PASS_ENGINE_PARAMETER));
assertInjectionEvent("#03", &t->injectionEvents.elements[0], 0, 0, 315, false);
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_F);
timeNow += MS2US(20);
eth.firePrimaryTriggerFall();
schedulingQueue.executeAll(timeNow);
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_F);
timeNow += MS2US(20);
eth.firePrimaryTriggerRise();
schedulingQueue.executeAll(timeNow);
timeNow += MS2US(20);
eth.firePrimaryTriggerFall();
schedulingQueue.executeAll(timeNow);
timeNow += MS2US(20);
eth.firePrimaryTriggerRise();
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_F);
t = ENGINE(engineConfiguration2)->injectionEvents;
assertEqualsM("t.s", 4, t->injectionEvents.size);
assertInjectionEvent("#4", &t->injectionEvents.elements[0], 0, 0, 225, false); // 87.5 duty cycle
assertInjectionEvent("#4", &t->injectionEvents.elements[1], 1, 0, 405, false);
assertInjectionEvent("#4", &t->injectionEvents.elements[2], 0, 0, 585, true);
assertInjectionEvent("#4", &t->injectionEvents.elements[3], 1, 0, 45, false);
// todo: what's what? a mix of new something and old something?
assertEqualsM("qs#5", 8, schedulingQueue.size());
assertInjectorDownEvent("8@0", 0, MS2US(-15.0), 1);
assertInjectorUpEvent("8@1", 1, MS2US(7.5), 1);
assertInjectorUpEvent("8@2", 2, MS2US(17.5), 0);
assertInjectorUpEvent("8@3", 3, MS2US(27.5), 1);
assertInjectorDownEvent("8@4", 4, MS2US(35), 0);
assertInjectorUpEvent("8@5", 5, MS2US(37.5), 0);
assertInjectorDownEvent("8@6", 6, MS2US(45), 1);
assertInjectorDownEvent("8@7", 7, MS2US(55), 0);
schedulingQueue.executeAll(timeNow);
unitTestValue = 0;
testMafValue = 0;
}
void testFuelSchedulerBug299smallAndLarge(void) {
printf("*************************************************** testFuelSchedulerBug299 small to large\r\n");
// EngineTestHelper eth(TEST_ENGINE);
// EXPAND_EngineTestHelper
// setTestBug299(&eth);
// FuelSchedule * t;
//
//
// int engineLoadIndex = findIndex(config->fuelLoadBins, FUEL_LOAD_COUNT, testMafValue);
// assertEquals(8, engineLoadIndex);
// setArrayValues(fuelMap.pointers[engineLoadIndex], FUEL_RPM_COUNT, 35);
// setArrayValues(fuelMap.pointers[engineLoadIndex + 1], FUEL_RPM_COUNT, 35);
//
// engine->periodicFastCallback(PASS_ENGINE_PARAMETER_F);
// assertEqualsM("Lfuel#2", 17.5, engine->fuelMs);
// assertEqualsM("Lduty for maf=3", 87.5, getInjectorDutyCycle(eth.engine.rpmCalculator.getRpm(PASS_ENGINE_PARAMETER_F) PASS_ENGINE_PARAMETER));
//
// assertEqualsM("Lqs#1", 0, schedulingQueue.size());
// timeNow += MS2US(20);
// eth.firePrimaryTriggerRise();
// // time...|0.......|10......|20......|30......|40......|50......|60......|
// // inj #0 |########|##...###|########|.....###|########|........|........|
// // inj #1 |.....###|########|....####|########|........|........|........|
// assertEqualsM("Lqs#4", 10, schedulingQueue.size());
// assertInjectorUpEvent("L04@0", 0, MS2US(0), 0);
// assertInjectorUpEvent("L04@1", 1, MS2US(2.5), 1);
// assertInjectorUpEvent("L04@2", 2, MS2US(12.5), 0);
// assertInjectorUpEvent("L04@3", 3, MS2US(12.5), 0);
// assertInjectorDownEvent("L04@4", 4, MS2US(20), 1);
// assertInjectorUpEvent("L04@5", 5, MS2US(22.5), 1);
// assertInjectorDownEvent("L04@6", 6, MS2US(30), 0);
// assertInjectorUpEvent("L04@7", 7, MS2US(32.5), 0);
// assertInjectorDownEvent("L04@8", 8, MS2US(40.0), 1);
// assertInjectorDownEvent("L04@9", 9, MS2US(50.0), 0);
}

3
unit_tests/test_trigger_decoder.h
View File

@ -9,7 +9,8 @@
#define TEST_TRIGGER_DECODER_H_
void testTriggerDecoder(void);
void testFuelSchedulerBug299(void);
void testFuelSchedulerBug299smallAndMedium(void);
void testFuelSchedulerBug299smallAndLarge(void);
void testRpmCalculator(void);
void testStartupFuelPumping(void);
void test1995FordInline6TriggerDecoder(void);