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

refactoring: extract constant

This commit is contained in:
Andrey 2022-09-24 15:33:01 -04:00
parent a4aed52c75
commit e7e9742ba9
6 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unit_tests/logicdata_csv_reader.h
View File

@ -4,6 +4,9 @@
* @date Jun 26, 2021 * @date Jun 26, 2021
* @author Andrey Belomutskiy, (c) 2012-2021 * @author Andrey Belomutskiy, (c) 2012-2021
*/ */
const int SINGLE_TRIGGER_FIRST[1] = {0};
class CsvReader { class CsvReader {
public: public:
CsvReader(size_t triggerCount, size_t vvtCount) : CsvReader(triggerCount, vvtCount, 0.0) {} CsvReader(size_t triggerCount, size_t vvtCount) : CsvReader(triggerCount, vvtCount, 0.0) {}

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

@ -10,9 +10,8 @@
static void test(int engineSyncCam, float camOffsetAdd) { static void test(int engineSyncCam, float camOffsetAdd) {
CsvReader reader(1, /* vvtCount */ 2); CsvReader reader(1, /* vvtCount */ 2);
int indeces[] = {0};
reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv", indeces); reader.open("tests/trigger/resources/nissan_vq40_cranking-1.csv", SINGLE_TRIGGER_FIRST);
EngineTestHelper eth (HELLEN_121_NISSAN_6_CYL); EngineTestHelper eth (HELLEN_121_NISSAN_6_CYL);
engineConfiguration->isFasterEngineSpinUpEnabled = false; engineConfiguration->isFasterEngineSpinUpEnabled = false;
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;

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

@ -4,9 +4,8 @@
TEST(crankingGm24x, gmRealCrankingFromFile) { TEST(crankingGm24x, gmRealCrankingFromFile) {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(1, /* vvtCount */ 0);
int indeces[1] = {0};
reader.open("tests/trigger/resources/gm_24x_cranking.csv", indeces); reader.open("tests/trigger/resources/gm_24x_cranking.csv", SINGLE_TRIGGER_FIRST);
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->isFasterEngineSpinUpEnabled = true;
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;

5
unit_tests/tests/trigger/test_real_k24a2.cpp
View File

@ -3,10 +3,9 @@
#include "logicdata_csv_reader.h" #include "logicdata_csv_reader.h"
static void doTest(const char* testFile, int expectedRpm) { static void doTest(const char* testFile, int expectedRpm) {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(/* triggerCount */ 1, /* vvtCount */ 0);
int indeces[1] = {0};
reader.open(testFile, indeces); reader.open(testFile, SINGLE_TRIGGER_FIRST);
EngineTestHelper eth(TEST_ENGINE); EngineTestHelper eth(TEST_ENGINE);
engineConfiguration->isFasterEngineSpinUpEnabled = true; engineConfiguration->isFasterEngineSpinUpEnabled = true;
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;

6
unit_tests/tests/trigger/test_real_nb2_cranking.cpp
View File

@ -10,9 +10,8 @@
TEST(realCrankingNB2, normalCranking) { TEST(realCrankingNB2, normalCranking) {
CsvReader reader(1, /* vvtCount */ 1); CsvReader reader(1, /* vvtCount */ 1);
int indeces[] = {0};
reader.open("tests/trigger/resources/nb2-cranking-good.csv", indeces); reader.open("tests/trigger/resources/nb2-cranking-good.csv", SINGLE_TRIGGER_FIRST);
EngineTestHelper eth (HELLEN_NB2); EngineTestHelper eth (HELLEN_NB2);
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;
@ -37,9 +36,8 @@ TEST(realCrankingNB2, normalCranking) {
TEST(realCrankingNB2, crankingMissingInjector) { TEST(realCrankingNB2, crankingMissingInjector) {
CsvReader reader(1, /* vvtCount */ 1); CsvReader reader(1, /* vvtCount */ 1);
int indeces[] = {0};
reader.open("tests/trigger/resources/nb2-cranking-good-missing-injector-1.csv", indeces); reader.open("tests/trigger/resources/nb2-cranking-good-missing-injector-1.csv", SINGLE_TRIGGER_FIRST);
EngineTestHelper eth (HELLEN_NB2); EngineTestHelper eth (HELLEN_NB2);
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;

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

@ -11,9 +11,8 @@
TEST(crankingVW, vwRealCrankingFromFile) { TEST(crankingVW, vwRealCrankingFromFile) {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(1, /* vvtCount */ 0);
int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST);
EngineTestHelper eth (VW_ABA); EngineTestHelper eth (VW_ABA);
engineConfiguration->alwaysInstantRpm = true; engineConfiguration->alwaysInstantRpm = true;
eth.setTriggerType(TT_60_2_VW); eth.setTriggerType(TT_60_2_VW);
@ -33,9 +32,8 @@ TEST(crankingVW, crankingTwiceWithGap) {
{ {
CsvReader reader(1, /* vvtCount */ 0); CsvReader reader(1, /* vvtCount */ 0);
int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST);
while (reader.haveMore()) { while (reader.haveMore()) {
reader.processLine(&eth); reader.processLine(&eth);
@ -50,9 +48,8 @@ TEST(crankingVW, crankingTwiceWithGap) {
{ {
// Offset by a short time offset, 10 seconds // Offset by a short time offset, 10 seconds
CsvReader reader(1, /* vvtCount */ 0, 10); CsvReader reader(1, /* vvtCount */ 0, 10);
int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST);
while (reader.haveMore()) { while (reader.haveMore()) {
reader.processLine(&eth); reader.processLine(&eth);
@ -65,9 +62,8 @@ TEST(crankingVW, crankingTwiceWithGap) {
{ {
// Offset by long time offset, 5m14.15s // Offset by long time offset, 5m14.15s
CsvReader reader(1, /* vvtCount */ 0, 314.159); CsvReader reader(1, /* vvtCount */ 0, 314.159);
int indeces[1] = {0};
reader.open("tests/trigger/resources/nick_1.csv", indeces); reader.open("tests/trigger/resources/nick_1.csv", SINGLE_TRIGGER_FIRST);
while (reader.haveMore()) { while (reader.haveMore()) {
reader.processLine(&eth); reader.processLine(&eth);