nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore Moxy 'delimeters'

Browse Source 
.. the Moxy device sends blank lines to delimit recordings
   that we try and parse; so now we just ignore them.
This commit is contained in:
Mark Liversedge
2014-11-20 11:37:22 +00:00
parent e326fb8704
commit db34e57a65
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/CsvRideFile.cpp
View File

@@ -255,12 +255,13 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
file.close();
return NULL;
}
if (degCUnits.indexIn(line) != -1)
tempType = degC;
else if (degFUnits.indexIn(line) != -1)
tempType = degF;
}
else if (lineno > unitsHeader) {
} else if (lineno > unitsHeader) {
double minutes=0,nm=0,kph=0,watts=0,km=0,cad=0,alt=0,hr=0,dfpm=0, seconds=0.0;
double temp=RideFile::NoTemp;
double slope=0.0;
@@ -297,8 +298,8 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
kph *= KM_PER_MILE;
alt *= METERS_PER_FOOT;
}
}
else if (iBike) {
} else if (iBike) {
// this must be iBike
// can't find time as a column.
// will we have to extrapolate based on the recording interval?
@@ -339,8 +340,14 @@ RideFile *CsvFileReader::openRideFile(QFile &file, QStringList &errors, QList<Ri
alt *= METERS_PER_FOOT;
headwind *= KM_PER_MILE;
}
}
else if (moxy) {
} else if (moxy) {
// we get crappy lines with no data so ignore them
// I think they're supposed to be delimeters for the file
// content, but are just noise to us !
if (line == (" ,,,,,") || line == ",,,,,") continue;
// need to get time from second column and note that
// there will be gaps when recording drops so shouldn't
// assume it is a continuous stream

3
src/MoxyDevice.cpp
View File

@@ -201,6 +201,9 @@ MoxyDevice::download( const QDir &tmpdir,
updateProgress(QString(tr("Downloading ... [%1 bytes]")).arg(count));
vbuf[bytes] = '\0';
// ignore 'delimeters' (they're just noise)
if (QString(vbuf) == " ,,,,," || QString(vbuf) == ",,,,,") continue;
// get data
QDateTime line = dateTimeForRow(vbuf);