diff --git a/CHANGELOG.md b/CHANGELOG.md index b783972..74de59f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ OpenSeizureDetector Android App - Change Log ============================================ - V4.2.8 - Fixed crash in export data function when using european style comma based decimal separator. + + V4.2.8 - Fixed BLE2 data source to work with BangleJS2 watches + - Fixed crash in export data function when using european style comma based decimal separator. V4.2.7 - BLE2 data source re-start fixed?? V4.2.6 - Fixed problem with notifications in Android 13 - Improved start-up checks for permissions diff --git a/app/src/main/java/uk/org/openseizuredetector/FragmentSystem.java b/app/src/main/java/uk/org/openseizuredetector/FragmentSystem.java index 95917ab..580de60 100644 --- a/app/src/main/java/uk/org/openseizuredetector/FragmentSystem.java +++ b/app/src/main/java/uk/org/openseizuredetector/FragmentSystem.java @@ -74,16 +74,16 @@ public class FragmentSystem extends FragmentOsdBaseClass { if (mConnection.mBound) { if (mConnection.mSdServer.mSdDataSourceName.equals("Phone")) { if (mConnection.mSdServer.mLogNDA) - tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone" + " " + "(Demo Mode)" + "\nNDA Logging"); + tv.setText(getString(R.string.ServerRunningOK) + " " + getString(R.string.DataSource) + " = " + "Phone" + " " + "(Demo Mode)" + "\nNDA Logging"); else - tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + "Phone" + " " + "(Demo Mode)"); + tv.setText(getString(R.string.ServerRunningOK) + " " + getString(R.string.DataSource) + " = " + "Phone" + " " + "(Demo Mode)"); tv.setBackgroundColor(warnColour); tv.setTextColor(warnTextColour); } else { if (mConnection.mSdServer.mLogNDA) - tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName + ": NDA Logging"); + tv.setText(getString(R.string.ServerRunningOK) + " " + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName + ": NDA Logging"); else - tv.setText(getString(R.string.ServerRunningOK) + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName); + tv.setText(getString(R.string.ServerRunningOK) + " " + getString(R.string.DataSource) + " = " + mConnection.mSdServer.mSdDataSourceName); tv.setBackgroundColor(okColour); tv.setTextColor(okTextColour); } diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java index a1f532f..17875f4 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceBLE2.java @@ -265,14 +265,14 @@ public class SdDataSourceBLE2 extends SdDataSource { mHrChar = gattCharacteristic; peripheral.setNotify(service.getUuid(), gattCharacteristic.getUuid(), true); } else if (charUuidStr.equals(CHAR_OSD_ACC_DATA)) { - Log.i(TAG, "Subscribing to Acceleration Data Change Notifications"); + Log.i(TAG, "Subscribing to OSD Acceleration Data Change Notifications"); peripheral.setNotify(service.getUuid(), gattCharacteristic.getUuid(), true); mOsdChar = gattCharacteristic; } else if (charUuidStr.equals(CHAR_OSD_STATUS)) { Log.i(TAG, "Found OSD Status Characteristic"); mStatusChar = gattCharacteristic; } else if (charUuidStr.equals(CHAR_OSD_BATT_DATA)) { - Log.i(TAG, "Subscribing to battery change Notifications"); + Log.i(TAG, "Subscribing to OSD battery change Notifications"); peripheral.readCharacteristic(service.getUuid(), gattCharacteristic.getUuid()); peripheral.setNotify(service.getUuid(), gattCharacteristic.getUuid(), true); mBattChar = gattCharacteristic; @@ -360,6 +360,8 @@ public class SdDataSourceBLE2 extends SdDataSource { BluetoothBytesParser parser = new BluetoothBytesParser(value); String charUuidStr = characteristicUUID.toString(); + Log.v(TAG,"onCharacteristicUpdate() - Characteristic "+charUuidStr+" updated"); + if (charUuidStr.equals(CHAR_HEART_RATE_MEASUREMENT)) { Log.v(TAG, String.format("%s", "HR Measurement")); // Parse the flags diff --git a/app/src/main/res/values/datasource_list.xml b/app/src/main/res/values/datasource_list.xml index dc73409..ccaf47b 100644 --- a/app/src/main/res/values/datasource_list.xml +++ b/app/src/main/res/values/datasource_list.xml @@ -2,8 +2,8 @@ "Garmin Watch" - "Bluetooth Device" - "BLE2" + "BangleJS (BLE)" + "PineTime (BLE2)" "Pebble Watch" "Phone Sensor (for testing)" "Network (for Wifi Alerts)" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cad25c0..f49b232 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ OpenSeizureDetector "\n - \nV4.2.8 - fixed crash in export data function. + \nV4.2.8 - Fixed problem with BangleJS2 not working with new BLE2 data, fixed crash in export data function, fixed (rare) crash when re-opening app from background) \nV4.2.7 - Finally fixed BLE2 data source re-start after dropping connection? \nV4.2.6 - Fixed issues with Android 13 notifications and BLE data source shutdown. Added support for V2.x of Garmin watch app, Added new BLE2 data source, signal strength and battery level graphs. \nV4.2.4 - Fault alarm rather than crash if bluetooth system crashes.