karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Garmin Speed 2: added workaround if cadence instead of speed is provided.

Browse Source
This commit is contained in:
Dennis Guse
2021-03-06 18:56:37 +01:00
parent 2431d60171
commit d1e9649505
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README_TESTED_SENSORS.md
+3
View File
@@ -19,6 +19,9 @@ However, often only one value is provided.
### Speed ### Speed
* Garmin Speed Sensor 2 * Garmin Speed Sensor 2
This sensor reports speed data as cadence.
A workaround is in place.
* Wahoo Speed (Model: WFRPMSPD) * Wahoo Speed (Model: WFRPMSPD)
### Cadence ### Cadence
src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
+7 -1
View File
@@ -220,7 +220,13 @@ public abstract class BluetoothConnectionManager {
protected SensorDataCycling.DistanceSpeed parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) { protected SensorDataCycling.DistanceSpeed parsePayload(String sensorName, String address, BluetoothGattCharacteristic characteristic) {
SensorDataCycling.CadenceAndSpeed cadenceAndSpeed = BluetoothUtils.parseCyclingCrankAndWheel(address, sensorName, characteristic); SensorDataCycling.CadenceAndSpeed cadenceAndSpeed = BluetoothUtils.parseCyclingCrankAndWheel(address, sensorName, characteristic);
if (cadenceAndSpeed != null) { if (cadenceAndSpeed != null) {
return cadenceAndSpeed.getDistanceSpeed(); // Workaround for Garmin Speed Sensor 2: provides cadence instead of speed
SensorDataCycling.DistanceSpeed result = cadenceAndSpeed.getDistanceSpeed();
if (result == null && cadenceAndSpeed.getCadence() != null) {
result = new SensorDataCycling.DistanceSpeed(cadenceAndSpeed.getSensorAddress(), cadenceAndSpeed.getSensorName(), (int) cadenceAndSpeed.getCadence().getCrankRevolutionsCount(), cadenceAndSpeed.getCadence().getCrankRevolutionsTime());
}
return result;
} }
return null; return null;
} }