mirror of https://github.com/rusefi/rusefi-1.git
test
This commit is contained in:
parent
b2edd3a4f4
commit
9c736a2c3d
|
@ -36,7 +36,7 @@
|
|||
EXTERN_ENGINE;
|
||||
|
||||
fuel_Map3D_t fuelMap("fuel");
|
||||
static fuel_Map3D_t fuelPhaseMap("fl ph");
|
||||
fuel_Map3D_t fuelPhaseMap("fl ph");
|
||||
extern fuel_Map3D_t veMap;
|
||||
extern afr_Map3D_t afrMap;
|
||||
extern baroCorr_Map3D_t baroCorrMap;
|
||||
|
|
|
@ -111,6 +111,8 @@ public:
|
|||
void open();
|
||||
void close();
|
||||
|
||||
int8_t getOverlappingCounter() const { return overlappingCounter; }
|
||||
|
||||
// todo: re-implement this injectorIndex via address manipulation to reduce memory usage?
|
||||
int8_t injectorIndex;
|
||||
|
||||
|
|
|
@ -7,37 +7,103 @@
|
|||
|
||||
#include "engine_test_helper.h"
|
||||
|
||||
static void doRevolution(EngineTestHelper& eth, int periodMs) {
|
||||
float halfToothTime = (periodMs / 6.0f) / 2;
|
||||
|
||||
eth.fireRise(halfToothTime);
|
||||
eth.fireFall(halfToothTime);
|
||||
eth.fireRise(halfToothTime);
|
||||
eth.fireFall(halfToothTime);
|
||||
eth.fireRise(halfToothTime);
|
||||
eth.fireFall(halfToothTime);
|
||||
|
||||
// now missing tooth
|
||||
eth.fireRise(halfToothTime);
|
||||
eth.fireFall(3 * halfToothTime);
|
||||
|
||||
// This tooth is the sync point!
|
||||
eth.fireRise(halfToothTime);
|
||||
eth.fireFall(halfToothTime);
|
||||
}
|
||||
|
||||
// https://github.com/rusefi/rusefi/issues/1592
|
||||
TEST(fuelControl, transitionIssue1592) {
|
||||
|
||||
WITH_ENGINE_TEST_HELPER(TEST_ENGINE);
|
||||
setupSimpleTestEngineWithMafAndTT_ONE_trigger(ð, IM_SEQUENTIAL);
|
||||
|
||||
eth.fireTriggerEvents2(4 /* count */ , 600 /* ms */);
|
||||
// This is easiest to trip on a wheel that requires sync
|
||||
engineConfiguration->trigger.customTotalToothCount = 6;
|
||||
engineConfiguration->trigger.customSkippedToothCount = 1;
|
||||
eth.setTriggerType(TT_TOOTHED_WHEEL PASS_ENGINE_PARAMETER_SUFFIX);
|
||||
engineConfiguration->ambiguousOperationMode = FOUR_STROKE_CAM_SENSOR;
|
||||
engineConfiguration->isFasterEngineSpinUpEnabled = true;
|
||||
|
||||
ASSERT_EQ(CRANKING, engine->rpmCalculator.getState());
|
||||
ASSERT_EQ( 100, GET_RPM()) << "spinning-RPM#1";
|
||||
engineConfiguration->fuelAlgorithm = LM_ALPHA_N;
|
||||
|
||||
ASSERT_EQ(IM_SIMULTANEOUS, ENGINE(getCurrentInjectionMode(PASS_ENGINE_PARAMETER_SIGNATURE)));
|
||||
extern fuel_Map3D_t fuelMap;
|
||||
fuelMap.setAll(13);
|
||||
extern fuel_Map3D_t fuelPhaseMap;
|
||||
fuelPhaseMap.setAll(0);
|
||||
|
||||
engineConfiguration->globalTriggerAngleOffset = 20;
|
||||
|
||||
// Yes, this is a ton of fuel but it makes the repro easier
|
||||
engineConfiguration->cranking.baseFuel = 89;
|
||||
engineConfiguration->cranking.rpm = 500;
|
||||
|
||||
// Test the transition from batch cranking to sequential running
|
||||
engineConfiguration->crankingInjectionMode = IM_BATCH;
|
||||
engineConfiguration->twoWireBatchInjection = true;
|
||||
|
||||
|
||||
eth.fireRise(150);
|
||||
eth.fireFall(150);
|
||||
// First sync point will schedule cranking pulse since we're in "faster spin up" mode
|
||||
doRevolution(eth, 150);
|
||||
|
||||
eth.fireRise(150);
|
||||
eth.fireFall(150);
|
||||
{
|
||||
// Injector 2 should be scheduled to open then close
|
||||
void* inj2 = reinterpret_cast<void*>(&engine->injectionEvents.elements[1]);
|
||||
|
||||
eth.fireRise(150);
|
||||
eth.fireFall(150);
|
||||
ASSERT_EQ(engine->executor.size(), 2);
|
||||
|
||||
ASSERT_EQ( 400, GET_RPM()) << "running-RPM#1";
|
||||
|
||||
ASSERT_EQ(IM_SIMULTANEOUS, ENGINE(getCurrentInjectionMode(PASS_ENGINE_PARAMETER_SIGNATURE)));
|
||||
|
||||
|
||||
eth.writeEvents("transitionIssue1592.logicdata");
|
||||
// Check that the action is correct - we don't care about the timing necessarily
|
||||
auto sched_open = engine->executor.getForUnitTest(0);
|
||||
ASSERT_EQ(sched_open->action.getArgument(), inj2);
|
||||
ASSERT_EQ(sched_open->action.getCallback(), &turnInjectionPinHigh);
|
||||
|
||||
auto sched_close = engine->executor.getForUnitTest(1);
|
||||
// Next action should be closing the same injector
|
||||
ASSERT_EQ(sched_close->action.getArgument(), inj2);
|
||||
ASSERT_EQ(sched_close->action.getCallback(), &turnInjectionPinLow);
|
||||
}
|
||||
|
||||
// Execute the first of those two events - the injector opens, but doesn't yet close.
|
||||
engine->executor.executeAll(getTimeNowUs() + MS2US(35));
|
||||
|
||||
// Check that queue got shorter, and overlap counters were incremented on injectors 2/3 (batch mode, remember?)
|
||||
{
|
||||
// Check that it was exec'd
|
||||
ASSERT_EQ(engine->executor.size(), 1);
|
||||
|
||||
// Injectors 2/3 should currently be open
|
||||
EXPECT_EQ(enginePins.injectors[0].getOverlappingCounter(), 0);
|
||||
EXPECT_EQ(enginePins.injectors[1].getOverlappingCounter(), 1);
|
||||
EXPECT_EQ(enginePins.injectors[2].getOverlappingCounter(), 1);
|
||||
EXPECT_EQ(enginePins.injectors[3].getOverlappingCounter(), 0);
|
||||
}
|
||||
|
||||
// Second sync point will transition to running
|
||||
// This needs to reset overlapping state as it may reschedule injector openings
|
||||
doRevolution(eth, 150);
|
||||
|
||||
// Injectors should all be closed immediately after mode change
|
||||
EXPECT_EQ(enginePins.injectors[0].getOverlappingCounter(), 0);
|
||||
|
||||
// !!!!!!!!! BUG !!!!!!!!!!!!!!!
|
||||
// These next two should be equal to 0, not 1
|
||||
EXPECT_EQ(enginePins.injectors[1].getOverlappingCounter(), 1);
|
||||
EXPECT_EQ(enginePins.injectors[2].getOverlappingCounter(), 1);
|
||||
// !!!!!!!!! BUG !!!!!!!!!!!!!!!
|
||||
|
||||
EXPECT_EQ(enginePins.injectors[3].getOverlappingCounter(), 0);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue