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

Cleanup: BLE cycling speed/distance sensor parsing should be the other way around./

Browse Source 
Was seemingly still working...
This commit is contained in:
Dennis Guse
2021-11-13 13:53:08 +01:00
parent d6da5f0862
commit 35de5b6b26
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/util/BluetoothUtilsTest.java
+7 -7
View File
@@ -43,40 +43,40 @@ public class BluetoothUtilsTest {
@Test @Test
public void parseCyclingSpeedCadence_crankOnly() { public void parseCyclingSpeedCadence_crankOnly() {
BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0); BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
characteristic.setValue(new byte[]{0x01, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99}); characteristic.setValue(new byte[]{0x02, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99});
// when // when
SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic); SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
// then // then
assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
assertNull(sensor.getDistanceSpeed()); assertNull(sensor.getDistanceSpeed());
assertEquals(200, sensor.getCadence().getCrankRevolutionsCount());
} }
@Test @Test
public void parseCyclingSpeedCadence_wheelOnly() { public void parseCyclingSpeedCadence_wheelOnly() {
BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0); BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
characteristic.setValue(new byte[]{0x02, (byte) 0xE1, 0x00, 0x45, (byte) 0x99}); characteristic.setValue(new byte[]{0x01, (byte) 0xFF, (byte) 0xFF, 0, 1, 0x45, (byte) 0x99});
// when // when
SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic); SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
// then // then
assertEquals(65535 + 16777216, sensor.getDistanceSpeed().getWheelRevolutionsCount());
assertNull(sensor.getCadence()); assertNull(sensor.getCadence());
assertEquals(225, sensor.getDistanceSpeed().getWheelRevolutionsCount());
} }
@Test @Test
public void parseCyclingSpeedCadence_crankWheel() { public void parseCyclingSpeedCadence_crankWheel() {
BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0); BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
characteristic.setValue(new byte[]{0x03, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99, (byte) 0xE1, 0x00, 0x45, (byte) 0x99}); characteristic.setValue(new byte[]{0x03, (byte) 0xC8, 0x00, 0x00, 0x01, 0x06, (byte) 0x99, (byte) 0xE1, 0x00, 0x45, (byte) 0x99});
// when // when
SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic); SensorDataCycling.CadenceAndSpeed sensor = BluetoothUtils.parseCyclingCrankAndWheel("address", "sensorName", characteristic);
// then // then
assertEquals(200, sensor.getCadence().getCrankRevolutionsCount()); assertEquals(200 + 16777216, sensor.getDistanceSpeed().getWheelRevolutionsCount());
assertEquals(225, sensor.getDistanceSpeed().getWheelRevolutionsCount()); assertEquals(225, sensor.getCadence().getCrankRevolutionsCount());
} }
@Test @Test
src/main/java/de/dennisguse/opentracks/util/BluetoothUtils.java
+13 -16
View File
@@ -107,9 +107,6 @@ public class BluetoothUtils {
return characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_SINT16, 2); return characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_SINT16, 2);
} }
/**
* Documentation: https://www.bluetooth.org/docman/handlers/downloaddoc.ashx?doc_id=261449
*/
public static SensorDataCycling.CadenceAndSpeed parseCyclingCrankAndWheel(String address, String sensorName, @NonNull BluetoothGattCharacteristic characteristic) { public static SensorDataCycling.CadenceAndSpeed parseCyclingCrankAndWheel(String address, String sensorName, @NonNull BluetoothGattCharacteristic characteristic) {
// DOCUMENTATION https://www.bluetooth.com/wp-content/uploads/Sitecore-Media-Library/Gatt/Xml/Characteristics/org.bluetooth.characteristic.csc_measurement.xml // DOCUMENTATION https://www.bluetooth.com/wp-content/uploads/Sitecore-Media-Library/Gatt/Xml/Characteristics/org.bluetooth.characteristic.csc_measurement.xml
int valueLength = characteristic.getValue().length; int valueLength = characteristic.getValue().length;
@@ -118,26 +115,26 @@ public class BluetoothUtils {
} }
int flags = characteristic.getValue()[0]; int flags = characteristic.getValue()[0];
boolean hasCrank = (flags & 0x01) > 0; boolean hasWheel = (flags & 0x01) > 0;
boolean hasWheel = (flags & 0x02) > 0; boolean hasCrank = (flags & 0x02) > 0;
SensorDataCycling.Cadence cadence = null;
int index = 1; int index = 1;
if (hasCrank && valueLength - index >= 6) { SensorDataCycling.DistanceSpeed speed = null;
long crankCount = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT32, index); if (hasWheel && valueLength - index >= 6) {
int wheelTotalRevolutionCount = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT32, index);
index += 4; index += 4;
int wheelTime = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); // 1/1024s
int crankTime = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); // 1/1024s speed = new SensorDataCycling.DistanceSpeed(address, sensorName, wheelTotalRevolutionCount, wheelTime);
index += 2; index += 2;
cadence = new SensorDataCycling.Cadence(address, sensorName, crankCount, crankTime);
} }
SensorDataCycling.DistanceSpeed speed = null; SensorDataCycling.Cadence cadence = null;
if (hasWheel && valueLength - index >= 4) { if (hasCrank && valueLength - index >= 4) {
int wheelCount = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); long crankCount = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index);
index += 2; index += 2;
int wheelTime = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); // 1/1024s
speed = new SensorDataCycling.DistanceSpeed(address, sensorName, wheelCount, wheelTime); int crankTime = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, index); // 1/1024s
cadence = new SensorDataCycling.Cadence(address, sensorName, crankCount, crankTime);
} }
return new SensorDataCycling.CadenceAndSpeed(address, sensorName, cadence, speed); return new SensorDataCycling.CadenceAndSpeed(address, sensorName, cadence, speed);