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

Added read of standard battery service so we get 'settings ok' with InfiniTime

Browse Source
This commit is contained in:
Graham Jones
2024-01-11 19:50:27 +00:00
parent 259afff970
commit 9bfcc01525
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:versionCode="128" android:versionCode="128"
android:versionName="4.2.1i"> android:versionName="4.2.1j">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

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

@@ -111,6 +111,9 @@ public class SdDataSourceBLE extends SdDataSource {
public static String SERV_INFINITIME_MOTION = "00030000-78fc-48fe-8e23-433b3a1942d0"; public static String SERV_INFINITIME_MOTION = "00030000-78fc-48fe-8e23-433b3a1942d0";
public static String CHAR_INFINITIME_ACC_DATA = "00030002-78fc-48fe-8e23-433b3a1942d0"; public static String CHAR_INFINITIME_ACC_DATA = "00030002-78fc-48fe-8e23-433b3a1942d0";
public static String CHAR_BATT_DATA = "00002a19-0000-1000-8000-00805f9b34fb";
public static String SERV_BATT = "0000180f-0000-1000-8000-00805f9b34fb";
// 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";
private BluetoothGatt mGatt; private BluetoothGatt mGatt;
@@ -284,7 +287,9 @@ public class SdDataSourceBLE extends SdDataSource {
setCharacteristicNotification(gattCharacteristic, true); setCharacteristicNotification(gattCharacteristic, true);
} else if (charUuidStr.equals(CHAR_OSD_BATT_DATA)) { } else if (charUuidStr.equals(CHAR_OSD_BATT_DATA)) {
Log.v(TAG, "Subscribing to battery change Notifications"); Log.v(TAG, "Subscribing to battery change Notifications");
executeReadCharacteristic(gattCharacteristic);
setCharacteristicNotification(gattCharacteristic, true); setCharacteristicNotification(gattCharacteristic, true);
executeReadCharacteristic(gattCharacteristic);
} else if (charUuidStr.equals(CHAR_OSD_WATCH_ID)) { } else if (charUuidStr.equals(CHAR_OSD_WATCH_ID)) {
Log.v(TAG, "Reading Watch ID"); Log.v(TAG, "Reading Watch ID");
executeReadCharacteristic(gattCharacteristic); executeReadCharacteristic(gattCharacteristic);
@@ -308,6 +313,18 @@ public class SdDataSourceBLE extends SdDataSource {
setCharacteristicNotification(gattCharacteristic, true); setCharacteristicNotification(gattCharacteristic, true);
} }
} }
} else if (uuidStr.equals(SERV_BATT)) {
Log.v(TAG, "Battery Data Service Service Discovered");
for (BluetoothGattCharacteristic gattCharacteristic : gattCharacteristics) {
String charUuidStr = gattCharacteristic.getUuid().toString();
Log.v(TAG,"batt char="+charUuidStr);
if (charUuidStr.equals(CHAR_BATT_DATA)) {
Log.v(TAG, "Subscribing to Battery Data Change Notifications");
setCharacteristicNotification(gattCharacteristic, true);
Log.v(TAG, "Reading battery level");
executeReadCharacteristic(gattCharacteristic);
}
}
} }
} }
if (foundOsdService) { if (foundOsdService) {
@@ -373,7 +390,7 @@ public class SdDataSourceBLE extends SdDataSource {
* If the data is acceleration data, we add it to a buffer - it is analysed once the buffer is full. * If the data is acceleration data, we add it to a buffer - it is analysed once the buffer is full.
* Heart rate data is written directly to sdData to be used in future analysis. * Heart rate data is written directly to sdData to be used in future analysis.
*/ */
//Log.v(TAG,"onDataReceived: Characteristic="+characteristic.getUuid().toString()); Log.v(TAG,"onDataReceived: Characteristic="+characteristic.getUuid().toString());
if (characteristic.getUuid().toString().equals(CHAR_HEART_RATE_MEASUREMENT)) { if (characteristic.getUuid().toString().equals(CHAR_HEART_RATE_MEASUREMENT)) {
int flag = characteristic.getProperties(); int flag = characteristic.getProperties();
//Log.d(TAG,"onDataReceived() - flag = "+flag); //Log.d(TAG,"onDataReceived() - flag = "+flag);
@@ -395,8 +412,8 @@ public class SdDataSourceBLE extends SdDataSource {
byte[] rawDataBytes = characteristic.getValue(); byte[] rawDataBytes = characteristic.getValue();
short[] newAccVals = parseDataToAccVals(rawDataBytes); short[] newAccVals = parseDataToAccVals(rawDataBytes);
Log.v(TAG, "onDataReceived(): CHAR_OSD_ACC_DATA: numSamples = " + rawDataBytes.length+" nRawData="+nRawData); Log.v(TAG, "onDataReceived(): CHAR_OSD_ACC_DATA: numSamples = " + rawDataBytes.length+" nRawData="+nRawData);
Log.v(TAG, "onDataReceived() - rawDataBytes="+ Arrays.toString(rawDataBytes)); //Log.v(TAG, "onDataReceived() - rawDataBytes="+ Arrays.toString(rawDataBytes));
Log.v(TAG, "onDataReceived() - newAccVals="+Arrays.toString(newAccVals)); //Log.v(TAG, "onDataReceived() - newAccVals="+Arrays.toString(newAccVals));
for (int i = 0; i < newAccVals.length;i++) { for (int i = 0; i < newAccVals.length;i++) {
if (nRawData < MAX_RAW_DATA ) { if (nRawData < MAX_RAW_DATA ) {
switch (mAccFmt) { switch (mAccFmt) {
@@ -455,6 +472,12 @@ public class SdDataSourceBLE extends SdDataSource {
Log.v(TAG,"onDataReceived(): CHAR_OSD_BATT_DATA: " + String.format("%d", batteryPc)); Log.v(TAG,"onDataReceived(): CHAR_OSD_BATT_DATA: " + String.format("%d", batteryPc));
mSdData.haveSettings = true; mSdData.haveSettings = true;
} }
else if (characteristic.getUuid().toString().equals(CHAR_BATT_DATA)) {
byte batteryPc = characteristic.getValue()[0];
mSdData.batteryPc = batteryPc;
Log.v(TAG,"onDataReceived(): CHAR_BATT_DATA: " + String.format("%d", batteryPc));
mSdData.haveSettings = true;
}
else if (characteristic.getUuid().toString().equals(CHAR_OSD_WATCH_ID)) { else if (characteristic.getUuid().toString().equals(CHAR_OSD_WATCH_ID)) {
byte[] rawDataBytes = characteristic.getValue(); byte[] rawDataBytes = characteristic.getValue();
String watchId = new String(rawDataBytes, StandardCharsets.UTF_8); String watchId = new String(rawDataBytes, StandardCharsets.UTF_8);