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

Merge pull request #1056 from OpenTracksApp/whaoo#1050

Browse Source
This commit is contained in:
Dennis Guse
2021-12-22 22:29:09 +01:00
committed by GitHub
parent 183b47a1ea 0ee1c77680
commit 4d333bbafa
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README_TESTED_SENSORS.md
+6 -8
View File
@@ -18,23 +18,21 @@
Please note that the according to the specification these sensors _may_ provide speed as well as cadence. Please note that the according to the specification these sensors _may_ provide speed as well as cadence.
However, often only one value is provided. However, often only one value is provided.
### Speed ### Speed & Cadence
* Wahoo Blue SC
### Speed only
* Garmin Speed Sensor 2 * Garmin Speed Sensor 2
* Has updatable firmware that requires an account for garmin.com * Has updatable firmware that requires an account for garmin.com
* This sensor reports speed data as cadence.
A workaround is in place.
* Wahoo Speed (Model: WFRPMSPD) * Wahoo Speed (Model: WFRPMSPD)
* CooSpo cadence and speed sensor (model: BK467) * CooSpo cadence and speed sensor (model: BK467)
### Cadence ### Cadence only
* Garmin Cadence Sensor 2 * Garmin Cadence Sensor 2
* Wahoo Cadence (Model: WFPODCAD2) * Wahoo Cadence (Model: WFPODCAD2)
This sensor reports cadence data as speed.
A workaround is in place.
## 0x1818: Power Measurement ## 0x1818: Power Measurement
src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
+7 -13
View File
@@ -203,11 +203,6 @@ public abstract class BluetoothConnectionManager<DataType> {
return cadenceAndSpeed.getCadence(); return cadenceAndSpeed.getCadence();
} }
//Workaround for Wahoo CADENCE: this sensor reports speed (instead of cadence)
if (cadenceAndSpeed.getDistanceSpeed() != null) {
return new SensorDataCycling.Cadence(cadenceAndSpeed.getDistanceSpeed());
}
return null; return null;
} }
} }
@@ -226,15 +221,14 @@ public abstract class BluetoothConnectionManager<DataType> {
@Override @Override
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) {
// Workaround for Garmin Speed Sensor 2: provides cadence instead of speed return null;
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;
} }
if (cadenceAndSpeed.getDistanceSpeed() != null) {
return cadenceAndSpeed.getDistanceSpeed();
}
return null; return null;
} }
} }