t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a few typos, and fix import/export of timestamps. Normalizes to microseconds, and makes the first sample happen at 0. Exported version is now indistinguishable from the imported version, other than the timestamps starting at 0.

Browse Source
This commit is contained in:
Izzy
2019-03-08 23:43:34 -08:00
parent 8e23302e79
commit a03a9d6d09
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framefileio.cpp
+29 -10
View File
@@ -1978,8 +1978,9 @@ bool FrameFileIO::loadCabanaFile(QString filename, QVector<CANFrame>* frames)
QFile *inFile = new QFile(filename);
CANFrame thisFrame;
QByteArray line;
int fileVersion = 1;
long long timeStamp = Utility::GetTimeMS();
bool timeStampBaseSet = false;
uint64_t timeStampBase = 0;
uint64_t lastTimeStamp = 0;
int lineCounter = 0;
bool foundErrors = false;
thisFrame.remote = false;
@@ -2006,15 +2007,30 @@ bool FrameFileIO::loadCabanaFile(QString filename, QVector<CANFrame>* frames)
QList<QByteArray> tokens = line.split(',');
if (tokens.length() >= 3)
{
if (tokens[0].length() > 3)
if (tokens[0].length() > 1)
{
long long temp = tokens[0].toLongLong();
thisFrame.timestamp = temp;
double temp = tokens[0].toDouble();
temp = temp * 1000000;
if(!timeStampBaseSet)
{
timeStampBase = (uint64_t)(temp);
timeStampBaseSet = true;
}
if(timeStampBaseSet) {
thisFrame.timestamp = ((uint64_t)(temp) - timeStampBase);
lastTimeStamp = thisFrame.timestamp;
} else {
thisFrame.timestamp = (lastTimeStamp + 1);
lastTimeStamp = thisFrame.timestamp;
}
}
else
{
timeStamp += 5;
thisFrame.timestamp = timeStamp;
thisFrame.timestamp = (lastTimeStamp + 1);
lastTimeStamp = thisFrame.timestamp;
}
thisFrame.ID = tokens[1].toInt();
@@ -2073,10 +2089,14 @@ bool FrameFileIO::saveCabanaFile(QString filename, const QVector<CANFrame>* fram
lineCounter = 0;
}
outFile->write(QString::number(frames->at(c).timestamp).toUtf8());
double tempTimeStamp = frames->at(c).timestamp;
tempTimeStamp /= 1000000;
outFile->write(QString::number(tempTimeStamp, 'f').toUtf8());
outFile->write(".0");
outFile->putChar(44);
outFile->write(QString::number(frames->at(c).ID, 10).toUpper().rightJustified(8, '0').toUtf8());
outFile->write(QString::number(frames->at(c).ID, 10).toUpper().toUtf8());
outFile->putChar(44);
outFile->write(QString::number(frames->at(c).bus).toUtf8());
@@ -2089,7 +2109,6 @@ bool FrameFileIO::saveCabanaFile(QString filename, const QVector<CANFrame>* fram
else
outFile->write("00");
}
outFile->putChar(44);
outFile->write("\n");
framefileio.h
+2 -2
View File
@@ -45,7 +45,7 @@ public:
static bool loadCanalyzerASC(QString, QVector<CANFrame>*);
static bool loadCanalyzerBLF(QString, QVector<CANFrame>*);
static bool loadCANHackerFile(QString filename, QVector<CANFrame>* frames);
static bool loadCabanaFile(QSting filename, QVector<CANFrame>* frames);
static bool loadCabanaFile(QString filename, QVector<CANFrame>* frames);
static bool saveCRTDFile(QString, const QVector<CANFrame>*);
static bool saveNativeCSVFile(QString, const QVector<CANFrame>*);
static bool saveGenericCSVFile(QString, const QVector<CANFrame>*);
@@ -56,7 +56,7 @@ public:
static bool saveCANDOFile(QString, const QVector<CANFrame>*);
static bool saveVehicleSpyFile(QString, const QVector<CANFrame>*);
static bool saveCanDumpFile(QString filename, const QVector<CANFrame> * frames);
static bool saveCabanaFile(QSting filename, const QVector<CANFrame>* frames);
static bool saveCabanaFile(QString filename, const QVector<CANFrame>* frames);
static bool openContinuousNative();
static bool closeContinuousNative();
static bool writeContinuousNative(const QVector<CANFrame>*, int);