From: robertlipe Date: Sat, 22 Jun 2013 03:10:57 +0000 (+0000) Subject: Tweak Garmin fit for Forerunner 10. Thanks to Ingo Arndt. X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~558 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c12733be93d41107d279b6767316484f55dde7b7;p=gpsbabel.git Tweak Garmin fit for Forerunner 10. Thanks to Ingo Arndt. --- diff --git a/gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate b/gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate index 07c201120..fc25bd1ba 100644 Binary files a/gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate and b/gpsbabel/GPSBabel.xcodeproj/project.xcworkspace/xcuserdata/robertlipe.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/gpsbabel/garmin_fit.cc b/gpsbabel/garmin_fit.cc index 29c97c318..415d51059 100644 --- a/gpsbabel/garmin_fit.cc +++ b/gpsbabel/garmin_fit.cc @@ -113,6 +113,11 @@ fit_parse_header(void) debug_print(1,"%s: profile version=%d\n", MYNAME, ver); debug_print(1,"%s: fit_data.len=%d\n", MYNAME, fit_data.len); } + + if (len > 12) { + // Unused according to Ingo Arndt + gbfgetuint16(fin); + } } static gbuint8 diff --git a/gpsbabel/reference/track/garmin-forerunner-10-output.gpx b/gpsbabel/reference/track/garmin-forerunner-10-output.gpx new file mode 100644 index 000000000..e68e20a31 --- /dev/null +++ b/gpsbabel/reference/track/garmin-forerunner-10-output.gpx @@ -0,0 +1,2065 @@ + + + + + + + + + 0.285000 + + + + 0.376000 + + + + 1.953000 + + + + 4.572000 + + + + 4.768000 + + + + 5.748000 + + + + 6.276000 + + + + 6.514000 + + + + 6.614000 + + + + 6.628000 + + + + 6.668000 + + + + 6.710000 + + + + 6.734000 + + + + 6.778000 + + + + 6.804000 + + + + 6.836000 + + + + 6.881000 + + + + 6.928000 + + + + 6.963000 + + + + 6.984000 + + + + 6.988000 + + + + 6.937000 + + + + 6.817000 + + + + 6.597000 + + + + 4.926000 + + + + 5.668000 + + + + 5.789000 + + + + 5.898000 + + + + 6.009000 + + + + 6.379000 + + + + 6.447000 + + + + 6.536000 + + + + 6.620000 + + + + 6.639000 + + + + 6.681000 + + + + 6.680000 + + + + 6.676000 + + + + 6.687000 + + + + 6.601000 + + + + 6.558000 + + + + 6.301000 + + + + 6.282000 + + + + 6.314000 + + + + 6.390000 + + + + 6.447000 + + + + 6.503000 + + + + 6.553000 + + + + 6.608000 + + + + 6.652000 + + + + 6.712000 + + + + 6.773000 + + + + 6.832000 + + + + 6.850000 + + + + 6.896000 + + + + 6.927000 + + + + 6.983000 + + + + 7.025000 + + + + 7.062000 + + + + 7.073000 + + + + 7.099000 + + + + 7.087000 + + + + 7.077000 + + + + 7.098000 + + + + 7.096000 + + + + 7.064000 + + + + 6.956000 + + + + 6.772000 + + + + 6.669000 + + + + 5.074000 + + + + 5.523000 + + + + 6.005000 + + + + 6.515000 + + + + 6.943000 + + + + 7.265000 + + + + 7.639000 + + + + 7.642000 + + + + 7.607000 + + + + 7.578000 + + + + 7.578000 + + + + 7.546000 + + + + 7.496000 + + + + 7.478000 + + + + 7.428000 + + + + 7.395000 + + + + 7.370000 + + + + 7.385000 + + + + 7.422000 + + + + 7.387000 + + + + 7.379000 + + + + 7.369000 + + + + 7.352000 + + + + 7.337000 + + + + 7.318000 + + + + 7.270000 + + + + 7.238000 + + + + 7.158000 + + + + 7.163000 + + + + 7.138000 + + + + 7.143000 + + + + 7.009000 + + + + 6.927000 + + + + 6.911000 + + + + 6.930000 + + + + 6.885000 + + + + 6.904000 + + + + 6.912000 + + + + 6.911000 + + + + 6.904000 + + + + 6.958000 + + + + 7.031000 + + + + 7.033000 + + + + 7.055000 + + + + 7.070000 + + + + 7.079000 + + + + 7.090000 + + + + 7.104000 + + + + 7.096000 + + + + 7.096000 + + + + 7.039000 + + + + 6.986000 + + + + 6.929000 + + + + 6.857000 + + + + 6.773000 + + + + 6.683000 + + + + 6.558000 + + + + 5.115000 + + + + 2.529000 + + + + 0.091000 + + + + 3.568000 + + + + 4.086000 + + + + 3.905000 + + + + 2.761000 + + + + 0.123000 + + + + 2.382000 + + + + 4.970000 + + + + 6.066000 + + + + 6.793000 + + + + 7.185000 + + + + 7.433000 + + + + 7.480000 + + + + 7.506000 + + + + 7.540000 + + + + 7.573000 + + + + 7.609000 + + + + 7.616000 + + + + 7.623000 + + + + 7.608000 + + + + 7.607000 + + + + 7.581000 + + + + 7.564000 + + + + 7.573000 + + + + 7.566000 + + + + 7.540000 + + + + 7.500000 + + + + 7.420000 + + + + 7.365000 + + + + 7.326000 + + + + 7.269000 + + + + 7.148000 + + + + 7.066000 + + + + 6.945000 + + + + 4.219000 + + + + 0.164000 + + + + 3.186000 + + + + 3.902000 + + + + 4.633000 + + + + 5.585000 + + + + 6.253000 + + + + 6.737000 + + + + 7.190000 + + + + 7.377000 + + + + 7.375000 + + + + 7.398000 + + + + 7.423000 + + + + 7.483000 + + + + 7.564000 + + + + 7.588000 + + + + 7.625000 + + + + 7.627000 + + + + 7.625000 + + + + 7.614000 + + + + 7.586000 + + + + 7.591000 + + + + 7.576000 + + + + 7.548000 + + + + 7.537000 + + + + 7.546000 + + + + 7.507000 + + + + 7.496000 + + + + 7.498000 + + + + 7.501000 + + + + 7.493000 + + + + 7.482000 + + + + 7.437000 + + + + 7.373000 + + + + 7.334000 + + + + 7.275000 + + + + 7.108000 + + + + 4.993000 + + + + 0.177000 + + + + 2.474000 + + + + 2.714000 + + + + 3.678000 + + + + 4.589000 + + + + 6.499000 + + + + 7.093000 + + + + 7.288000 + + + + 7.451000 + + + + 7.801000 + + + + 7.804000 + + + + 7.774000 + + + + 7.783000 + + + + 7.826000 + + + + 7.838000 + + + + 7.821000 + + + + 7.835000 + + + + 7.810000 + + + + 7.742000 + + + + 7.683000 + + + + 7.636000 + + + + 7.677000 + + + + 7.679000 + + + + 7.710000 + + + + 7.764000 + + + + 7.766000 + + + + 7.755000 + + + + 7.749000 + + + + 7.727000 + + + + 7.704000 + + + + 7.707000 + + + + 7.685000 + + + + 7.686000 + + + + 7.670000 + + + + 7.661000 + + + + 7.643000 + + + + 7.637000 + + + + 7.616000 + + + + 7.609000 + + + + 7.584000 + + + + 7.570000 + + + + 7.524000 + + + + 7.495000 + + + + 7.470000 + + + + 7.433000 + + + + 7.397000 + + + + 7.388000 + + + + 7.403000 + + + + 7.393000 + + + + 7.378000 + + + + 7.366000 + + + + 7.371000 + + + + 7.378000 + + + + 7.393000 + + + + 7.404000 + + + + 7.379000 + + + + 7.366000 + + + + 7.352000 + + + + 7.338000 + + + + 7.301000 + + + + 7.272000 + + + + 7.250000 + + + + 7.240000 + + + + 7.216000 + + + + 7.207000 + + + + 7.178000 + + + + 7.153000 + + + + 7.138000 + + + + 7.102000 + + + + 7.002000 + + + + 6.870000 + + + + 0.079000 + + + + 3.287000 + + + + 4.128000 + + + + 5.196000 + + + + 5.944000 + + + + 6.106000 + + + + 6.677000 + + + + 7.136000 + + + + 7.282000 + + + + 7.412000 + + + + 7.449000 + + + + 7.481000 + + + + 7.522000 + + + + 7.545000 + + + + 7.552000 + + + + 7.598000 + + + + 7.609000 + + + + 7.601000 + + + + 7.586000 + + + + 7.547000 + + + + 7.511000 + + + + 7.460000 + + + + 7.411000 + + + + 7.403000 + + + + 7.387000 + + + + 7.380000 + + + + 7.370000 + + + + 7.351000 + + + + 7.331000 + + + + 7.317000 + + + + 7.323000 + + + + 7.325000 + + + + 7.320000 + + + + 7.288000 + + + + 7.273000 + + + + 7.256000 + + + + 7.235000 + + + + 7.218000 + + + + 7.202000 + + + + 7.201000 + + + + 7.225000 + + + + 7.276000 + + + + 7.371000 + + + + 7.471000 + + + + 7.565000 + + + + 7.677000 + + + + 7.766000 + + + + 7.830000 + + + + 7.890000 + + + + 7.957000 + + + + 8.005000 + + + + 8.027000 + + + + 8.034000 + + + + 8.038000 + + + + 8.037000 + + + + 8.018000 + + + + 7.936000 + + + + 7.905000 + + + + 7.884000 + + + + 7.877000 + + + + 7.893000 + + + + 7.930000 + + + + 7.961000 + + + + 7.979000 + + + + 7.985000 + + + + 7.957000 + + + + 7.909000 + + + + 7.868000 + + + + 7.805000 + + + + 7.756000 + + + + 7.699000 + + + + 7.625000 + + + + 7.470000 + + + + 7.420000 + + + + 7.172000 + + + + 7.040000 + + + + 7.042000 + + + + 6.977000 + + + + 6.948000 + + + + 6.937000 + + + + 6.925000 + + + + 6.911000 + + + + 6.915000 + + + + 6.918000 + + + + 6.917000 + + + + 6.872000 + + + + 6.878000 + + + + 6.890000 + + + + 6.929000 + + + + 7.055000 + + + + 7.060000 + + + + 7.062000 + + + + 7.062000 + + + + 7.051000 + + + + 7.004000 + + + + 7.017000 + + + + 7.063000 + + + + 7.067000 + + + + 7.072000 + + + + 7.094000 + + + + 7.142000 + + + + 7.268000 + + + + 7.277000 + + + + 7.276000 + + + + 7.276000 + + + + 7.315000 + + + + 7.314000 + + + + 7.287000 + + + + 7.308000 + + + + 7.283000 + + + + 7.251000 + + + + 7.260000 + + + + 7.274000 + + + + 7.412000 + + + + 7.437000 + + + + 7.433000 + + + + 7.426000 + + + + 7.372000 + + + + 7.297000 + + + + 7.315000 + + + + 7.315000 + + + + 7.325000 + + + + 7.363000 + + + + 7.350000 + + + + 7.301000 + + + + 7.268000 + + + + 7.101000 + + + + 7.065000 + + + + 7.053000 + + + + 7.050000 + + + + 7.021000 + + + + 7.066000 + + + + 7.123000 + + + + 7.149000 + + + + 7.236000 + + + + 7.324000 + + + + 7.419000 + + + + 7.470000 + + + + 7.514000 + + + + 7.568000 + + + + 7.592000 + + + + 7.584000 + + + + 7.579000 + + + + 7.559000 + + + + 7.550000 + + + + 7.561000 + + + + 7.553000 + + + + 7.521000 + + + + 7.473000 + + + + 7.490000 + + + + 7.502000 + + + + 7.500000 + + + + 7.488000 + + + + 7.481000 + + + + 7.473000 + + + + 7.465000 + + + + 7.426000 + + + + 7.396000 + + + + 7.278000 + + + + 7.231000 + + + + 7.025000 + + + + 6.747000 + + + + 6.382000 + + + + 6.225000 + + + + 6.190000 + + + + 6.206000 + + + + 6.227000 + + + + 6.277000 + + + + 6.292000 + + + + 6.349000 + + + + 6.387000 + + + + 6.440000 + + + + 6.471000 + + + + 6.508000 + + + + 6.550000 + + + + 6.656000 + + + + 6.753000 + + + + 6.844000 + + + + 6.954000 + + + + 6.996000 + + + + 7.122000 + + + + 7.223000 + + + + 7.312000 + + + + 7.366000 + + + + 7.405000 + + + + 7.480000 + + + + 7.542000 + + + + 7.558000 + + + + 7.585000 + + + + 7.627000 + + + + 7.629000 + + + + 7.625000 + + + + 7.629000 + + + + 7.649000 + + + + 7.667000 + + + + 7.715000 + + + + 7.748000 + + + + 7.820000 + + + + 7.864000 + + + + 7.876000 + + + + 7.849000 + + + + 7.853000 + + + + 7.873000 + + + + 7.882000 + + + + 7.872000 + + + + 7.830000 + + + + 7.832000 + + + + 7.801000 + + + + 7.824000 + + + + 7.783000 + + + + 7.743000 + + + + 7.717000 + + + + 7.680000 + + + + 7.641000 + + + + 7.601000 + + + + 7.546000 + + + + 7.480000 + + + + 7.330000 + + + + 7.296000 + + + + 7.130000 + + + + 1.126000 + + + + 3.959000 + + + + 5.456000 + + + + 6.424000 + + + + 6.818000 + + + + 7.239000 + + + + 7.373000 + + + + 7.723000 + + + + 7.791000 + + + + 7.830000 + + + + 7.821000 + + + + 7.777000 + + + + 7.766000 + + + + 7.749000 + + + + 7.699000 + + + + 7.659000 + + + + 7.635000 + + + + 7.603000 + + + + 7.470000 + + + + 7.421000 + + + + 7.163000 + + + + 7.059000 + + + + 2.334000 + + + + 0.395000 + + + + diff --git a/gpsbabel/reference/track/garmin-forerunner-10.fit b/gpsbabel/reference/track/garmin-forerunner-10.fit new file mode 100644 index 000000000..3deef2ed2 Binary files /dev/null and b/gpsbabel/reference/track/garmin-forerunner-10.fit differ diff --git a/gpsbabel/testo.d/garmin_fit.test b/gpsbabel/testo.d/garmin_fit.test index e2b0411ef..3a227a6c4 100644 --- a/gpsbabel/testo.d/garmin_fit.test +++ b/gpsbabel/testo.d/garmin_fit.test @@ -10,3 +10,6 @@ compare ${REFERENCE}/track/garmin-edge-200-output.gpx ${TMPDIR}/fit-sample.gpx gpsbabel -i garmin_fit -f ${REFERENCE}/track/garmin-edge-800.fit -o gpx -F ${TMPDIR}/fit-sample-800.gpx compare ${REFERENCE}/track/garmin-edge-800-output.gpx ${TMPDIR}/fit-sample-800.gpx + +gpsbabel -i garmin_fit -f ${REFERENCE}/track/garmin-forerunner-10.fit -o gpx -F ${TMPDIR}/fit-sample-10.gpx +compare ${REFERENCE}/track/garmin-forerunner-10-output.gpx ${TMPDIR}/fit-sample-10.gpx