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

Merge branch 'master' of github.com:/GoldenCheetah/GoldenCheetah

Browse Source
This commit is contained in:
Mark Liversedge
2013-04-05 18:30:04 +01:00
parent 31ced60209 ad98de20f7
commit f5bbcae001
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/FitRideFile.cpp
View File

@@ -237,6 +237,12 @@ struct FitFileReaderState
default: rideFile->setDeviceType(QString("Garmin %1").arg(prod));
}
}
else if (manu == 38) {
switch (prod) {
case 1: rideFile->setDeviceType("o_synce navi2coach"); break;
default: rideFile->setDeviceType(QString("Garmin %1").arg(prod));
}
}
else {
rideFile->setDeviceType(QString("Unknown FIT Device %1:%2").arg(manu).arg(prod));
}
@@ -366,6 +372,7 @@ struct FitFileReaderState
break;
case 12: break; // "cycle_length"
case 13: temperature = value; break;
case 29: // ACCUMULATED_POWER
case 30: lrbalance = (value & 0x80 ? 100 - (value & 0x7F) : value & 0x7F);break;
default: unknown_record_fields.insert(field.num);

2
src/SyncRideFile.cpp
View File

@@ -214,7 +214,7 @@ struct SyncFileReaderState
RideFile * run() {
errors.clear();
rideFile = new RideFile;
rideFile->setDeviceType("Macro Sync");
rideFile->setDeviceType("o_synce macro/macrox");
rideFile->setFileFormat("Macro GoldenCheetah Sync File (osyn)");
if (!file.open(QIODevice::ReadOnly)) {