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

Added support for a battery level characteristic.

Browse Source
This commit is contained in:
Graham Jones
2020-08-12 20:42:45 +01:00
parent 4bafd15d7e
commit 3cc11dfab8
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,9 +87,12 @@ public class SdDataSourceBLE extends SdDataSource {
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";
public static String CHAR_OSD_ACC_DATA = "a19585e9-0002-39d0-015f-b3e2b9a0c854"; public static String CHAR_OSD_ACC_DATA = "a19585e9-0002-39d0-015f-b3e2b9a0c854";
public static String CHAR_OSD_BATT_DATA = "a19585e9-0004-39d0-015f-b3e2b9a0c854";
public final static UUID UUID_HEART_RATE_MEASUREMENT = UUID.fromString(CHAR_HEART_RATE_MEASUREMENT); public final static UUID UUID_HEART_RATE_MEASUREMENT = UUID.fromString(CHAR_HEART_RATE_MEASUREMENT);
private BluetoothGatt mGatt;
private BluetoothGattCharacteristic mBattChar;
public SdDataSourceBLE(Context context, Handler handler, public SdDataSourceBLE(Context context, Handler handler,
@@ -229,9 +232,14 @@ public class SdDataSourceBLE extends SdDataSource {
Log.v(TAG, "Subscribing to Acceleration Data Change Notifications"); Log.v(TAG, "Subscribing to Acceleration Data Change Notifications");
setCharacteristicNotification(gattCharacteristic,true); setCharacteristicNotification(gattCharacteristic,true);
} }
else if (charUuidStr.equals(CHAR_OSD_BATT_DATA)) {
Log.v(TAG,"Saving battery characteristic for later");
mBattChar = gattCharacteristic;
} }
} }
} }
}
mGatt = gatt;
} else { } else {
Log.w(TAG, "onServicesDiscovered received: " + status); Log.w(TAG, "onServicesDiscovered received: " + status);
} }
@@ -263,7 +271,6 @@ public class SdDataSourceBLE extends SdDataSource {
nRawData++; nRawData++;
} else { } else {
Log.i(TAG, "RawData Buffer Full - processing data"); Log.i(TAG, "RawData Buffer Full - processing data");
// FIXME - Create JSON object to send to the SdDataSource analysis routine onDataReceived().
// Re-start collecting raw data. // Re-start collecting raw data.
mSdData.watchAppRunning = true; mSdData.watchAppRunning = true;
for (i = 0; i < rawData.length; i++) { for (i = 0; i < rawData.length; i++) {
@@ -273,15 +280,23 @@ public class SdDataSourceBLE extends SdDataSource {
//mNSamp = accelVals.length(); //mNSamp = accelVals.length();
mWatchAppRunningCheck = true; mWatchAppRunningCheck = true;
mDataStatusTime = new Time(Time.getCurrentTimezone()); mDataStatusTime = new Time(Time.getCurrentTimezone());
// FIXME - A fiddle to make the startup activity close - really need to send battery percentage every now and then.
mSdData.haveSettings = true; if (mSdData.haveSettings == false) {
Log.v(TAG,"Requesting Battery Data");
mGatt.readCharacteristic(mBattChar);
}
doAnalysis(); doAnalysis();
nRawData = 0; nRawData = 0;
} }
} }
} }
else if (characteristic.getUuid().toString().equals(CHAR_OSD_BATT_DATA)) {
mSdData.batteryPc = characteristic.getValue()[0];
Log.v(TAG,"Received Battery Data");
mSdData.haveSettings = true;
}
else { else {
Log.v(TAG,"Unrecognised Characteristic Updated "+ Log.v(TAG,"Unrecognised Characteristic Updated "+
characteristic.getUuid().toString()); characteristic.getUuid().toString());