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

NB2 hellen-72-rev-d something is off #2958

This commit is contained in:
Andrey 2021-07-13 14:24:47 -04:00
parent 75f3cff924
commit 8afa24e7eb
6 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unit_tests/logicdata_csv_reader.h
View File

@ -6,9 +6,10 @@
*/ */
class CsvReader { class CsvReader {
public: public:
CsvReader(size_t triggerCount) : CsvReader(triggerCount, 0.0) {} CsvReader(size_t triggerCount, size_t vvtCount) : CsvReader(triggerCount, vvtCount, 0.0) {}
CsvReader(size_t triggerCount, double timestampOffset) CsvReader(size_t triggerCount, size_t vvtCount, double timestampOffset)
: m_triggerCount(triggerCount) : m_triggerCount(triggerCount)
, m_vvtCount(vvtCount)
, m_timestampOffset(timestampOffset) , m_timestampOffset(timestampOffset)
{ {
} }
@ -24,6 +25,7 @@ public:
private: private:
const size_t m_triggerCount; const size_t m_triggerCount;
const size_t m_vvtCount;
const double m_timestampOffset; const double m_timestampOffset;
FILE *fp; FILE *fp;

1
unit_tests/tests/tests.mk
View File

@ -9,6 +9,7 @@ TESTS_SRC_CPP = \
tests/trigger/test_real_cranking_miata_NA.cpp \ tests/trigger/test_real_cranking_miata_NA.cpp \
tests/trigger/test_real_cranking_miata_na6.cpp \ tests/trigger/test_real_cranking_miata_na6.cpp \
tests/trigger/test_real_volkswagen.cpp \ tests/trigger/test_real_volkswagen.cpp \
tests/trigger/test_real_nb2_cranking.cpp \
tests/trigger/test_rpm_multiplier.cpp \ tests/trigger/test_rpm_multiplier.cpp \
tests/trigger/test_quad_cam.cpp \ tests/trigger/test_quad_cam.cpp \
tests/trigger/test_nissan_vq_vvt.cpp \ tests/trigger/test_nissan_vq_vvt.cpp \

2
unit_tests/tests/trigger/test_real_cranking_miata_NA.cpp
View File

@ -10,7 +10,7 @@
#include <string> #include <string>
TEST(cranking, realCrankingFromFile) { TEST(cranking, realCrankingFromFile) {
CsvReader reader(2); CsvReader reader(2, /* vvtCount */ 0);
int indeces[2] = {1, 0}; // this logic data file has first trigger channel in second column and second trigger channel in first column int indeces[2] = {1, 0}; // this logic data file has first trigger channel in second column and second trigger channel in first column
reader.open("tests/trigger/resources/cranking_na_3.csv", indeces); reader.open("tests/trigger/resources/cranking_na_3.csv", indeces);

2
unit_tests/tests/trigger/test_real_cranking_miata_na6.cpp
View File

@ -166,7 +166,7 @@ TEST(cranking, hardcodedRealCranking) {
} }
TEST(cranking, naCrankFromFile) { TEST(cranking, naCrankFromFile) {
CsvReader reader(2); CsvReader reader(2, /* vvtCount */ 0);
int indeces[2] = {1, 0}; int indeces[2] = {1, 0};
reader.open("tests/trigger/resources/cranking_na_4.csv", indeces); reader.open("tests/trigger/resources/cranking_na_4.csv", indeces);

15
unit_tests/tests/trigger/test_real_nb2_cranking.cpp Normal file
View File

@ -0,0 +1,15 @@
/*
* @file test_real_nb2_cranking.cpp
*
* @date July 13, 2019
* @author Andrey Belomutskiy, (c) 2012-2020
*/
#include "engine_test_helper.h"
#include "logicdata_csv_reader.h"
TEST(crankingNB2, nb2RealCrankingFromFile) {
}

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

@ -10,7 +10,7 @@
#include "logicdata_csv_reader.h" #include "logicdata_csv_reader.h"
TEST(crankingVW, vwRealCrankingFromFile) { TEST(crankingVW, vwRealCrankingFromFile) {
CsvReader reader(1); CsvReader reader(1, /* vvtCount */ 0);
int indeces[1] = {0}; int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", indeces);
@ -30,7 +30,7 @@ TEST(crankingVW, crankingTwiceWithGap) {
eth.setTriggerType(TT_60_2_VW PASS_ENGINE_PARAMETER_SUFFIX); eth.setTriggerType(TT_60_2_VW PASS_ENGINE_PARAMETER_SUFFIX);
{ {
CsvReader reader(1); CsvReader reader(1, /* vvtCount */ 0);
int indeces[1] = {0}; int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", indeces);
@ -47,7 +47,7 @@ TEST(crankingVW, crankingTwiceWithGap) {
{ {
// Offset by a short time offset, 10 seconds // Offset by a short time offset, 10 seconds
CsvReader reader(1, 10); CsvReader reader(1, /* vvtCount */ 0, 10);
int indeces[1] = {0}; int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", indeces);
@ -62,7 +62,7 @@ TEST(crankingVW, crankingTwiceWithGap) {
{ {
// Offset by long time offset, 5m14.15s // Offset by long time offset, 5m14.15s
CsvReader reader(1, 314.159); CsvReader reader(1, /* vvtCount */ 0, 314.159);
int indeces[1] = {0}; int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", indeces);