mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-02-06 17:13:36 +01:00
Code Issues Releases Wiki Activity

Refactor: Move scale-specific descriptor UUID into subclasses

Browse Source
This commit is contained in:
Martin Nowack 2017-08-04 09:20:39 +02:00
parent 73303c2eca
commit 5c1184e671
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
View File

@ -51,7 +51,6 @@ public abstract class BluetoothCommunication {
private int cleanupStepNr; private int cleanupStepNr;
private BT_MACHINE_STATE btMachineState; private BT_MACHINE_STATE btMachineState;
private final UUID WEIGHT_MEASUREMENT_CONFIG = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
public BluetoothCommunication(Context context) public BluetoothCommunication(Context context)
{ {
@ -284,13 +283,13 @@ public abstract class BluetoothCommunication {
* @param service the Bluetooth UUID device service * @param service the Bluetooth UUID device service
* @param characteristic the Bluetooth UUID characteristic * @param characteristic the Bluetooth UUID characteristic
*/ */
protected void setInidicationOn(UUID service, UUID characteristic) { protected void setIndicationOn(UUID service, UUID characteristic, UUID descriptor) {
BluetoothGattCharacteristic gattCharacteristic = bluetoothGatt.getService(service) BluetoothGattCharacteristic gattCharacteristic = bluetoothGatt.getService(service)
.getCharacteristic(characteristic); .getCharacteristic(characteristic);
bluetoothGatt.setCharacteristicNotification(gattCharacteristic, true); bluetoothGatt.setCharacteristicNotification(gattCharacteristic, true);
BluetoothGattDescriptor gattDescriptor = gattCharacteristic.getDescriptor(WEIGHT_MEASUREMENT_CONFIG); BluetoothGattDescriptor gattDescriptor = gattCharacteristic.getDescriptor(descriptor);
gattDescriptor.setValue(BluetoothGattDescriptor.ENABLE_INDICATION_VALUE); gattDescriptor.setValue(BluetoothGattDescriptor.ENABLE_INDICATION_VALUE);
bluetoothGatt.writeDescriptor(gattDescriptor); bluetoothGatt.writeDescriptor(gattDescriptor);
@ -302,13 +301,13 @@ public abstract class BluetoothCommunication {
* @param service the Bluetooth UUID device service * @param service the Bluetooth UUID device service
* @param characteristic the Bluetooth UUID characteristic * @param characteristic the Bluetooth UUID characteristic
*/ */
protected void setNotificationOn(UUID service, UUID characteristic) { protected void setNotificationOn(UUID service, UUID characteristic, UUID descriptor) {
BluetoothGattCharacteristic gattCharacteristic = bluetoothGatt.getService(service) BluetoothGattCharacteristic gattCharacteristic = bluetoothGatt.getService(service)
.getCharacteristic(characteristic); .getCharacteristic(characteristic);
bluetoothGatt.setCharacteristicNotification(gattCharacteristic, true); bluetoothGatt.setCharacteristicNotification(gattCharacteristic, true);
BluetoothGattDescriptor gattDescriptor = gattCharacteristic.getDescriptor(WEIGHT_MEASUREMENT_CONFIG); BluetoothGattDescriptor gattDescriptor = gattCharacteristic.getDescriptor(descriptor);
gattDescriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE); gattDescriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
bluetoothGatt.writeDescriptor(gattDescriptor); bluetoothGatt.writeDescriptor(gattDescriptor);
} }
@ -319,13 +318,13 @@ public abstract class BluetoothCommunication {
* @param service the Bluetooth UUID device service * @param service the Bluetooth UUID device service
* @param characteristic the Bluetooth UUID characteristic * @param characteristic the Bluetooth UUID characteristic
*/ */
protected void setNotificationOff(UUID service, UUID characteristic) { protected void setNotificationOff(UUID service, UUID characteristic, UUID descriptor) {
BluetoothGattCharacteristic gattCharacteristic = bluetoothGatt.getService(service) BluetoothGattCharacteristic gattCharacteristic = bluetoothGatt.getService(service)
.getCharacteristic(characteristic); .getCharacteristic(characteristic);
bluetoothGatt.setCharacteristicNotification(gattCharacteristic, false); bluetoothGatt.setCharacteristicNotification(gattCharacteristic, false);
BluetoothGattDescriptor gattDescriptor = gattCharacteristic.getDescriptor(WEIGHT_MEASUREMENT_CONFIG); BluetoothGattDescriptor gattDescriptor = gattCharacteristic.getDescriptor(descriptor);
gattDescriptor.setValue(BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE); gattDescriptor.setValue(BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE);
bluetoothGatt.writeDescriptor(gattDescriptor); bluetoothGatt.writeDescriptor(gattDescriptor);
} }

6
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMedisanaBS444.java
View File

@ -82,15 +82,15 @@ public class BluetoothMedisanaBS444 extends BluetoothCommunication {
switch (stateNr) { switch (stateNr) {
case 0: case 0:
// set indication on for feature characteristic // set indication on for feature characteristic
setInidicationOn(WEIGHT_MEASUREMENT_SERVICE, FEATURE_MEASUREMENT_CHARACTERISTIC); setIndicationOn(WEIGHT_MEASUREMENT_SERVICE, FEATURE_MEASUREMENT_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 1: case 1:
// set indication on for weight measurement // set indication on for weight measurement
setInidicationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC); setIndicationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 2: case 2:
// set indication on for custom5 measurement // set indication on for custom5 measurement
setInidicationOn(WEIGHT_MEASUREMENT_SERVICE, CUSTOM5_MEASUREMENT_CHARACTERISTIC); setIndicationOn(WEIGHT_MEASUREMENT_SERVICE, CUSTOM5_MEASUREMENT_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 3: case 3:
// send magic number to receive weight data // send magic number to receive weight data

10
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMiScale.java
View File

@ -133,7 +133,7 @@ public class BluetoothMiScale extends BluetoothCommunication {
break; break;
case 2: case 2:
// set notification on for weight measurement history // set notification on for weight measurement history
setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC); setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 3: case 3:
// Set on history weight measurement // Set on history weight measurement
@ -153,11 +153,11 @@ public class BluetoothMiScale extends BluetoothCommunication {
switch (stateNr) { switch (stateNr) {
case 0: case 0:
// set notification on for weight measurement // set notification on for weight measurement
setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC); setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 1: case 1:
// set notification on for weight measurement history // set notification on for weight measurement history
setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC); setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 2: case 2:
// configure scale to get only last measurements // configure scale to get only last measurements
@ -168,11 +168,11 @@ public class BluetoothMiScale extends BluetoothCommunication {
break; break;
case 3: case 3:
// set notification off for weight measurement history // set notification off for weight measurement history
setNotificationOff(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC); setNotificationOff(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 4: case 4:
// set notification on for weight measurement history // set notification on for weight measurement history
setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC); setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 5: case 5:
// invoke receiving history data // invoke receiving history data