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

renaming stuff

This commit is contained in:
Andrey 2022-09-24 22:55:54 -04:00
parent 93e64a61a6
commit 89f0dad5be
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unit_tests/logicdata_csv_reader.cpp
View File

@ -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;i<m_triggerCount;i++) {
char * triggerToken = trim(strtok(nullptr, s));
newState[columnIndeces[i]] = triggerToken[0] == '1';
newTriggerState[triggerColumnIndeces[i]] = triggerToken[0] == '1';
}
for (size_t i = 0;i<m_vvtCount;i++) {
@ -84,15 +84,15 @@ void CsvReader::processLine(EngineTestHelper *eth) {
eth->setTimeAndInvokeEventsUs(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++) {

4
unit_tests/logicdata_csv_reader.h
View File

@ -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;
};