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

CGMS improvements

Browse Source
This commit is contained in:
Aleksander Nowakowski
2018-04-19 22:12:28 +02:00
parent 1603a0dcb3
commit 1fa7c98fb3
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSData.java
View File

@@ -1,13 +0,0 @@
package no.nordicsemi.android.nrftoolbox.cgms;
import no.nordicsemi.android.ble.data.Data;
public class CGMSData {
private static final byte OP_CODE_START_SESSION = 26;
static Data startSession() {
return new Data(OP_CODE_START_SESSION);
}
}

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManager.java
View File

@@ -119,10 +119,10 @@ public class CGMSManager extends BatteryManager<CGMSManagerCallbacks> {
@Override
protected void initialize(@NonNull final BluetoothDevice device) {
super.initialize(device);
mSessionStartTime = System.currentTimeMillis();
enableNotifications(mCGMMeasurementCharacteristic);
enableIndications(mCGMOpsControlPointCharacteristic);
writeCharacteristic(mCGMOpsControlPointCharacteristic, CGMSData.startSession());
enableIndications(mCGMOpsControlPointCharacteristic)
.done(() -> mSessionStartTime = System.currentTimeMillis());
writeCharacteristic(mCGMOpsControlPointCharacteristic, new byte[] { 26 });
enableIndications(mRecordAccessControlPointCharacteristic);
}

17
app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManagerCallbacks.java
View File

@@ -23,6 +23,7 @@
package no.nordicsemi.android.nrftoolbox.cgms;
import android.bluetooth.BluetoothDevice;
import android.support.annotation.NonNull;
import no.nordicsemi.android.ble.BleManagerCallbacks;
import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks;
@@ -31,20 +32,20 @@ public interface CGMSManagerCallbacks extends BatteryManagerCallbacks {
/**
* Called when new CGM value has been obtained from the sensor.
*/
void onCGMValueReceived(final BluetoothDevice device, final CGMSRecord record);
void onCGMValueReceived(final @NonNull BluetoothDevice device, final CGMSRecord record);
void onOperationStarted(final BluetoothDevice device);
void onOperationStarted(final @NonNull BluetoothDevice device);
void onOperationCompleted(final BluetoothDevice device);
void onOperationCompleted(final @NonNull BluetoothDevice device);
void onOperationFailed(final BluetoothDevice device);
void onOperationFailed(final @NonNull BluetoothDevice device);
void onOperationAborted(final BluetoothDevice device);
void onOperationAborted(final @NonNull BluetoothDevice device);
void onOperationNotSupported(final BluetoothDevice device);
void onOperationNotSupported(final @NonNull BluetoothDevice device);
void onDatasetClear(final BluetoothDevice device);
void onDatasetClear(final @NonNull BluetoothDevice device);
void onNumberOfRecordsRequested(final BluetoothDevice device, final int value);
void onNumberOfRecordsRequested(final @NonNull BluetoothDevice device, final int value);
}

28
app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMService.java
View File

@@ -8,6 +8,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.support.annotation.NonNull;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.util.SparseArray;
@@ -32,6 +33,9 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
public static final String EXTRA_CGMS_RECORD = "no.nordicsemi.android.nrftoolbox.cgms.EXTRA_CGMS_RECORD";
public static final String EXTRA_DATA = "no.nordicsemi.android.nrftoolbox.cgms.EXTRA_DATA";
public static final String BROADCAST_BATTERY_LEVEL = "no.nordicsemi.android.nrftoolbox.BROADCAST_BATTERY_LEVEL";
public static final String EXTRA_BATTERY_LEVEL = "no.nordicsemi.android.nrftoolbox.EXTRA_BATTERY_LEVEL";
private final static int NOTIFICATION_ID = 229;
private final static int OPEN_ACTIVITY_REQ = 0;
private final static int DISCONNECT_REQ = 1;
@@ -213,7 +217,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
};
@Override
public void onCGMValueReceived(final BluetoothDevice device, final CGMSRecord record) {
public void onCGMValueReceived(@NonNull final BluetoothDevice device, final CGMSRecord record) {
final Intent broadcast = new Intent(BROADCAST_NEW_CGMS_VALUE);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
broadcast.putExtra(EXTRA_CGMS_RECORD, record);
@@ -221,7 +225,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
}
@Override
public void onOperationStarted(final BluetoothDevice device) {
public void onOperationStarted(@NonNull final BluetoothDevice device) {
final Intent broadcast = new Intent(OPERATION_STARTED);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
broadcast.putExtra(EXTRA_DATA, true);
@@ -229,7 +233,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
}
@Override
public void onOperationCompleted(final BluetoothDevice device) {
public void onOperationCompleted(@NonNull final BluetoothDevice device) {
final Intent broadcast = new Intent(OPERATION_COMPLETED);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
broadcast.putExtra(EXTRA_DATA, true);
@@ -237,7 +241,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
}
@Override
public void onOperationFailed(final BluetoothDevice device) {
public void onOperationFailed(@NonNull final BluetoothDevice device) {
final Intent broadcast = new Intent(OPERATION_FAILED);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
broadcast.putExtra(EXTRA_DATA, true);
@@ -245,7 +249,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
}
@Override
public void onOperationAborted(final BluetoothDevice device) {
public void onOperationAborted(@NonNull final BluetoothDevice device) {
final Intent broadcast = new Intent(OPERATION_ABORTED);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
broadcast.putExtra(EXTRA_DATA, true);
@@ -253,7 +257,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
}
@Override
public void onOperationNotSupported(final BluetoothDevice device) {
public void onOperationNotSupported(@NonNull final BluetoothDevice device) {
final Intent broadcast = new Intent(OPERATION_NOT_SUPPORTED);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
broadcast.putExtra(EXTRA_DATA, false);
@@ -261,14 +265,22 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback
}
@Override
public void onDatasetClear(final BluetoothDevice device) {
public void onDatasetClear(@NonNull final BluetoothDevice device) {
final Intent broadcast = new Intent(BROADCAST_DATA_SET_CLEAR);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
}
@Override
public void onNumberOfRecordsRequested(final BluetoothDevice device, int value) {
public void onNumberOfRecordsRequested(@NonNull final BluetoothDevice device, int value) {
showToast(getResources().getQuantityString(R.plurals.gls_progress, value, value));
}
@Override
public void onBatteryLevelChanged(@NonNull final BluetoothDevice device, final int value) {
final Intent broadcast = new Intent(BROADCAST_BATTERY_LEVEL);
broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice());
broadcast.putExtra(EXTRA_BATTERY_LEVEL, value);
LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);
}
}