mirror of https://github.com/FOME-Tech/fome-fw.git
progress
This commit is contained in:
parent
63fe1120bd
commit
cd2da05443
|
@ -21,10 +21,11 @@ CsvReader::~CsvReader() {
|
|||
}
|
||||
}
|
||||
|
||||
void CsvReader::open(const char *fileName, const int* triggerColumnIndeces) {
|
||||
void CsvReader::open(const char *fileName, const int* triggerColumnIndeces, const int *vvtColumnIndeces) {
|
||||
printf("Reading from %s\r\n", fileName);
|
||||
fp = fopen(fileName, "r");
|
||||
this->triggerColumnIndeces = triggerColumnIndeces;
|
||||
this->vvtColumnIndeces = vvtColumnIndeces;
|
||||
ASSERT_TRUE(fp != nullptr);
|
||||
}
|
||||
|
||||
|
@ -70,7 +71,7 @@ void CsvReader::processLine(EngineTestHelper *eth) {
|
|||
|
||||
for (size_t i = 0;i<m_vvtCount;i++) {
|
||||
char *vvtToken = trim(strtok(nullptr, s));
|
||||
newVvtState[i] = vvtToken[0] == '1';
|
||||
newVvtState[vvtColumnIndeces[i]] = vvtToken[0] == '1';
|
||||
}
|
||||
|
||||
if (timeStampstr == nullptr) {
|
||||
|
|
|
@ -20,7 +20,7 @@ public:
|
|||
}
|
||||
~CsvReader();
|
||||
|
||||
void open(const char *fileName, const int* triggerColumnIndeces = NORMAL_ORDER);
|
||||
void open(const char *fileName, const int* triggerColumnIndeces = NORMAL_ORDER, const int *vvtColumnIndeces = NORMAL_ORDER);
|
||||
bool haveMore();
|
||||
void processLine(EngineTestHelper *eth);
|
||||
void readLine(EngineTestHelper *eth);
|
||||
|
|
Loading…
Reference in New Issue