Merge branch 'master' into noisy-trigger-3

This commit is contained in:
Matthew Kennedy 2024-04-12 12:13:36 -07:00
commit 5da836b35d
2 changed files with 2 additions and 2 deletions

View File

@ -57,7 +57,7 @@ TEST(cranking, testFasterEngineSpinningUp) {
eth.assertEvent5("inj end#1", 1, (void*)endSimultaneousInjection, 100000);
// skip the rest of the cycle
eth.fireFall(200);
eth.moveTimeForwardUs(MS2US(200));
// now clear and advance more
eth.executeActions();

View File

@ -36,7 +36,7 @@ static void testNoOverdwell(const char* file, bool instantRpm) {
} else {
auto actualDwell = 1e-3 * NT2USF(getTimeNowNt() - coilStartTimes[event->cylinderNumber]);
EXPECT_LT(actualDwell, 50) << "Overdwell on cylinder " << (int)event->cylinderNumber;
EXPECT_LT(actualDwell, 50) << "Overdwell on cylinder " << (int)event->cylinderNumber << " of " << actualDwell << " ms";
}
};