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

VW warnings on cranking #2861

This commit is contained in:
rusefillc 2021-06-26 01:31:50 -04:00
parent ec1c2fd50b
commit 04096e57b8
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unit_tests/logicdata_csv_reader.cpp
View File

@ -46,8 +46,13 @@ void CsvReader::processLine(EngineTestHelper *eth) {
char *timeStampstr = trim(strtok(line, s)); char *timeStampstr = trim(strtok(line, s));
bool newState[2]; bool newState[2];
newState[columnIndeces[0]] = trim(strtok(NULL, s))[0] == '1'; char *firstToken = trim(strtok(NULL, s));
newState[columnIndeces[1]] = trim(strtok(NULL, s))[0] == '1'; char *secondToken = trim(strtok(NULL, s));
newState[columnIndeces[0]] = firstToken[0] == '1';
if (secondToken != nullptr && triggerCount > 1) {
newState[columnIndeces[1]] = secondToken[0] == '1';
}
double timeStamp = std::stod(timeStampstr); double timeStamp = std::stod(timeStampstr);

2
unit_tests/logicdata_csv_reader.h
View File

@ -13,6 +13,8 @@ public:
bool currentState[2]; bool currentState[2];
int triggerCount = 2;
int lineIndex = -1; int lineIndex = -1;
int * columnIndeces; int * columnIndeces;

3
unit_tests/tests/trigger/test_real_volkswagen.cpp
View File

@ -11,15 +11,16 @@
TEST(crankingVW, vwRealCrankingFromFile) { TEST(crankingVW, vwRealCrankingFromFile) {
CsvReader reader; CsvReader reader;
reader.triggerCount = 1;
int indeces[1] = {0}; int indeces[1] = {0};
reader.open("tests/trigger/recourses/nick_1.csv", indeces); reader.open("tests/trigger/recourses/nick_1.csv", indeces);
WITH_ENGINE_TEST_HELPER (VW_ABA); WITH_ENGINE_TEST_HELPER (VW_ABA);
/*
while (reader.haveMore()) { while (reader.haveMore()) {
reader.processLine(&eth); reader.processLine(&eth);
} }
/*
ASSERT_EQ( 0, eth.recentWarnings()->getCount())<< "warningCounter#vwRealCranking"; ASSERT_EQ( 0, eth.recentWarnings()->getCount())<< "warningCounter#vwRealCranking";
ASSERT_EQ( 560, GET_RPM())<< reader.lineIndex; ASSERT_EQ( 560, GET_RPM())<< reader.lineIndex;
*/ */