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

Updated BLE data source to handle 0x00 or 0xff as fault values, and fix issue with data being received multiple times after pinetime watch goes out of range and then returns.

Browse Source
This commit is contained in:
Graham Jones
2024-01-18 11:08:08 +00:00
parent 99b925cbd6
commit 65c8a2a12b
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:versionCode="128"
android:versionName="4.2.1k">
android:versionName="4.2.1l">
<!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -44,11 +44,12 @@
<activity
android:name=".MainActivity2"
android:exported="false" />
<activity
<!--<activity
android:name=".MlModelManager"
android:exported="false"
android:label="@string/title_activity_ml_model_manager"
android:theme="@style/AppTheme" />
-->
<activity android:name=".AuthenticateActivity" /> <!-- @android:style/Theme.Holo.Light" -->
<activity android:name=".BLEScanActivity" />
<activity android:name=".ExportDataActivity" /> <!-- android:usesCleartextTraffic="true" -->

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

@@ -243,14 +243,16 @@ public class SdDataSourceBLE extends SdDataSource {
} else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
mConnectionState = STATE_DISCONNECTED;
mSdData.watchConnected = false;
Log.i(TAG, "onConnectionStateChange(): Disconnected from GATT server - reconnecting after delay...");
//bleDisconnect(); // Tidy up connections
Log.i(TAG, "onConnectionStateChange(): Disconnected from GATT server");
/**Log.i(TAG, "onConnectionStateChange(): Disconnected from GATT server - reconnecting after delay...");
bleDisconnect(); // Tidy up connections
// Wait 2 seconds to give the server chance to shutdown, then re-start it
mHandler.postDelayed(new Runnable() {
public void run() {
bleConnect();
}
}, 2000);
*/
}
}
@@ -403,7 +405,13 @@ public class SdDataSourceBLE extends SdDataSource {
//Log.d(TAG, "onDataReceived(): Heart rate format UINT8.");
}
final int heartRate = characteristic.getIntValue(format, 1); // heart rate is second byte
mSdData.mHR = (double) heartRate;
// We normally use -1 for fault indication, but the BLE standard is for one byte for heart
// rate services, so we can't send -1, so treat either 0 or 255 as fault.
if (heartRate == 255 || heartRate == 0) {
mSdData.mHR = -1;
} else {
mSdData.mHR = (double) heartRate;
}
Log.d(TAG, String.format("onDataReceived(): CHAR_HEART_RATE_MEASUREMENT: %d", heartRate));
}
else if (characteristic.getUuid().toString().equals(CHAR_OSD_ACC_DATA)