From 3730a4650c21099b82bbf567c2b4550b05a38c2e Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 24 Sep 2022 22:55:54 -0400 Subject: [PATCH] renaming stuff --- unit_tests/logicdata_csv_reader.cpp | 14 +++++++------- unit_tests/logicdata_csv_reader.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/unit_tests/logicdata_csv_reader.cpp b/unit_tests/logicdata_csv_reader.cpp index 9d4d65c815..c530c225b1 100644 --- a/unit_tests/logicdata_csv_reader.cpp +++ b/unit_tests/logicdata_csv_reader.cpp @@ -21,10 +21,10 @@ CsvReader::~CsvReader() { } } -void CsvReader::open(const char *fileName, const int* columnIndeces) { +void CsvReader::open(const char *fileName, const int* triggerColumnIndeces) { printf("Reading from %s\r\n", fileName); fp = fopen(fileName, "r"); - this->columnIndeces = columnIndeces; + this->triggerColumnIndeces = triggerColumnIndeces; ASSERT_TRUE(fp != nullptr); } @@ -60,12 +60,12 @@ void CsvReader::processLine(EngineTestHelper *eth) { const char s[2] = ","; char *timeStampstr = trim(strtok(buffer, s)); - bool newState[TRIGGER_INPUT_PIN_COUNT]; + bool newTriggerState[TRIGGER_INPUT_PIN_COUNT]; bool newVvtState[CAM_INPUTS_COUNT]; for (size_t i = 0;isetTimeAndInvokeEventsUs(1'000'000 * timeStamp); for (size_t index = 0; index < m_triggerCount; index++) { - if (currentState[index] == newState[index]) { + if (currentState[index] == newTriggerState[index]) { continue; } efitick_t nowNt = getTimeNowNt(); // todo: we invert VVT but we do not invert trigger input!!! - hwHandleShaftSignal(index, newState[index], nowNt); + hwHandleShaftSignal(index, newTriggerState[index], nowNt); - currentState[index] = newState[index]; + currentState[index] = newTriggerState[index]; } for (size_t vvtIndex = 0; vvtIndex < m_vvtCount ; vvtIndex++) { diff --git a/unit_tests/logicdata_csv_reader.h b/unit_tests/logicdata_csv_reader.h index 2d26456e26..0f534c15e8 100644 --- a/unit_tests/logicdata_csv_reader.h +++ b/unit_tests/logicdata_csv_reader.h @@ -18,7 +18,7 @@ public: } ~CsvReader(); - void open(const char *fileName, const int* columnIndeces = SINGLE_TRIGGER_FIRST); + void open(const char *fileName, const int* triggerColumnIndeces = SINGLE_TRIGGER_FIRST); bool haveMore(); void processLine(EngineTestHelper *eth); void readLine(EngineTestHelper *eth); @@ -41,6 +41,6 @@ private: int m_lineIndex = -1; - const int* columnIndeces; + const int* triggerColumnIndeces; };