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

Question: something strange trigger errors #662 

unit test progress
This commit is contained in:
rusefi 2019-01-12 21:36:50 -05:00
parent a24566abc5
commit 85a4307d04
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/algo/engine.h
View File

@ -145,7 +145,7 @@ public:
int lastErrorCode; int lastErrorCode;
efitimesec_t timeOfPreviousWarning; efitimesec_t timeOfPreviousWarning;
// todo: we need a way to post multiple recent warnings into TS // todo: we need a way to post multiple recent warnings into TS
cyclic_buffer<int, 8> recentWarning; cyclic_buffer<int, 8> recentWarnings;
}; };
class EngineState { class EngineState {

6
firmware/controllers/algo/engine2.cpp
View File

@ -44,14 +44,14 @@ void WarningCodeState::clear() {
warningCounter = 0; warningCounter = 0;
lastErrorCode = 0; lastErrorCode = 0;
timeOfPreviousWarning = -10; timeOfPreviousWarning = -10;
recentWarning.clear(); recentWarnings.clear();
} }
void WarningCodeState::addWarningCode(obd_code_e code) { void WarningCodeState::addWarningCode(obd_code_e code) {
warningCounter++; warningCounter++;
lastErrorCode = code; lastErrorCode = code;
if (!recentWarning.contains(code)) { if (!recentWarnings.contains(code)) {
recentWarning.add((int)code); recentWarnings.add((int)code);
} }
} }

7
unit_tests/main.cpp
View File

@ -61,18 +61,11 @@ GTEST_API_ int main(int argc, char **argv) {
// printTriggerDebug = true; // printTriggerDebug = true;
testMisc(); testMisc();
testDifferentInjectionModes();
/** /**
* PID * PID
*/ */
testPidAuto(); testPidAuto();
/**
* Larger-scale engine control
*/
testSparkReverseOrderBug319();
testFuelSchedulerBug299smallAndLarge();
testFuelSchedulerBug299smallAndMedium();
testLogicExpressions(); // fsio testLogicExpressions(); // fsio
testPlainCrankingWithoutAdvancedFeatures(); testPlainCrankingWithoutAdvancedFeatures();
testStartOfCrankingPrimingPulse(); testStartOfCrankingPrimingPulse();

26
unit_tests/tests/test_trigger_decoder.cpp
View File

@ -746,7 +746,7 @@ static void assertInjectors(const char *msg, int value0, int value1) {
assertEqualsM4(msg, "inj#1", value1, enginePins.injectors[1].currentLogicValue); assertEqualsM4(msg, "inj#1", value1, enginePins.injectors[1].currentLogicValue);
} }
void testFuelSchedulerBug299smallAndMedium(void) { TEST(big, testFuelSchedulerBug299smallAndMedium) {
printf("*************************************************** testFuelSchedulerBug299 small to medium\r\n"); printf("*************************************************** testFuelSchedulerBug299 small to medium\r\n");
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
@ -988,6 +988,9 @@ void testFuelSchedulerBug299smallAndMedium(void) {
mockMapValue = 0; mockMapValue = 0;
testMafValue = 0; testMafValue = 0;
assertEqualsM("warningCounter#testFuelSchedulerBug299smallAndMedium", 2, unitTestWarningCodeState.recentWarnings.getCount());
ASSERT_EQ(CUSTOM_SYNC_COUNT_MISMATCH, unitTestWarningCodeState.recentWarnings.get(0));
ASSERT_EQ(CUSTOM_OBD_SKIPPED_FUEL, unitTestWarningCodeState.recentWarnings.get(1));
} }
static void setInjectionMode(int value DECLARE_ENGINE_PARAMETER_SUFFIX) { static void setInjectionMode(int value DECLARE_ENGINE_PARAMETER_SUFFIX) {
@ -995,8 +998,7 @@ static void setInjectionMode(int value DECLARE_ENGINE_PARAMETER_SUFFIX) {
incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE); incrementGlobalConfigurationVersion(PASS_ENGINE_PARAMETER_SIGNATURE);
} }
TEST(big, testDifferentInjectionModes) {
void testDifferentInjectionModes(void) {
printf("*************************************************** testDifferentInjectionModes\r\n"); printf("*************************************************** testDifferentInjectionModes\r\n");
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
@ -1025,9 +1027,10 @@ void testDifferentInjectionModes(void) {
setInjectionMode((int)IM_SINGLE_POINT PASS_ENGINE_PARAMETER_SUFFIX); setInjectionMode((int)IM_SINGLE_POINT PASS_ENGINE_PARAMETER_SUFFIX);
engine->periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE); engine->periodicFastCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
assertEqualsM("injection while IM_SINGLE_POINT", 40, engine->injectionDuration); assertEqualsM("injection while IM_SINGLE_POINT", 40, engine->injectionDuration);
assertEqualsM("warningCounter#testDifferentInjectionModes", 1, unitTestWarningCodeState.recentWarnings.getCount());
} }
void testFuelSchedulerBug299smallAndLarge(void) { TEST(big, testFuelSchedulerBug299smallAndLarge) {
printf("*************************************************** testFuelSchedulerBug299 small to large\r\n"); printf("*************************************************** testFuelSchedulerBug299 small to large\r\n");
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
@ -1135,9 +1138,12 @@ void testFuelSchedulerBug299smallAndLarge(void) {
eth.moveTimeForwardUs(MS2US(20)); eth.moveTimeForwardUs(MS2US(20));
eth.executeActions(); eth.executeActions();
assertEqualsM("warningCounter#testFuelSchedulerBug299smallAndLarge", 2, unitTestWarningCodeState.recentWarnings.getCount());
ASSERT_EQ(CUSTOM_SYNC_COUNT_MISMATCH, unitTestWarningCodeState.recentWarnings.get(0));
ASSERT_EQ(CUSTOM_OBD_SKIPPED_FUEL, unitTestWarningCodeState.recentWarnings.get(1));
} }
void testSparkReverseOrderBug319(void) { TEST(big, testSparkReverseOrderBug319) {
printf("*************************************************** testSparkReverseOrderBug319 small to medium\r\n"); printf("*************************************************** testSparkReverseOrderBug319 small to medium\r\n");
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
@ -1237,6 +1243,10 @@ void testSparkReverseOrderBug319(void) {
eth.fireFall(20); eth.fireFall(20);
eth.executeActions(); eth.executeActions();
assertEqualsM("out-of-order #8", 0, enginePins.coils[3].outOfOrder); assertEqualsM("out-of-order #8", 0, enginePins.coils[3].outOfOrder);
assertEqualsM("warningCounter#SparkReverseOrderBug319", 3, unitTestWarningCodeState.recentWarnings.getCount());
ASSERT_EQ(CUSTOM_SYNC_COUNT_MISMATCH, unitTestWarningCodeState.recentWarnings.get(0));
ASSERT_EQ(CUSTOM_DWELL_TOO_LONG, unitTestWarningCodeState.recentWarnings.get(1));
ASSERT_EQ(CUSTOM_OUT_OF_ORDER_COIL, unitTestWarningCodeState.recentWarnings.get(2));
} }
TEST(big, testMissedSpark299) { TEST(big, testMissedSpark299) {
@ -1250,7 +1260,7 @@ TEST(big, testMissedSpark299) {
engineConfiguration->isIgnitionEnabled = true; engineConfiguration->isIgnitionEnabled = true;
engineConfiguration->isInjectionEnabled = false; engineConfiguration->isInjectionEnabled = false;
assertEqualsM("warningCounter#0", 0, unitTestWarningCodeState.warningCounter); assertEqualsM("warningCounter#0", 0, unitTestWarningCodeState.recentWarnings.getCount());
eth.fireRise(20); eth.fireRise(20);
@ -1320,6 +1330,6 @@ TEST(big, testMissedSpark299) {
eth.fireFall(20); eth.fireFall(20);
eth.executeActions(); eth.executeActions();
assertEqualsM("warningCounter#1", 1, unitTestWarningCodeState.warningCounter); assertEqualsM("warningCounter#1", 1, unitTestWarningCodeState.recentWarnings.getCount());
assertEqualsM("warningCounter code", CUSTOM_SYNC_COUNT_MISMATCH, unitTestWarningCodeState.recentWarning.get(0)); assertEqualsM("warningCounter code", CUSTOM_SYNC_COUNT_MISMATCH, unitTestWarningCodeState.recentWarnings.get(0));
} }

4
unit_tests/tests/test_trigger_decoder.h
View File

@ -11,10 +11,6 @@
#include "engine_test_helper.h" #include "engine_test_helper.h"
void testTriggerDecoder(void); void testTriggerDecoder(void);
void testFuelSchedulerBug299smallAndMedium(void);
void testFuelSchedulerBug299smallAndLarge(void);
void testDifferentInjectionModes(void);
void testSparkReverseOrderBug319(void);
void testRpmCalculator(void); void testRpmCalculator(void);
void testStartupFuelPumping(void); void testStartupFuelPumping(void);
void test1995FordInline6TriggerDecoder(void); void test1995FordInline6TriggerDecoder(void);