gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for reading the OSD_ACC_FMT characteristic to define the acceleration data format.

Browse Source
This commit is contained in:
Graham Jones
2023-12-13 16:49:17 +00:00
parent 7f2855bd09
commit 9827f7d8f5
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE.java
View File

@@ -68,6 +68,7 @@ public class SdDataSourceBLE extends SdDataSource {
private int nRawData = 0; private int nRawData = 0;
private double[] rawData = new double[MAX_RAW_DATA]; private double[] rawData = new double[MAX_RAW_DATA];
private int mAccFmt = 0;
private boolean waitForDescriptorWrite = false; private boolean waitForDescriptorWrite = false;
private static final int STATE_DISCONNECTED = 0; private static final int STATE_DISCONNECTED = 0;
@@ -95,6 +96,8 @@ public class SdDataSourceBLE extends SdDataSource {
public static String CHAR_OSD_BATT_DATA = "000085e9-0002-1000-8000-00805f9b34fb"; public static String CHAR_OSD_BATT_DATA = "000085e9-0002-1000-8000-00805f9b34fb";
public static String CHAR_OSD_WATCH_ID = "000085e9-0003-1000-8000-00805f9b34fb"; public static String CHAR_OSD_WATCH_ID = "000085e9-0003-1000-8000-00805f9b34fb";
public static String CHAR_OSD_WATCH_FW = "000085e9-0004-1000-8000-00805f9b34fb"; public static String CHAR_OSD_WATCH_FW = "000085e9-0004-1000-8000-00805f9b34fb";
public static String CHAR_OSD_ACC_FMT= "000085e9-0005-1000-8000-00805f9b34fb";
// Valid values are 0: 8 bit vector magnitude scaled so 1g=44
public static String CHAR_MANUF_NAME = "00002a29-0000-1000-8000-00805f9b34fb"; public static String CHAR_MANUF_NAME = "00002a29-0000-1000-8000-00805f9b34fb";
public static String CLIENT_CHARACTERISTIC_CONFIG = "00002902-0000-1000-8000-00805f9b34fb"; public static String CLIENT_CHARACTERISTIC_CONFIG = "00002902-0000-1000-8000-00805f9b34fb";
@@ -276,6 +279,9 @@ public class SdDataSourceBLE extends SdDataSource {
} else if (charUuidStr.equals(CHAR_OSD_WATCH_FW)) { } else if (charUuidStr.equals(CHAR_OSD_WATCH_FW)) {
Log.v(TAG, "Reading Watch Firmware Version"); Log.v(TAG, "Reading Watch Firmware Version");
executeReadCharacteristic(gattCharacteristic); executeReadCharacteristic(gattCharacteristic);
} else if (charUuidStr.equals(CHAR_OSD_ACC_FMT)) {
Log.v(TAG, "Reading Acceleration format code");
executeReadCharacteristic(gattCharacteristic);
} }
} }
} }
@@ -407,6 +413,10 @@ public class SdDataSourceBLE extends SdDataSource {
Log.v(TAG,"Received Watch Firmware Version: "+watchFwVer); Log.v(TAG,"Received Watch Firmware Version: "+watchFwVer);
mSdData.watchSdVersion = watchFwVer; mSdData.watchSdVersion = watchFwVer;
} }
else if (characteristic.getUuid().toString().equals(CHAR_OSD_ACC_FMT)) {
mAccFmt = characteristic.getValue()[0];
Log.v(TAG,"Received Acceleration format code: "+mAccFmt);
}
else { else {
Log.v(TAG,"Unrecognised Characteristic Updated "+ Log.v(TAG,"Unrecognised Characteristic Updated "+
characteristic.getUuid().toString()); characteristic.getUuid().toString());