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

only: reducing magic numbers in unit tests

This commit is contained in:
Andrey 2024-02-28 20:17:58 -05:00
parent 6ca1eb6f39
commit 389c6e64e9
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/ford_1995_inline_6.cpp
View File

@ -31,7 +31,7 @@ void setFordInline6() {
/**
* 0.5ms dwell time just to be sure it would fit within camshaft revolution, dwell is not controlled by us anyway
*/
setConstantDwell(0.5);
setConstantDwell(FORD_INLINE_DWELL);
/**
* We treat the trigger as 6/0 toothed wheel
@ -45,7 +45,7 @@ void setFordInline6() {
engineConfiguration->clt.config = {-10, 60, 120, 160310, 7700, 1180, 2700};
engineConfiguration->iat.config = {-10, 60, 120, 160310, 7700, 1180, 2700};
// 12ch analog board pinout:
// input channel 3 is PA7, that's ADC7
// input channel 5 is PA4, that's ADC4

3
firmware/config/engines/ford_1995_inline_6.h
View File

@ -9,4 +9,7 @@
#include "engine_configuration.h"
// technical debt? weird number but unit tests currently depend on it
#define FORD_INLINE_DWELL 0.5
void setFordInline6();

6
unit_tests/test-framework/engine_test_helper.cpp
View File

@ -32,7 +32,7 @@ extern int minCrankingRpm;
EngineTestHelperBase::EngineTestHelperBase(Engine * eng, engine_configuration_s * econfig, persistent_config_s * pers) {
// todo: make this not a global variable, we need currentTimeProvider interface on engine
timeNowUs = 0;
timeNowUs = 0;
minCrankingRpm = 0;
EnableToothLogger();
if (engine || engineConfiguration || config) {
@ -306,6 +306,10 @@ scheduling_s * EngineTestHelper::assertEvent5(const char *msg, int index, void *
return event;
}
angle_t EngineTestHelper::timeToAngle(float timeMs) {
return MS2US(timeMs) / engine.rpmCalculator.oneDegreeUs;
}
const AngleBasedEvent * EngineTestHelper::assertTriggerEvent(const char *msg,
int index, AngleBasedEvent *expected,
void *callback,

5
unit_tests/test-framework/engine_test_helper.h
View File

@ -36,6 +36,9 @@ public:
EngineTestHelper(engine_type_e engineType, configuration_callback_t boardCallback, const std::unordered_map<SensorType, float>& sensorValues);
~EngineTestHelper();
// convert ms time to angle at current RPM
angle_t timeToAngle(float timeMs);
warningBuffer_t *recentWarnings();
int getWarningCounter();
@ -90,7 +93,7 @@ public:
void assertInjectorUpEvent(const char *msg, int eventIndex, efitimeus_t momentX, long injectorIndex);
void assertInjectorDownEvent(const char *msg, int eventIndex, efitimeus_t momentX, long injectorIndex);
// todo: open question if this is worth a helper method or should be inlined?
void assertRpm(int expectedRpm, const char *msg);
void assertRpm(int expectedRpm, const char *msg = "RPM");
int executeActions();
void moveTimeForwardMs(float deltaTimeMs);

26
unit_tests/tests/trigger/test_trigger_decoder.cpp
View File

@ -226,7 +226,7 @@ TEST(misc, testRpmCalculator) {
int start = eth.getTimeNowUs();
ASSERT_EQ( 485000, start) << "start value";
eth.engine.periodicFastCallback();
engine->periodicFastCallback();
ASSERT_NEAR(engine->engineState.timingAdvance[0], 707, 0.1f);
@ -235,16 +235,16 @@ TEST(misc, testRpmCalculator) {
assertEqualsM("injection angle", 499.095, ie0->injectionStartAngle);
eth.firePrimaryTriggerRise();
ASSERT_EQ(1500, Sensor::getOrZero(SensorType::Rpm));
eth.assertRpm(1500);
assertEqualsM("dwell", 4.5, engine->ignitionState.dwellDurationAngle);
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, eth.engine.triggerCentral.triggerState.getCurrentIndex()) << "index #2";
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);
@ -265,7 +265,7 @@ TEST(misc, testRpmCalculator) {
eth.fireFall(5);
eth.fireRise(5);
eth.fireFall(5);
ASSERT_EQ( 2, eth.engine.triggerCentral.triggerState.getCurrentIndex()) << "index #3";
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);
@ -287,12 +287,12 @@ TEST(misc, testRpmCalculator) {
eth.fireRise(5);
ASSERT_EQ( 4, engine->executor.size()) << "queue size 4.3";
assertEqualsM("dwell", 4.5, eth.engine.ignitionState.dwellDurationAngle);
assertEqualsM("fuel #3", 4.5450, eth.engine.engineState.injectionDuration);
assertEqualsM("dwell", 4.5, engine->ignitionState.dwellDurationAngle);
assertEqualsM("fuel #3", 4.5450, engine->engineState.injectionDuration);
ASSERT_EQ(1500, Sensor::getOrZero(SensorType::Rpm));
ASSERT_EQ( 6, eth.engine.triggerCentral.triggerState.getCurrentIndex()) << "index #4";
ASSERT_EQ( 6, engine->triggerCentral.triggerState.getCurrentIndex()) << "index #4";
ASSERT_EQ( 4, engine->executor.size()) << "queue size 4";
engine->executor.clear();
@ -1019,7 +1019,7 @@ TEST(big, testSparkReverseOrderBug319) {
engine->updateSlowSensors();
eth.setTriggerType(trigger_type_e::TT_HALF_MOON);
eth.engine.periodicFastCallback();
engine->periodicFastCallback();
setWholeTimingTable(0);
@ -1119,22 +1119,22 @@ TEST(big, testMissedSpark299) {
eth.fireRise(20);
eth.executeActions();
ASSERT_EQ( 0, eth.engine.triggerCentral.triggerState.currentCycle.current_index) << "ci#0";
ASSERT_EQ( 0, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#0";
eth.fireFall(20);
eth.executeActions();
ASSERT_EQ( 1, eth.engine.triggerCentral.triggerState.currentCycle.current_index) << "ci#1";
ASSERT_EQ( 1, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#1";
eth.fireRise(20);
eth.executeActions();
ASSERT_EQ( 0, eth.engine.triggerCentral.triggerState.currentCycle.current_index) << "ci#2";
ASSERT_EQ( 0, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#2";
eth.fireFall(20);
eth.executeActions();
ASSERT_EQ( 1, eth.engine.triggerCentral.triggerState.currentCycle.current_index) << "ci#3";
ASSERT_EQ( 1, engine->triggerCentral.triggerState.currentCycle.current_index) << "ci#3";
eth.fireRise(20);