aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-24 01:44:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes required for BLE Library 2.2.0-alpha06

Browse Source
This commit is contained in:
Aleksander Nowakowski
2020-01-31 15:06:16 +01:00
parent a5440a40c0
commit 26d218e551
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -57,11 +57,11 @@ dependencies {
// Import the BLE Common Library.
// The BLE Common Library depends on BLE Library. It is enough to include the first one.
// implementation 'no.nordicsemi.android:ble-common:2.2.0-alpha05'
implementation 'no.nordicsemi.android:ble-common:2.2.0-alpha06'
// The BLE Common Library may be included from jcenter. If you want to modify the code,
// clone both projects from GitHub and replace the line above with the following
// (and also the according lines in the settings.gradle):
implementation project(':ble-common')
// implementation project(':ble-common')
implementation('org.simpleframework:simple-xml:2.7.1') {
exclude group: 'stax', module: 'stax-api'

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
View File

@@ -71,14 +71,14 @@ public class BPMManager extends BatteryManager<BPMManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new BloodPressureManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving notification, etc.
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private class BloodPressureManagerGattCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
@@ -161,5 +161,5 @@ public class BPMManager extends BatteryManager<BPMManagerCallbacks> {
icpCharacteristic = null;
bpmCharacteristic = null;
}
};
}
}

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManager.java
View File

@@ -87,14 +87,14 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new CGMManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving notification, etc.
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private class CGMManagerGattCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
@@ -327,7 +327,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
cgmSpecificOpsControlPointCharacteristic = null;
recordAccessControlPointCharacteristic = null;
}
};
}
/**
* Returns a list of CGM records obtained from this device. The key in the array is the

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
View File

@@ -60,14 +60,14 @@ public class CSCManager extends BatteryManager<CSCManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new CSCManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving indication, etc.
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private class CSCManagerGattCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
@@ -128,5 +128,5 @@ public class CSCManager extends BatteryManager<CSCManagerCallbacks> {
super.onDeviceDisconnected();
cscMeasurementCharacteristic = null;
}
};
}
}

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java
View File

@@ -88,14 +88,14 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new GlucoseManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving notification, etc.
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private class GlucoseManagerGattCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
@@ -285,7 +285,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
glucoseMeasurementContextCharacteristic = null;
recordAccessControlPointCharacteristic = null;
}
};
}
/**
* Returns all records as a sparse array where sequence number is the key.

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java
View File

@@ -76,14 +76,14 @@ public class HRManager extends BatteryManager<HRManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new HeartRateManagerCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving notification, etc.
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private final class HeartRateManagerCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
@@ -149,5 +149,5 @@ public class HRManager extends BatteryManager<HRManagerCallbacks> {
bodySensorLocationCharacteristic = null;
heartRateCharacteristic = null;
}
};
}
}

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManager.java
View File

@@ -62,14 +62,14 @@ public class HTManager extends BatteryManager<HTManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new HTManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving indication, etc..
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private class HTManagerGattCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
super.initialize();
@@ -107,5 +107,5 @@ public class HTManager extends BatteryManager<HTManagerCallbacks> {
super.onDeviceDisconnected();
htCharacteristic = null;
}
};
}
}

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java
View File

@@ -63,14 +63,14 @@ class ProximityManager extends BatteryManager<ProximityManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new ProximityManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving indication, etc.
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private class ProximityManagerGattCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
@@ -127,7 +127,7 @@ class ProximityManager extends BatteryManager<ProximityManagerCallbacks> {
// Reset the alert flag
alertOn = false;
}
};
}
/**
* Toggles the immediate alert on the target device.

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java
View File

@@ -78,14 +78,14 @@ public class TemplateManager extends BatteryManager<TemplateManagerCallbacks> {
@NonNull
@Override
protected BatteryManagerGattCallback getGattCallback() {
return gattCallback;
return new TemplateManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving indication, etc.
*/
private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() {
private class TemplateManagerGattCallback extends BatteryManagerGattCallback {
@Override
protected void initialize() {
@@ -205,7 +205,7 @@ public class TemplateManager extends BatteryManager<TemplateManagerCallbacks> {
})
.enqueue();
}
};
}
// TODO Define manager's API

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java
View File

@@ -60,14 +60,14 @@ public class UARTManager extends LoggableBleManager<UARTManagerCallbacks> {
@NonNull
@Override
protected BleManagerGattCallback getGattCallback() {
return gattCallback;
return new UARTManagerGattCallback();
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* receiving indication, etc.
*/
private final BleManagerGattCallback gattCallback = new BleManagerGattCallback() {
private class UARTManagerGattCallback extends BleManagerGattCallback {
@Override
protected void initialize() {
@@ -115,7 +115,7 @@ public class UARTManager extends LoggableBleManager<UARTManagerCallbacks> {
txCharacteristic = null;
useLongWrite = true;
}
};
}
// This has been moved to the service in BleManager v2.0.
/*@Override