mirror of https://github.com/rusefi/rusefi.git
1186 lines
42 KiB
C++
1186 lines
42 KiB
C++
/**
|
|
* @file test_trigger_decoder.cpp
|
|
*
|
|
* @date Dec 24, 2013
|
|
* @author Andrey Belomutskiy, (c) 2012-2020
|
|
*/
|
|
|
|
#include "pch.h"
|
|
|
|
#include "trigger_decoder.h"
|
|
#include "ford_aspire.h"
|
|
#include "dodge_neon.h"
|
|
#include "ford_1995_inline_6.h"
|
|
#include "event_queue.h"
|
|
#include "trigger_mazda.h"
|
|
#include "trigger_chrysler.h"
|
|
#include "advance_map.h"
|
|
#include "speed_density.h"
|
|
#include "fuel_math.h"
|
|
#include "spark_logic.h"
|
|
#include "trigger_universal.h"
|
|
|
|
using ::testing::_;
|
|
|
|
extern WarningCodeState unitTestWarningCodeState;
|
|
|
|
extern "C" {
|
|
void sendOutConfirmation(char *value, int i);
|
|
}
|
|
|
|
void sendOutConfirmation(char *value, int i) {
|
|
// test implementation
|
|
}
|
|
|
|
static int getTriggerZeroEventIndex(engine_type_e engineType) {
|
|
EngineTestHelper eth(engineType);
|
|
|
|
initDataStructures();
|
|
|
|
const auto& triggerConfiguration = engine->triggerCentral.primaryTriggerConfiguration;
|
|
|
|
TriggerWaveform& shape = eth.engine.triggerCentral.triggerShape;
|
|
return eth.engine.triggerCentral.triggerState.findTriggerZeroEventIndex(shape, triggerConfiguration);
|
|
}
|
|
|
|
TEST(trigger, testSkipped2_0) {
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
// for this test we need a trigger with isSynchronizationNeeded=true
|
|
engineConfiguration->trigger.customTotalToothCount = 2;
|
|
engineConfiguration->trigger.customSkippedToothCount = 0;
|
|
eth.setTriggerType(trigger_type_e::TT_TOOTHED_WHEEL);
|
|
ASSERT_EQ( 0, round(Sensor::getOrZero(SensorType::Rpm))) << "testNoStartUpWarnings RPM";
|
|
}
|
|
|
|
TEST(trigger, testSomethingWeird) {
|
|
EngineTestHelper eth(engine_type_e::FORD_INLINE_6_1995);
|
|
|
|
TriggerDecoderBase state_("test");
|
|
TriggerDecoderBase *sta = &state_;
|
|
|
|
const auto& triggerConfiguration = engine->triggerCentral.primaryTriggerConfiguration;
|
|
|
|
|
|
ASSERT_FALSE(sta->shaft_is_synchronized) << "shaft_is_synchronized";
|
|
int r = 10;
|
|
sta->decodeTriggerEvent("t", engine->triggerCentral.triggerShape, /* override */ nullptr, triggerConfiguration, SHAFT_PRIMARY_RISING, ++r);
|
|
ASSERT_TRUE(sta->shaft_is_synchronized); // first signal rise synchronize
|
|
ASSERT_EQ(0, sta->getCurrentIndex());
|
|
|
|
for (int i = 2; i < 10; i += 2) {
|
|
sta->decodeTriggerEvent("t", engine->triggerCentral.triggerShape, /* override */ nullptr, triggerConfiguration, SHAFT_PRIMARY_RISING, r++);
|
|
assertEqualsM("even", i, sta->getCurrentIndex());
|
|
}
|
|
|
|
sta->decodeTriggerEvent("test", engine->triggerCentral.triggerShape, /* override */ nullptr, triggerConfiguration, SHAFT_PRIMARY_RISING, r++);
|
|
ASSERT_EQ(10, sta->getCurrentIndex());
|
|
|
|
sta->decodeTriggerEvent("test", engine->triggerCentral.triggerShape, /* override */ nullptr, triggerConfiguration, SHAFT_PRIMARY_RISING, r++);
|
|
ASSERT_EQ(0, sta->getCurrentIndex()); // new revolution
|
|
}
|
|
|
|
TEST(trigger, test1995FordInline6TriggerDecoder) {
|
|
ASSERT_EQ( 0, getTriggerZeroEventIndex(engine_type_e::FORD_INLINE_6_1995)) << "triggerIndex ";
|
|
|
|
EngineTestHelper eth(engine_type_e::FORD_INLINE_6_1995);
|
|
engineConfiguration->isFasterEngineSpinUpEnabled = false;
|
|
|
|
engineConfiguration->minimumIgnitionTiming = -15;
|
|
setWholeTimingTable(-13);
|
|
|
|
Sensor::setMockValue(SensorType::Iat, 49.579071f);
|
|
|
|
TriggerWaveform * shape = &engine->triggerCentral.triggerShape;
|
|
|
|
ASSERT_EQ( 0, shape->getTriggerWaveformSynchPointIndex()) << "triggerShapeSynchPointIndex";
|
|
|
|
eth.applyTriggerWaveform();
|
|
|
|
engine->periodicFastCallback();
|
|
eth.fireTriggerEvents(48);
|
|
eth.assertRpm(2000, "rpm");
|
|
engine->periodicFastCallback();
|
|
eth.fireTriggerEvents(48);
|
|
|
|
IgnitionEventList *ecl = &engine->ignitionEvents;
|
|
ASSERT_EQ(true, ecl->isReady) << "ford inline ignition events size";
|
|
|
|
EXPECT_NEAR(ecl->elements[0].dwellAngle, 8.960f, 1e-3);
|
|
EXPECT_NEAR(ecl->elements[0].sparkAngle, 14.96f, 1e-3);
|
|
EXPECT_NEAR(ecl->elements[5].dwellAngle, 608.960f, 1e-3);
|
|
EXPECT_NEAR(ecl->elements[5].sparkAngle, 614.960f, 1e-3);
|
|
|
|
ASSERT_FLOAT_EQ(0.5, engine->ignitionState.getSparkDwell(2000)) << "running dwell";
|
|
}
|
|
|
|
TEST(misc, testGetCoilDutyCycleIssue977) {
|
|
EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996);
|
|
|
|
int rpm = 2000;
|
|
engine->rpmCalculator.setRpmValue(rpm);
|
|
ASSERT_EQ( 4, engine->ignitionState.getSparkDwell(rpm)) << "running dwell";
|
|
|
|
ASSERT_NEAR( 26.66666, getCoilDutyCycle(rpm), 0.0001);
|
|
}
|
|
|
|
TEST(misc, testFordAspire) {
|
|
printf("*************************************************** testFordAspire\r\n");
|
|
|
|
ASSERT_EQ( 4, getTriggerZeroEventIndex(engine_type_e::FORD_ASPIRE_1996)) << "getTriggerZeroEventIndex";
|
|
|
|
EngineTestHelper eth(engine_type_e::FORD_ASPIRE_1996);
|
|
|
|
ASSERT_EQ( 4, getTriggerCentral()->triggerShape.getTriggerWaveformSynchPointIndex()) << "getTriggerWaveformSynchPointIndex";
|
|
|
|
engineConfiguration->crankingTimingAngle = 31;
|
|
|
|
int rpm = 2000;
|
|
engine->rpmCalculator.setRpmValue(rpm);
|
|
ASSERT_EQ( 4, engine->ignitionState.getSparkDwell(rpm)) << "running dwell";
|
|
|
|
engine->rpmCalculator.setRpmValue(6000);
|
|
assertEqualsM("higher rpm dwell", 3.25, engine->ignitionState.getSparkDwell(6000));
|
|
|
|
}
|
|
|
|
extern TriggerDecoderBase initState;
|
|
|
|
static void testTriggerDecoder2(const char *msg, engine_type_e type, int synchPointIndex, float channel1duty, float channel2duty, float expectedGapRatio = NAN) {
|
|
printf("====================================================================================== testTriggerDecoder2 msg=%s\r\n", msg);
|
|
|
|
// Some configs use aux valves, which requires this sensor
|
|
std::unordered_map<SensorType, float> sensorVals = {{SensorType::DriverThrottleIntent, 0}};
|
|
EngineTestHelper eth(type, sensorVals);
|
|
|
|
TriggerWaveform *t = &engine->triggerCentral.triggerShape;
|
|
|
|
ASSERT_FALSE(t->shapeDefinitionError) << "isError";
|
|
|
|
ASSERT_EQ(synchPointIndex, t->getTriggerWaveformSynchPointIndex()) << "synchPointIndex " << msg;
|
|
if (!cisnan(expectedGapRatio)) {
|
|
assertEqualsM2("actual gap ratio", expectedGapRatio, initState.triggerSyncGapRatio, 0.001);
|
|
}
|
|
}
|
|
|
|
static void assertREquals(void *expected, void *actual) {
|
|
ASSERT_EQ((float)(uint64_t)expected, (float)(uint64_t)actual);
|
|
}
|
|
|
|
static void assertREqualsM(const char *msg, void *expected, void *actual) {
|
|
assertEqualsM(msg, (float)(uint64_t)expected, (float)(uint64_t)actual);
|
|
}
|
|
|
|
extern bool_t debugSignalExecutor;
|
|
|
|
TEST(misc, testRpmCalculator) {
|
|
EngineTestHelper eth(engine_type_e::FORD_INLINE_6_1995);
|
|
|
|
setTable(config->injectionPhase, -180.0f);
|
|
|
|
engine->tdcMarkEnabled = false;
|
|
|
|
// These tests were written when the default target AFR was 14.0, so replicate that
|
|
engineConfiguration->stoichRatioPrimary = 14;
|
|
|
|
EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _))
|
|
.WillRepeatedly(Return(AirmassResult{0.3024f, 50.0f}));
|
|
|
|
IgnitionEventList *ilist = &engine->ignitionEvents;
|
|
ASSERT_EQ( 0, ilist->isReady) << "size #1";
|
|
|
|
ASSERT_EQ( 720, engine->engineState.engineCycle) << "engineCycle";
|
|
|
|
efiAssertVoid(ObdCode::CUSTOM_ERR_6670, engineConfiguration!=NULL, "null config in engine");
|
|
|
|
engineConfiguration->minimumIgnitionTiming = -15;
|
|
float timingAdvance = -13;
|
|
setWholeTimingTable(timingAdvance);
|
|
|
|
engineConfiguration->trigger.customTotalToothCount = 8;
|
|
eth.applyTriggerWaveform();
|
|
|
|
setFlatInjectorLag(0);
|
|
|
|
engine->updateSlowSensors();
|
|
|
|
ASSERT_EQ(0, round(Sensor::getOrZero(SensorType::Rpm)));
|
|
|
|
// triggerIndexByAngle update is now fixed! prepareOutputSignals() wasn't reliably called
|
|
ASSERT_EQ(4, engine->triggerCentral.triggerShape.findAngleIndex(&engine->triggerCentral.triggerFormDetails, 240));
|
|
ASSERT_EQ(4, engine->triggerCentral.triggerShape.findAngleIndex(&engine->triggerCentral.triggerFormDetails, 241));
|
|
|
|
eth.fireTriggerEvents(/* count */ 48);
|
|
|
|
eth.assertRpm(1500);
|
|
ASSERT_EQ( 14, engine->triggerCentral.triggerState.getCurrentIndex()) << "index #1";
|
|
|
|
|
|
eth.executeActions();
|
|
|
|
// debugSignalExecutor = true;
|
|
|
|
ASSERT_EQ(engine->triggerCentral.triggerState.getShaftSynchronized(), 1);
|
|
|
|
eth.moveTimeForwardMs(5 /*ms*/);
|
|
|
|
int start = eth.getTimeNowUs();
|
|
ASSERT_EQ( 485000, start) << "start value";
|
|
|
|
engine->periodicFastCallback();
|
|
|
|
ASSERT_NEAR(engine->engineState.timingAdvance[0], 720 + timingAdvance, 0.1f);
|
|
|
|
assertEqualsM("fuel #1", 4.5450, engine->engineState.injectionDuration);
|
|
InjectionEvent *ie0 = &engine->injectionEvents.elements[0];
|
|
assertEqualsM("injection angle", 499.095, ie0->injectionStartAngle);
|
|
|
|
eth.firePrimaryTriggerRise();
|
|
eth.assertRpm(1500);
|
|
|
|
assertEqualsM("dwell", eth.timeToAngle(FORD_INLINE_DWELL), engine->ignitionState.dwellDurationAngle);
|
|
assertEqualsM("fuel #2", 4.5450, engine->engineState.injectionDuration);
|
|
assertEqualsM("one degree", 111.1111, engine->rpmCalculator.oneDegreeUs);
|
|
ASSERT_EQ( 1, ilist->isReady) << "size #2";
|
|
EXPECT_NEAR(ilist->elements[0].dwellAngle, 8.5f, 1e-3);
|
|
EXPECT_NEAR(ilist->elements[0].sparkAngle, 13.0f, 1e-3);
|
|
|
|
ASSERT_EQ( 0, engine->triggerCentral.triggerState.getCurrentIndex()) << "index #2";
|
|
ASSERT_EQ( 4, engine->executor.size()) << "queue size/2";
|
|
{
|
|
scheduling_s *ev0 = engine->executor.getForUnitTest(0);
|
|
|
|
assertREqualsM("Call@0", (void*)ev0->action.getCallback(), (void*)turnSparkPinHigh);
|
|
assertEqualsM("ev 0", start + 944, ev0->momentX);
|
|
assertEqualsLM("coil 0", (uintptr_t)&enginePins.coils[0], (uintptr_t)((IgnitionEvent*)ev0->action.getArgument())->outputs[0]);
|
|
|
|
scheduling_s *ev1 = engine->executor.getForUnitTest(1);
|
|
assertREqualsM("Call@1", (void*)ev1->action.getCallback(), (void*)fireSparkAndPrepareNextSchedule);
|
|
assertEqualsM("ev 1", start + 944 + 1000 * FORD_INLINE_DWELL , ev1->momentX);
|
|
assertEqualsLM("coil 1", (uintptr_t)&enginePins.coils[0], (uintptr_t)((IgnitionEvent*)ev1->action.getArgument())->outputs[0]);
|
|
|
|
}
|
|
|
|
engine->executor.clear();
|
|
|
|
eth.fireFall(5);
|
|
eth.fireRise(5);
|
|
eth.fireFall(5);
|
|
ASSERT_EQ( 2, engine->triggerCentral.triggerState.getCurrentIndex()) << "index #3";
|
|
ASSERT_EQ( 4, engine->executor.size()) << "queue size 3";
|
|
assertEqualsM("ev 3", start + 13333 - 1515 + 2459, engine->executor.getForUnitTest(0)->momentX);
|
|
assertEqualsM2("ev 5", start + 14277 + 500, engine->executor.getForUnitTest(1)->momentX, 2);
|
|
assertEqualsM("3/3", start + 14777 + 677, engine->executor.getForUnitTest(2)->momentX);
|
|
engine->executor.clear();
|
|
|
|
ASSERT_EQ(4, engine->triggerCentral.triggerShape.findAngleIndex(&engine->triggerCentral.triggerFormDetails, 240));
|
|
ASSERT_EQ(4, engine->triggerCentral.triggerShape.findAngleIndex(&engine->triggerCentral.triggerFormDetails, 241));
|
|
|
|
|
|
eth.fireFall(5);
|
|
ASSERT_EQ( 0, engine->executor.size()) << "queue size 4.1";
|
|
|
|
|
|
eth.fireRise(5);
|
|
ASSERT_EQ( 4, engine->executor.size()) << "queue size 4.2";
|
|
|
|
|
|
eth.fireRise(5);
|
|
ASSERT_EQ( 4, engine->executor.size()) << "queue size 4.3";
|
|
|
|
assertEqualsM("dwell", eth.timeToAngle(FORD_INLINE_DWELL), engine->ignitionState.dwellDurationAngle);
|
|
assertEqualsM("fuel #3", 4.5450, engine->engineState.injectionDuration);
|
|
eth.assertRpm(1500);
|
|
|
|
|
|
ASSERT_EQ( 6, engine->triggerCentral.triggerState.getCurrentIndex()) << "index #4";
|
|
ASSERT_EQ( 4, engine->executor.size()) << "queue size 4";
|
|
engine->executor.clear();
|
|
|
|
eth.fireFall(5);
|
|
ASSERT_EQ( 0, engine->executor.size()) << "queue size 5";
|
|
// todo: assert queue elements
|
|
engine->executor.clear();
|
|
|
|
|
|
eth.fireRise(5);
|
|
ASSERT_EQ( 4, engine->executor.size()) << "queue size 6";
|
|
assertEqualsM("6/0", start + 40944, engine->executor.getForUnitTest(0)->momentX);
|
|
assertEqualsM("6/1", start + 41444, engine->executor.getForUnitTest(1)->momentX);
|
|
engine->executor.clear();
|
|
|
|
eth.fireFall(5);
|
|
ASSERT_EQ( 0, engine->executor.size()) << "queue size 7";
|
|
engine->executor.clear();
|
|
|
|
eth.fireRise(5 /*ms*/);
|
|
eth.fireFall(5);
|
|
|
|
ASSERT_EQ( 4, engine->executor.size()) << "queue size 8";
|
|
assertEqualsM("8/0", start + 53333 - 1515 + 2459, engine->executor.getForUnitTest(0)->momentX);
|
|
assertEqualsM2("8/1", start + 54277 + 2459 - 1959, engine->executor.getForUnitTest(1)->momentX, 0);
|
|
engine->executor.clear();
|
|
}
|
|
|
|
TEST(trigger, testAnotherTriggerDecoder) {
|
|
testTriggerDecoder2("Miata 2003", engine_type_e::MAZDA_MIATA_NB2, 3, 0.38888889, 0.0);
|
|
}
|
|
|
|
TEST(trigger, testTriggerDecoder) {
|
|
printf("====================================================================================== testTriggerDecoder\r\n");
|
|
|
|
{
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
TriggerWaveform * s = &engine->triggerCentral.triggerShape;
|
|
|
|
initializeSkippedToothTrigger(s, 2, 0, FOUR_STROKE_CAM_SENSOR, SyncEdge::Rise);
|
|
assertEqualsM("shape size", s->getSize(), 4);
|
|
ASSERT_EQ(s->wave.getSwitchTime(0), 0.25);
|
|
ASSERT_EQ(s->wave.getSwitchTime(1), 0.5);
|
|
ASSERT_EQ(s->wave.getSwitchTime(2), 0.75);
|
|
ASSERT_EQ(s->wave.getSwitchTime(3), 1);
|
|
}
|
|
|
|
printf("====================================================================================== testTriggerDecoder part 2\r\n");
|
|
testTriggerDecoder2("Dodge Neon 1995", engine_type_e::DODGE_NEON_1995, 0, 0.4931, 0.2070);
|
|
|
|
testTriggerDecoder2("ford aspire", engine_type_e::FORD_ASPIRE_1996, 4, 0.0000, 0.5);
|
|
|
|
testTriggerDecoder2("dodge ram", engine_type_e::DODGE_RAM, 16, 0.5000, 0.06);
|
|
|
|
testTriggerDecoder2("Miata NB2", engine_type_e::MAZDA_MIATA_NB2, 3, 0.3888888955, 0);
|
|
|
|
printf("====================================================================================== testTriggerDecoder part 3\r\n");
|
|
|
|
testTriggerDecoder2("test 2/1 both", engine_type_e::TEST_ISSUE_366_BOTH, 0, 0.2500, 0.0);
|
|
testTriggerDecoder2("test 2/1 rise", engine_type_e::TEST_ISSUE_366_RISE, 0, 0.0000, 0.0);
|
|
|
|
testTriggerDecoder2("test engine", engine_type_e::TEST_ENGINE, 0, 0.7500, 0.2500);
|
|
testTriggerDecoder2("testGY6_139QMB", engine_type_e::GY6_139QMB, 0, 0.4375, 0.0);
|
|
|
|
testTriggerDecoder2("testFordEscortGt", engine_type_e::FORD_ESCORT_GT, 0, 0.8096, 0.3844);
|
|
|
|
testTriggerDecoder2("NISSAN_PRIMERA", engine_type_e::NISSAN_PRIMERA, 2, 0.9611, 0.0);
|
|
|
|
testTriggerDecoder2("test1+1", engine_type_e::DEFAULT_FRANKENSO, 0, 0.7500, 0.2500);
|
|
|
|
testTriggerDecoder2("neon NGC4", engine_type_e::DODGE_NEON_2003_CRANK, 6, 0.5000, 0.0, CHRYSLER_NGC4_GAP);
|
|
|
|
{
|
|
EngineTestHelper eth(engine_type_e::DODGE_NEON_2003_CRANK);
|
|
|
|
printf("!!!!!!!!!!!!!!!!!! Now trying with only rising edges !!!!!!!!!!!!!!!!!\r\n");
|
|
|
|
applyNonPersistentConfiguration();
|
|
prepareOutputSignals();
|
|
|
|
}
|
|
|
|
testTriggerDecoder2("sachs", engine_type_e::SACHS, 0, 0.4800, 0.000);
|
|
|
|
testTriggerDecoder2("vw ABA", engine_type_e::VW_ABA, 0, 0.51666, 0.0);
|
|
}
|
|
|
|
static void assertInjectionEventBase(const char *msg, InjectionEvent *ev, int injectorIndex, int eventIndex, angle_t angleOffset) {
|
|
EXPECT_EQ(injectorIndex, ev->outputs[0]->injectorIndex) << msg << "inj index";
|
|
EXPECT_NEAR_M4(angleOffset, ev->injectionStartAngle) << msg << "inj index";
|
|
}
|
|
|
|
static void assertInjectionEvent(const char *msg, InjectionEvent *ev, int injectorIndex, int eventIndex, angle_t angleOffset) {
|
|
assertInjectionEventBase(msg, ev, injectorIndex, eventIndex, angleOffset);
|
|
|
|
// There should NOT be a second injector configured
|
|
EXPECT_EQ(nullptr, ev->outputs[1]);
|
|
}
|
|
|
|
static void assertInjectionEventBatch(const char *msg, InjectionEvent *ev, int injectorIndex, int secondInjectorIndex, int eventIndex, angle_t angleOffset) {
|
|
assertInjectionEventBase(msg, ev, injectorIndex, eventIndex, angleOffset);
|
|
|
|
// There should be a second injector - confirm it's the correct one
|
|
ASSERT_NE(nullptr, ev->outputs[1]);
|
|
EXPECT_EQ(secondInjectorIndex, ev->outputs[1]->injectorIndex);
|
|
}
|
|
|
|
static void setTestBug299(EngineTestHelper *eth) {
|
|
setupSimpleTestEngineWithMafAndTT_ONE_trigger(eth);
|
|
EXPECT_CALL(*eth->mockAirmass, getAirmass(_, _))
|
|
.WillRepeatedly(Return(AirmassResult{0.1008001f, 50.0f}));
|
|
|
|
Engine *engine = ð->engine;
|
|
|
|
|
|
eth->assertRpm(0, "RPM=0");
|
|
|
|
eth->fireTriggerEventsWithDuration(20);
|
|
// still no RPM since need to cycles measure cycle duration
|
|
eth->assertRpm(0, "setTestBug299: RPM#1");
|
|
eth->fireTriggerEventsWithDuration(20);
|
|
eth->assertRpm(3000, "setTestBug299: RPM#2");
|
|
|
|
eth->clearQueue();
|
|
|
|
/**
|
|
* Trigger up - scheduling fuel for full engine cycle
|
|
*/
|
|
eth->fireRise(20);
|
|
// fuel schedule - short pulses.
|
|
// time...|0.......|10......|20......|30......|40
|
|
// inj #0 |.......#|........|.......#|........|
|
|
// inj #1 |........|.......#|........|.......#|
|
|
ASSERT_EQ( 4, engine->executor.size()) << "qs#00";
|
|
ASSERT_EQ( 3, getRevolutionCounter()) << "rev cnt#3";
|
|
eth->assertInjectorUpEvent("setTestBug299: 1@0", 0, MS2US(8.5), 2);
|
|
eth->assertInjectorDownEvent("@1", 1, MS2US(10), 2);
|
|
eth->assertInjectorUpEvent("1@2", 2, MS2US(18.5), 3);
|
|
eth->assertInjectorDownEvent("1@3", 3, MS2US(20), 3);
|
|
ASSERT_EQ( 0, eth->executeActions()) << "exec#0";
|
|
|
|
FuelSchedule * t = &engine->injectionEvents;
|
|
|
|
assertInjectionEventBatch("#0", &t->elements[0], 0, 3, 1, 153 + 360);
|
|
assertInjectionEventBatch("#1_i_@", &t->elements[1], 2, 1, 1, 333 + 360);
|
|
assertInjectionEventBatch("#2@", &t->elements[2], 3, 0, 0, 153);
|
|
assertInjectionEventBatch("inj#3@", &t->elements[3], 1, 2, 0, 153 + 180);
|
|
|
|
/**
|
|
* Trigger down - no new events, executing some
|
|
*/
|
|
eth->fireFall(20);
|
|
// same exact picture
|
|
// time...|-20.....|-10.....|0.......|10......|20
|
|
// inj #0 |.......#|........|.......#|........|
|
|
// inj #1 |........|.......#|........|.......#|
|
|
ASSERT_EQ( 8, engine->executor.size()) << "qs#0";
|
|
ASSERT_EQ( 3, getRevolutionCounter()) << "rev cnt#3";
|
|
eth->assertInjectorUpEvent("02@0", 0, MS2US(-11.5), 2);
|
|
eth->assertInjectorDownEvent("@1", 1, MS2US(-10), 2);
|
|
eth->assertInjectorUpEvent("@2", 2, MS2US(-1.5), 3);
|
|
eth->assertInjectorDownEvent("02@3", 3, MS2US(0), 3);
|
|
eth->assertInjectorUpEvent("02@4", 4, MS2US(8.5), 0);
|
|
eth->assertInjectorDownEvent("@5", 5, MS2US(10), 0);
|
|
eth->assertInjectorUpEvent("02@6", 6, MS2US(18.5), 1);
|
|
eth->assertInjectorDownEvent("@7", 7, MS2US(20), 1);
|
|
ASSERT_EQ( 4, eth->executeActions()) << "exec#1";
|
|
|
|
|
|
/**
|
|
* Trigger up again
|
|
*/
|
|
eth->moveTimeForwardMs(20 /*ms*/);
|
|
eth->assertInjectorUpEvent("22@0", 0, MS2US(-11.5), 0);
|
|
eth->assertInjectorDownEvent("22@1", 1, MS2US(-10), 0);
|
|
eth->assertInjectorUpEvent("22@2", 2, MS2US(-1.5), 1);
|
|
eth->assertInjectorDownEvent("22@3", 3, MS2US(0), 1);
|
|
ASSERT_EQ( 4, eth->executeActions()) << "exec#20";
|
|
|
|
eth->firePrimaryTriggerRise();
|
|
ASSERT_EQ( 4, engine->executor.size()) << "qs#0-2";
|
|
// fuel schedule - short pulses. and more realistic schedule this time
|
|
// time...|-20.....|-10.....|0.......|10......|20
|
|
// inj #0 |.......#|........|.......#|........|
|
|
// inj #1 |........|.......#|........|.......#|
|
|
eth->assertInjectorUpEvent("2@0", 0, MS2US(8.5), 2);
|
|
eth->assertInjectorDownEvent("@1", 1, MS2US(10), 2);
|
|
eth->assertInjectorUpEvent("@2", 2, MS2US(18.5), 3);
|
|
eth->assertInjectorDownEvent("2@3", 3, MS2US(20), 3);
|
|
ASSERT_EQ( 0, eth->executeActions()) << "exec#2";
|
|
|
|
|
|
eth->moveTimeForwardUs(MS2US(20));
|
|
eth->executeActions();
|
|
eth->firePrimaryTriggerFall();
|
|
// fuel schedule - short pulses. and more realistic schedule this time
|
|
// time...|-20.....|-10.....|0.......|10......|20
|
|
// inj #0 |.......#|........|........|........|
|
|
// inj #1 |........|.......#|........|........|
|
|
ASSERT_EQ( 4, engine->executor.size()) << "qs#0-2";
|
|
ASSERT_EQ( 4, getRevolutionCounter()) << "rev cnt#4";
|
|
eth->assertInjectorUpEvent("0@0", 0, MS2US(8.5), 0);
|
|
eth->assertInjectorDownEvent("0@1", 1, MS2US(10), 0);
|
|
eth->assertInjectorUpEvent("0@2", 2, MS2US(18.5), 1);
|
|
eth->assertInjectorDownEvent("0@3", 3, MS2US(20), 1);
|
|
ASSERT_EQ( 0, eth->executeActions()) << "exec#3";
|
|
|
|
|
|
ASSERT_EQ( 1, engine->fuelComputer.running.intakeTemperatureCoefficient) << "iatC";
|
|
ASSERT_EQ( 1, engine->fuelComputer.running.coolantTemperatureCoefficient) << "cltC";
|
|
ASSERT_EQ( 0, engine->module<InjectorModelPrimary>()->getDeadtime()) << "lag";
|
|
|
|
ASSERT_EQ( 3000, round(Sensor::getOrZero(SensorType::Rpm))) << "setTestBug299: RPM";
|
|
|
|
assertEqualsM("fuel#1", 1.5, engine->engineState.injectionDuration);
|
|
assertEqualsM("duty for maf=0", 7.5, getInjectorDutyCycle(round(Sensor::getOrZero(SensorType::Rpm))));
|
|
}
|
|
|
|
#define assertInjectors(msg, value0, value1) \
|
|
{ \
|
|
EXPECT_EQ(value0, enginePins.injectors[0].currentLogicValue) << msg; \
|
|
EXPECT_EQ(value1, enginePins.injectors[1].currentLogicValue) << msg; \
|
|
}
|
|
|
|
static void setArray(float* p, size_t count, float value) {
|
|
while (count--) {
|
|
*p++ = value;
|
|
}
|
|
}
|
|
|
|
void doTestFuelSchedulerBug299smallAndMedium(int startUpDelayMs) {
|
|
printf("*************************************************** testFuelSchedulerBug299 small to medium\r\n");
|
|
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
setTable(config->injectionPhase, -180.0f);
|
|
engineConfiguration->isFasterEngineSpinUpEnabled = false;
|
|
engine->tdcMarkEnabled = false;
|
|
eth.moveTimeForwardMs(startUpDelayMs); // nice to know that same test works the same with different anount of idle time on start
|
|
setTestBug299(ð);
|
|
|
|
FuelSchedule * t;
|
|
|
|
assertInjectors("#0_inj", 0, 0);
|
|
|
|
engine->periodicFastCallback();
|
|
|
|
engine->engineState.injectionDuration = 12.5f;
|
|
// Injection duration of 12.5ms
|
|
MockInjectorModel2 im;
|
|
EXPECT_CALL(im, getInjectionDuration(_)).WillRepeatedly(Return(12.5f));
|
|
engine->module<InjectorModelPrimary>().set(&im);
|
|
|
|
assertEqualsM("duty for maf=3", 62.5, getInjectorDutyCycle(round(Sensor::getOrZero(SensorType::Rpm))));
|
|
|
|
ASSERT_EQ( 4, engine->executor.size()) << "qs#1";
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
ASSERT_EQ( 4, eth.executeActions()) << "exec#2#0";
|
|
ASSERT_EQ( 0, engine->executor.size()) << "qs#1#2";
|
|
|
|
|
|
ASSERT_EQ( 4, getRevolutionCounter()) << "rev cnt#4#0";
|
|
eth.firePrimaryTriggerRise();
|
|
ASSERT_EQ( 5, getRevolutionCounter()) << "rev cnt#4#1";
|
|
// time...|0.......|10......|20......|30......|40......|50......|60......|
|
|
// inj #0 |########|##...###|########|.....###|########|........|........|
|
|
// inj #1 |.....###|########|....####|########|........|........|........|
|
|
ASSERT_EQ( 6, engine->executor.size()) << "qs#4";
|
|
//todo assertInjectorUpEvent("04@0", 0, MS2US(0), 0);
|
|
// assertInjectorUpEvent("04@1", 1, MS2US(7.5), 1);
|
|
// assertInjectorDownEvent("04@2", 2, MS2US(12.5), 0);
|
|
// assertInjectorUpEvent("04@3", 3, MS2US(17.5), 0);
|
|
// assertInjectorDownEvent("04@4", 4, MS2US(20), 1);
|
|
// assertInjectorDownEvent("04@5", 5, MS2US(30), 0);
|
|
// assertInjectorDownEvent("04@6", 6, MS2US(30), 0);
|
|
// assertInjectorUpEvent("04@7", 7, MS2US(37.5), 0);
|
|
// assertInjectorDownEvent("04@8", 8, MS2US(40.0), 1);
|
|
// assertInjectorDownEvent("04@9", 9, MS2US(50.0), 0);
|
|
|
|
// {
|
|
// scheduling_s *ev = engine->executor.getForUnitTest(9);
|
|
// ASSERT_EQ( 5, getRevolutionCounter()) << "rev cnt#4#2";
|
|
// ASSERT_TRUE(ev == &engineConfiguration->fuelActuators[2].signalPair[1].signalTimerDown) << "down 50";
|
|
// }
|
|
|
|
|
|
ASSERT_EQ( 0, eth.executeActions()) << "exec#4";
|
|
|
|
|
|
eth.fireFall(20);
|
|
ASSERT_EQ( 8, engine->executor.size()) << "qs#2#1";
|
|
ASSERT_EQ( 5, getRevolutionCounter()) << "rev cnt#5";
|
|
// using old fuel schedule - but already wider pulses
|
|
// time...|-20.....|-10.....|0.......|10......|20......|30......|40......|
|
|
// inj #0 |........|.....###|########|.....###|########|........|........|
|
|
// inj #1 |.....###|########|.....###|########|........|........|........|
|
|
// assertInjectorUpEvent("5@0", 0, MS2US(-12.5), 1);
|
|
// assertInjectorDownEvent("5@1", 1, MS2US(-7.5), 0);
|
|
// assertInjectorUpEvent("5@2", 2, MS2US(-2.5), 0);
|
|
// assertInjectorDownEvent("5@3", 3, MS2US(0), 1);
|
|
// assertInjectorUpEvent("5@4", 4, MS2US(7.5), 1);
|
|
//
|
|
// assertInjectorDownEvent("5@4", 5, MS2US(10), 0);
|
|
// assertInjectorUpEvent("5@6", 6, MS2US(17.5), 0);
|
|
// assertInjectorDownEvent("5@7", 7, MS2US(20.0), 1);
|
|
// assertInjectorDownEvent("5@8", 8, MS2US(30.0), 0);
|
|
ASSERT_EQ( 3, eth.executeActions()) << "exec#5";
|
|
|
|
/**
|
|
* one more revolution
|
|
*/
|
|
|
|
t = &engine->injectionEvents;
|
|
|
|
assertInjectionEventBatch("#0", &t->elements[0], 0, 3, 0, 315);
|
|
assertInjectionEventBatch("#1__", &t->elements[1], 2, 1, 1, 495);
|
|
assertInjectionEventBatch("inj#2", &t->elements[2], 3, 0, 0, 153);
|
|
assertInjectionEventBatch("inj#3", &t->elements[3], 1, 2, 0, 333);
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
ASSERT_EQ( 5, engine->executor.size()) << "qs#02";
|
|
// assertInjectorUpEvent("6@0", 0, MS2US(-12.5), 1);
|
|
// assertInjectorDownEvent("6@1", 1, MS2US(-10.0), 0);
|
|
// assertInjectorUpEvent("6@2", 2, MS2US(-2.5), 0);
|
|
// assertInjectorDownEvent("6@3", 3, MS2US(0), 1);
|
|
// assertInjectorDownEvent("6@4", 4, MS2US(10.0), 0);
|
|
|
|
// so placing this 'executeAll' changes much?
|
|
ASSERT_EQ( 5, eth.executeActions()) << "exec#07";
|
|
ASSERT_EQ( 0, engine->executor.size()) << "qs#07";
|
|
// assertInjectorDownEvent("26@0", 0, MS2US(10.0), 0);
|
|
|
|
eth.firePrimaryTriggerRise();
|
|
ASSERT_EQ( 4, engine->executor.size()) << "qs#2#2";
|
|
ASSERT_EQ( 6, getRevolutionCounter()) << "rev cnt6";
|
|
// time...|-20.....|-10.....|0.......|10......|20......|30......|40......|
|
|
// inj #0 |########|.....###|########|....####|........|........|........|
|
|
// inj #1 |.....###|########|.....###|########|........|........|........|
|
|
// assertInjectorDownEvent("06@5", 5, MS2US(30.0), 0);
|
|
// assertInjectorUpEvent("06@6", 6, MS2US(37.5), 0);
|
|
// assertInjectorDownEvent("06@7", 7, MS2US(40.0), 1);
|
|
|
|
ASSERT_EQ( 0, eth.executeActions()) << "exec#7";
|
|
|
|
assertInjectors("#1_ij_", 0, 0);
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
|
|
// time...|-20.....|-10.....|0.......|10......|20......|30......|40......|
|
|
// inj #0 |########|.......#|........|........|........|........|........|
|
|
// inj #1 |....####|########|........|........|........|........|........|
|
|
ASSERT_EQ( 4, engine->executor.size()) << "qs#022";
|
|
// assertInjectorUpEvent("7@0", 0, MS2US(-12.5), 1);
|
|
// assertInjectorDownEvent("7@1", 1, MS2US(-10.0), 0);
|
|
// assertInjectorUpEvent("7@2", 2, MS2US(-2.5), 0);
|
|
// assertInjectorDownEvent("7@3", 3, MS2US(0), 1);
|
|
// assertInjectorDownEvent("7@4", 4, MS2US(10), 0);
|
|
//// assertInjectorDownEvent("i7@5", 5, MS2US(20.0), 0);
|
|
//// assertInjectorUpEvent("7@6", 6, MS2US(17.5), 0);
|
|
//// assertInjectorDownEvent("7@7", 7, MS2US(20), 1);
|
|
// // todo index 8
|
|
|
|
ASSERT_EQ( 3, eth.executeActions()) << "executed #06";
|
|
assertInjectors("#4", 1, 0);
|
|
ASSERT_EQ( 1, engine->executor.size()) << "qs#06";
|
|
eth.assertInjectorDownEvent("17@0", 0, MS2US(10), 0);
|
|
// assertInjectorDownEvent("17@1", 1, MS2US(10.0), 0);
|
|
// assertInjectorUpEvent("17@2", 2, MS2US(17.5), 0);
|
|
// assertInjectorDownEvent("17@3", 3, MS2US(20), 1);
|
|
// todo index 4
|
|
|
|
eth.firePrimaryTriggerFall();
|
|
|
|
ASSERT_EQ( 5, engine->executor.size()) << "qs#3";
|
|
ASSERT_EQ( 6, getRevolutionCounter()) << "rev cnt6";
|
|
ASSERT_EQ( 0, eth.executeActions()) << "executed #6";
|
|
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
ASSERT_EQ( 4, eth.executeActions()) << "executed #06";
|
|
ASSERT_EQ( 1, engine->executor.size()) << "qs#06";
|
|
assertInjectors("inj#2", 1, 0);
|
|
|
|
eth.firePrimaryTriggerRise();
|
|
ASSERT_EQ( 5, engine->executor.size()) << "Queue.size#03";
|
|
|
|
eth.assertInjectorUpEvent("07@0", 0, MS2US(7.5), 3);
|
|
eth.assertInjectorDownEvent("07@1", 1, MS2US(10), 2);
|
|
eth.assertInjectorUpEvent("07@2", 2, MS2US(17.5), 0);
|
|
eth.assertInjectorDownEvent("07@3", 3, MS2US(20), 3);
|
|
eth.assertInjectorDownEvent("07@4", 4, MS2US(30), 0);
|
|
// assertInjectorDownEvent("07@5", 5, MS2US(30), 0);
|
|
// assertInjectorUpEvent("07@6", 6, MS2US(37.5), 0);
|
|
// assertInjectorDownEvent("07@7", 7, MS2US(40), 1);
|
|
// assertInjectorDownEvent("07@8", 8, MS2US(50), 0);
|
|
|
|
ASSERT_EQ( 0, eth.executeActions()) << "executeAll#3";
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
ASSERT_EQ( 4, eth.executeActions()) << "executeAll#4";
|
|
|
|
t = &engine->injectionEvents;
|
|
|
|
assertInjectionEventBatch("#0#", &t->elements[0], 0, 3, 0, 135 + 180);
|
|
assertInjectionEventBatch("#1#", &t->elements[1], 2, 1, 1, 135 + 360);
|
|
assertInjectionEventBatch("#2#", &t->elements[2], 3, 0, 1, 135 + 540);
|
|
assertInjectionEventBatch("#3#", &t->elements[3], 1, 2, 0, 135);
|
|
|
|
engine->engineState.injectionDuration = 17.5;
|
|
// Injection duration of 17.5ms
|
|
MockInjectorModel2 im2;
|
|
EXPECT_CALL(im2, getInjectionDuration(_)).WillRepeatedly(Return(17.5f));
|
|
engine->module<InjectorModelPrimary>().set(&im2);
|
|
|
|
// 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(round(Sensor::getOrZero(SensorType::Rpm))));
|
|
|
|
|
|
assertInjectionEventBatch("#03", &t->elements[0], 0, 3, 0, 315);
|
|
|
|
|
|
ASSERT_EQ( 1, enginePins.injectors[0].currentLogicValue) << "inj#0";
|
|
|
|
ASSERT_EQ( 1, engine->executor.size()) << "Queue.size#04";
|
|
eth.assertInjectorDownEvent("08@0", 0, MS2US(10), 0);
|
|
// assertInjectorDownEvent("08@1", 1, MS2US(10), 0);
|
|
// assertInjectorUpEvent("08@2", 2, MS2US(17.5), 0);
|
|
// assertInjectorDownEvent("08@3", 3, MS2US(20), 1);
|
|
// assertInjectorDownEvent("08@4", 4, MS2US(30), 0);
|
|
|
|
eth.firePrimaryTriggerFall();
|
|
|
|
|
|
eth.executeActions();
|
|
eth.fireRise(20);
|
|
ASSERT_EQ(9, engine->executor.size()) << "Queue.size#05";
|
|
eth.executeActions();
|
|
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
eth.executeActions();
|
|
eth.firePrimaryTriggerRise();
|
|
|
|
t = &engine->injectionEvents;
|
|
|
|
assertInjectionEventBatch("#00", &t->elements[0], 0, 3, 0, 225); // 87.5 duty cycle
|
|
assertInjectionEventBatch("#10", &t->elements[1], 2, 1, 1, 45 + 360);
|
|
assertInjectionEventBatch("#20", &t->elements[2], 3, 0, 1, 225 + 360);
|
|
assertInjectionEventBatch("#30", &t->elements[3], 1, 2, 0, 45);
|
|
|
|
// todo: what's what? a mix of new something and old something?
|
|
ASSERT_EQ(6, engine->executor.size()) << "qs#5";
|
|
// assertInjectorDownEvent("8@0", 0, MS2US(5.0), 1);
|
|
// assertInjectorUpEvent("8@1", 1, MS2US(7.5), 1);
|
|
// assertInjectorDownEvent("8@2", 2, MS2US(15.0), 0);
|
|
// assertInjectorUpEvent("8@3", 3, MS2US(17.5), 0);
|
|
// assertInjectorDownEvent("8@4", 4, MS2US(25), 1);
|
|
// assertInjectorDownEvent("8@5", 5, MS2US(35), 0);
|
|
//// assertInjectorDownEvent("8@6", 6, MS2US(35), 0);
|
|
//// assertInjectorUpEvent("8@7", 7, MS2US(37.5), 0);
|
|
//// assertInjectorDownEvent("8@8", 8, MS2US(45), 1);
|
|
//// assertInjectorDownEvent("8@9", 9, MS2US(55), 0);
|
|
|
|
ASSERT_EQ( 0, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testFuelSchedulerBug299smallAndMedium";
|
|
}
|
|
|
|
void setInjectionMode(int value) {
|
|
engineConfiguration->injectionMode = (injection_mode_e) value;
|
|
incrementGlobalConfigurationVersion();
|
|
}
|
|
|
|
TEST(big, testFuelSchedulerBug299smallAndMedium) {
|
|
doTestFuelSchedulerBug299smallAndMedium(0);
|
|
doTestFuelSchedulerBug299smallAndMedium(1000);
|
|
}
|
|
|
|
TEST(big, testTwoWireBatch) {
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
setTable(config->injectionPhase, -180.0f);
|
|
setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð);
|
|
EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _))
|
|
.WillRepeatedly(Return(AirmassResult{0.1008f, 50.0f}));
|
|
|
|
engineConfiguration->injectionMode = IM_BATCH;
|
|
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
// still no RPM since need to cycles measure cycle duration
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
eth.executeActions();
|
|
|
|
/**
|
|
* Trigger up - scheduling fuel for full engine cycle
|
|
*/
|
|
eth.fireRise(20);
|
|
|
|
FuelSchedule * t = &engine->injectionEvents;
|
|
|
|
assertInjectionEventBatch("#0", &t->elements[0], 0, 3, 1, 153 + 360); // Cyl 1 and 4
|
|
assertInjectionEventBatch("#1_i_@", &t->elements[1], 2, 1, 1, 153 + 540); // Cyl 3 and 2
|
|
assertInjectionEventBatch("#2@", &t->elements[2], 3, 0, 0, 153); // Cyl 4 and 1
|
|
assertInjectionEventBatch("inj#3@", &t->elements[3], 1, 2, 0, 153 + 180); // Cyl 2 and 3
|
|
}
|
|
|
|
TEST(big, testSequential) {
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
setTable(config->injectionPhase, -180.0f);
|
|
EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _))
|
|
.WillRepeatedly(Return(AirmassResult{0.1008f, 50.0f}));
|
|
|
|
setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð);
|
|
|
|
engineConfiguration->injectionMode = IM_SEQUENTIAL;
|
|
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
// still no RPM since need to cycles measure cycle duration
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
eth.executeActions();
|
|
|
|
/**
|
|
* Trigger up - scheduling fuel for full engine cycle
|
|
*/
|
|
eth.fireRise(20);
|
|
|
|
FuelSchedule * t = &engine->injectionEvents;
|
|
|
|
assertInjectionEvent("#0", &t->elements[0], 0, 1, 126 + 360); // Cyl 1
|
|
assertInjectionEvent("#1_i_@", &t->elements[1], 2, 1, 126 + 540); // Cyl 3
|
|
assertInjectionEvent("#2@", &t->elements[2], 3, 0, 126); // Cyl 4
|
|
assertInjectionEvent("inj#3@", &t->elements[3], 1, 0, 126 + 180); // Cyl 2
|
|
}
|
|
|
|
TEST(big, testBatch) {
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
setTable(config->injectionPhase, -180.0f);
|
|
EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _))
|
|
.WillRepeatedly(Return(AirmassResult{0.1008f, 50.0f}));
|
|
|
|
setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð);
|
|
|
|
engineConfiguration->injectionMode = IM_BATCH;
|
|
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
// still no RPM since need to cycles measure cycle duration
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
eth.executeActions();
|
|
|
|
/**
|
|
* Trigger up - scheduling fuel for full engine cycle
|
|
*/
|
|
eth.fireRise(20);
|
|
|
|
FuelSchedule * t = &engine->injectionEvents;
|
|
|
|
assertInjectionEventBatch("#0", &t->elements[0], 0, 3, 1, 153 + 360); // Cyl 1 + 4
|
|
assertInjectionEventBatch("#1_i_@", &t->elements[1], 2, 1, 1, 153 + 540); // Cyl 3 + 2
|
|
assertInjectionEventBatch("#2@", &t->elements[2], 3, 0, 0, 153); // Cyl 4 + 1
|
|
assertInjectionEventBatch("inj#3@", &t->elements[3], 1, 2, 0, 153 + 180); // Cyl 2 + 3
|
|
}
|
|
|
|
TEST(big, testSinglePoint) {
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
engineConfiguration->hpfpCamLobes = 0;
|
|
setTable(config->injectionPhase, -180.0f);
|
|
EXPECT_CALL(*eth.mockAirmass, getAirmass(_, _))
|
|
.WillRepeatedly(Return(AirmassResult{0.1008f, 50.0f}));
|
|
|
|
setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð);
|
|
|
|
engineConfiguration->injectionMode = IM_SINGLE_POINT;
|
|
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
// still no RPM since need to cycles measure cycle duration
|
|
eth.fireTriggerEventsWithDuration(20);
|
|
eth.executeActions();
|
|
|
|
/**
|
|
* Trigger up - scheduling fuel for full engine cycle
|
|
*/
|
|
eth.fireRise(20);
|
|
|
|
FuelSchedule * t = &engine->injectionEvents;
|
|
|
|
assertInjectionEvent("#0", &t->elements[0], 0, 1, 126 + 360); // Cyl 1
|
|
assertInjectionEvent("#1_i_@", &t->elements[1], 0, 1, 126 + 540); // Cyl 3
|
|
assertInjectionEvent("#2@", &t->elements[2], 0, 0, 126); // Cyl 4
|
|
assertInjectionEvent("inj#3@", &t->elements[3], 0, 0, 126 + 180); // Cyl 2
|
|
}
|
|
|
|
TEST(big, testFuelSchedulerBug299smallAndLarge) {
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
engineConfiguration->hpfpCamLobes = 0;
|
|
setTable(config->injectionPhase, -180.0f);
|
|
engineConfiguration->isFasterEngineSpinUpEnabled = false;
|
|
engine->tdcMarkEnabled = false;
|
|
setTestBug299(ð);
|
|
ASSERT_EQ( 4, engine->executor.size()) << "Lqs#0";
|
|
|
|
engine->periodicFastCallback();
|
|
|
|
engine->engineState.injectionDuration = 17.5f;
|
|
// Injection duration of 17.5ms
|
|
MockInjectorModel2 im;
|
|
EXPECT_CALL(im, getInjectionDuration(_)).WillRepeatedly(Return(17.5f));
|
|
engine->module<InjectorModelPrimary>().set(&im);
|
|
|
|
assertEqualsM("Lduty for maf=3", 87.5, getInjectorDutyCycle(round(Sensor::getOrZero(SensorType::Rpm))));
|
|
|
|
|
|
ASSERT_EQ( 4, engine->executor.size()) << "Lqs#1";
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
eth.executeActions();
|
|
|
|
// injector #1 is low before the test
|
|
ASSERT_FALSE(enginePins.injectors[0].currentLogicValue) << "injector@0";
|
|
|
|
eth.firePrimaryTriggerRise();
|
|
|
|
// time...|0.......|10......|20......|30......|40......|50......|60......|
|
|
// inj #0 |########|########|########|.....###|########|........|........|
|
|
// inj #1 |..######|########|....####|########|........|........|........|
|
|
ASSERT_EQ( 6, engine->executor.size()) << "Lqs#4";
|
|
eth.assertInjectorUpEvent("L04@0", 0, MS2US(8.5), 2);
|
|
eth.assertInjectorUpEvent("L04@1", 1, MS2US(12.5), 0);
|
|
// special overlapping injection is merged with one of the scheduled injections
|
|
eth.assertInjectorUpEvent("L04@2", 2, MS2US(18.5), 3);
|
|
|
|
eth.assertInjectorDownEvent("L04@3", 3, MS2US(26), 2);
|
|
eth.assertInjectorDownEvent("L04@4", 4, MS2US(30), 0);
|
|
|
|
// assertInjectorDownEvent("L04@5", 5, MS2US(30), 0);
|
|
// assertInjectorUpEvent("L04@6", 6, MS2US(32.5), 0);
|
|
// assertInjectorDownEvent("L04@7", 7, MS2US(40.0), 1);
|
|
// assertInjectorDownEvent("L04@8", 8, MS2US(50.0), 0);
|
|
|
|
|
|
engine->executor.executeAll(eth.getTimeNowUs() + 1);
|
|
// injector goes high...
|
|
ASSERT_FALSE(enginePins.injectors[0].currentLogicValue) << "injector@1";
|
|
|
|
engine->executor.executeAll(eth.getTimeNowUs() + MS2US(17.5) + 1);
|
|
// injector does not go low too soon, that's a feature :)
|
|
ASSERT_TRUE(enginePins.injectors[0].currentLogicValue) << "injector@2";
|
|
|
|
|
|
eth.fireFall(20);
|
|
|
|
ASSERT_EQ( 6, engine->executor.size()) << "Lqs#04";
|
|
eth.assertInjectorUpEvent("L015@0", 0, MS2US(-1.5), 3);
|
|
eth.assertInjectorUpEvent("L015@1", 1, MS2US(2.5), 1);
|
|
eth.assertInjectorDownEvent("L015@2", 2, MS2US(6), 2);
|
|
eth.assertInjectorDownEvent("L015@3", 3, MS2US(10), 0);
|
|
eth.assertInjectorDownEvent("L015@4", 4, MS2US(16), 3);
|
|
//todo assertInjectorDownEvent("L015@5", 5, MS2US(30), 0);
|
|
|
|
|
|
engine->executor.executeAll(eth.getTimeNowUs() + MS2US(10) + 1);
|
|
// end of combined injection
|
|
ASSERT_FALSE(enginePins.injectors[0].currentLogicValue) << "injector@3";
|
|
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
eth.executeActions();
|
|
ASSERT_EQ( 0, engine->executor.size()) << "Lqs#04";
|
|
|
|
engine->periodicFastCallback();
|
|
|
|
// Injection duration of 2ms
|
|
engine->engineState.injectionDuration = 2.0f;
|
|
MockInjectorModel2 im2;
|
|
EXPECT_CALL(im2, getInjectionDuration(_)).WillRepeatedly(Return(2.0f));
|
|
engine->module<InjectorModelPrimary>().set(&im2);
|
|
|
|
ASSERT_EQ( 10, getInjectorDutyCycle(round(Sensor::getOrZero(SensorType::Rpm)))) << "Lduty for maf=3";
|
|
|
|
|
|
eth.firePrimaryTriggerRise();
|
|
|
|
//todoASSERT_EQ( 5, engine->executor.size()) << "Lqs#05";
|
|
//todo assertInjectorUpEvent("L016@0", 0, MS2US(8), 0);
|
|
//todo assertInjectorDownEvent("L016@1", 1, MS2US(10), 0);
|
|
//todo assertInjectorDownEvent("L016@2", 2, MS2US(10), 0);
|
|
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
eth.executeActions(); // issue here
|
|
eth.firePrimaryTriggerFall();
|
|
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
eth.executeActions();
|
|
eth.firePrimaryTriggerRise();
|
|
|
|
ASSERT_EQ( 4, engine->executor.size()) << "Lqs#5";
|
|
eth.assertInjectorUpEvent("L05@0", 0, MS2US(8), 2);
|
|
eth.assertInjectorDownEvent("L05@1", 1, MS2US(10), 2);
|
|
eth.assertInjectorUpEvent("L05@2", 2, MS2US(18), 3);
|
|
eth.assertInjectorDownEvent("L05@3", 3, MS2US(20), 3);
|
|
|
|
eth.moveTimeForwardUs(MS2US(20));
|
|
eth.executeActions();
|
|
ASSERT_EQ( 0, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#testFuelSchedulerBug299smallAndLarge";
|
|
}
|
|
|
|
TEST(big, testSparkReverseOrderBug319) {
|
|
printf("*************************************************** testSparkReverseOrderBug319 small to medium\r\n");
|
|
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
engineConfiguration->isFasterEngineSpinUpEnabled = false;
|
|
engine->tdcMarkEnabled = false;
|
|
|
|
engineConfiguration->isInjectionEnabled = false;
|
|
engineConfiguration->cylindersCount = 4;
|
|
engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS;
|
|
|
|
setConstantDwell(45);
|
|
|
|
engine->triggerCentral.syncAndReport(2, 0);
|
|
|
|
// this is needed to update injectorLag
|
|
engine->updateSlowSensors();
|
|
|
|
eth.setTriggerType(trigger_type_e::TT_HALF_MOON);
|
|
engine->periodicFastCallback();
|
|
|
|
setWholeTimingTable(0);
|
|
|
|
eth.fireRise(20);
|
|
eth.fireFall(20);
|
|
|
|
engine->triggerCentral.syncAndReport(2, 0);
|
|
|
|
eth.executeActions();
|
|
|
|
eth.fireRise(20);
|
|
eth.fireFall(20);
|
|
|
|
ASSERT_EQ( 3000, round(Sensor::getOrZero(SensorType::Rpm))) << "testSparkReverseOrderBug319: RPM";
|
|
|
|
|
|
ASSERT_EQ( 8, engine->executor.size()) << "testSparkReverseOrderBug319: queue size";
|
|
eth.executeActions();
|
|
printf("***************************************************\r\n");
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
/**
|
|
* here we throw scheduling logic off
|
|
*/
|
|
eth.fireFall(0.1); // executing new signal too early
|
|
eth.executeActions();
|
|
|
|
ASSERT_EQ( 1, enginePins.coils[3].outOfOrder) << "out-of-order #1";
|
|
|
|
|
|
eth.moveTimeForwardUs(MS2US(200)); // moving time forward to execute all pending actions
|
|
eth.executeActions();
|
|
|
|
ASSERT_EQ( 0, enginePins.coils[3].outOfOrder) << "out-of-order #2";
|
|
|
|
printf("*************************************************** now let's have a good engine cycle and confirm things work\r\n");
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
ASSERT_EQ( 545, round(Sensor::getOrZero(SensorType::Rpm))) << "RPM#2";
|
|
|
|
ASSERT_EQ( 0, enginePins.coils[3].outOfOrder) << "out-of-order #3";
|
|
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 1, enginePins.coils[3].outOfOrder) << "out-of-order #4";
|
|
|
|
printf("*************************************************** (rpm is back) now let's have a good engine cycle and confirm things work\r\n");
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
ASSERT_EQ( 3000, round(Sensor::getOrZero(SensorType::Rpm))) << "RPM#3";
|
|
|
|
ASSERT_EQ( 1, enginePins.coils[3].outOfOrder) << "out-of-order #5 on c4";
|
|
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 1, enginePins.coils[3].outOfOrder) << "out-of-order #6 on c4";
|
|
|
|
printf("*************************************************** (rpm is back 2) now let's have a good engine cycle and confirm things work\r\n");
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
ASSERT_EQ( 3000, round(Sensor::getOrZero(SensorType::Rpm))) << "RPM#4";
|
|
|
|
ASSERT_EQ( 1, enginePins.coils[3].outOfOrder) << "out-of-order #7";
|
|
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 0, enginePins.coils[3].outOfOrder) << "out-of-order #8";
|
|
ASSERT_EQ( 2, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#SparkReverseOrderBug319";
|
|
ASSERT_EQ(ObdCode::CUSTOM_DWELL_TOO_LONG, unitTestWarningCodeState.recentWarnings.get(0).Code) << "warning @0";
|
|
ASSERT_EQ(ObdCode::CUSTOM_OUT_OF_ORDER_COIL, unitTestWarningCodeState.recentWarnings.get(1).Code);
|
|
}
|
|
|
|
TEST(big, testMissedSpark299) {
|
|
printf("*************************************************** testMissedSpark299\r\n");
|
|
|
|
EngineTestHelper eth(engine_type_e::TEST_ENGINE);
|
|
engineConfiguration->ignitionMode = IM_WASTED_SPARK;
|
|
setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð);
|
|
engineConfiguration->isIgnitionEnabled = true;
|
|
engineConfiguration->isInjectionEnabled = false;
|
|
|
|
ASSERT_EQ( 0, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#0";
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 0, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#0";
|
|
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 1, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#1";
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 0, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#2";
|
|
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 1, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#3";
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
ASSERT_EQ( 1, eth.engine.triggerCentral.triggerState.currentCycle.current_index) << "ci#5";
|
|
|
|
|
|
printf("*************************************************** testMissedSpark299 start\r\n");
|
|
|
|
ASSERT_EQ(3000, Sensor::getOrZero(SensorType::Rpm));
|
|
|
|
setWholeTimingTable(3);
|
|
eth.engine.periodicFastCallback();
|
|
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
|
|
setWholeTimingTable(-5);
|
|
eth.engine.periodicFastCallback();
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
|
|
|
|
eth.fireRise(20);
|
|
eth.executeActions();
|
|
|
|
eth.fireFall(20);
|
|
eth.executeActions();
|
|
|
|
ASSERT_EQ( 0, unitTestWarningCodeState.recentWarnings.getCount()) << "warningCounter#1";
|
|
}
|