mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-18 06:21:25 +02:00
Code Issues Releases Wiki Activity

Remove some unused test stuff and some minor cleanup

Browse Source
This commit is contained in:
Erik Johansson
2018-12-01 20:00:21 +01:00
parent 8138f385cb
commit b0f8cb0cb3
1 changed files with 8 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothBeurerSanitas.java
View File

@@ -68,8 +68,9 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
private byte[] measurementData;
private final int ID_START_NIBBLE_INIT = 6;
private final int ID_START_NIBBLE_CMD = 7;
private final int ID_START_NIBBLE_SET_TIME = 9;
private final int ID_START_NIBBLE_DISCONNECT = 0xa;
private final int ID_START_NIBBLE_DISCONNECT = 10;
private final byte CMD_SET_UNIT = (byte)0x4d;
private final byte CMD_SCALE_STATUS = (byte)0x4f;
@@ -99,7 +100,7 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
private final byte CMD_APP_ACK = (byte)0xf1;
private byte getAlternativeStartByte(int startNibble) {
return (byte) ((startByte & 0xF0) | (startNibble & 0x0F));
return (byte) ((startByte & 0xF0) | startNibble);
}
private long decodeUserId(byte[] data, int offset) {
@@ -145,11 +146,11 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
this.deviceType = deviceType;
switch (deviceType) {
case BEURER_BF700_800_RT_LIBRA:
startByte = (byte) 0xf7;
startByte = (byte) (0xf0 | ID_START_NIBBLE_CMD);
break;
case BEURER_BF710:
case SANITAS_SBF70_70:
startByte = (byte) 0xe7;
startByte = (byte) (0xe0 | ID_START_NIBBLE_CMD);
break;
}
}
@@ -215,9 +216,6 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
Timber.d("Request saved measurements for %s", currentRemoteUser.name);
sendCommand(CMD_GET_SAVED_MEASUREMENTS, encodeUserId(currentRemoteUser));
// Replace above command with this to delete the user (for test)
//sendCommand(CMD_USER_DELETE, encodeUserId(currentRemoteUser));
// Return to this state until all users have been processed
setNextCmd(stateNr);
pauseBtStateMachine();
@@ -248,15 +246,6 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
sendCommand(CMD_USER_DETAILS, encodeUserId(currentRemoteUser));
pauseBtStateMachine();
break;
case 8:
if (OpenScale.DEBUG_MODE) {
sendCommand(CMD_GET_UNKNOWN_MEASUREMENTS);
pauseBtStateMachine();
}
else {
postHandleRequest();
}
break;
default:
// Finish init if everything is done
return false;
@@ -332,9 +321,6 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
case CMD_MEASUREMENT:
processMeasurement(data);
break;
case CMD_UNKNOWN_MEASUREMENT_INFO:
processUnknownMeasurementInfo(data);
break;
case CMD_SCALE_ACK:
processScaleAck(data);
break;
@@ -455,26 +441,6 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
}
}
private void processUnknownMeasurementInfo(byte[] data) {
int count = data[2] & 0xFF;
int current = data[3] & 0xFF;
int mem = data[4] & 0xFF;
long timestamp = Converters.fromUnsignedInt32Be(data, 5);
float weight = getKiloGram(data, 9);
int impedance = Converters.fromUnsignedInt16Be(data, 11);
Timber.d("Unknown measurement %d/%d (%d): %.2f kg (%d), %s",
current, count, mem, weight, impedance,
new Date(timestamp * 1000));
sendAck(data);
if (current == count) {
resumeBtStateMachine();
}
}
private void processScaleAck(byte[] data) {
switch (data[2]) {
case CMD_SCALE_STATUS:
@@ -489,9 +455,9 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
final boolean userMeasurementExist = data[10] == 0;
final int scaleVersion = data[11] & 0xFF;
Timber.d("BatteryLevel: %d, weightThreshold: %.2f, BodyFatThreshold: %.2f,"
+ " Unit: %d, userExists: %b, UserReference Weight Exists: %b,"
+ " UserMeasurementExists: %b, scaleVersion: %d",
Timber.d("Battery level: %d; threshold: weight=%.2f, body fat=%.2f;"
+ " unit: %d; requested user: exists=%b, has reference weight=%b,"
+ " has measurement=%b; scale version: %d",
batteryLevel, weightThreshold, bodyFatThreshold, currentUnit, userExists,
userReferWeightExists, userMeasurementExist, scaleVersion);
@@ -564,22 +530,6 @@ public class BluetoothBeurerSanitas extends BluetoothCommunication {
setBtMachineState(BT_MACHINE_STATE.BT_CLEANUP_STATE);
break;
case CMD_USER_DELETE:
if (data[3] == 0) {
Timber.d("User successfully deleted");
int index = remoteUsers.indexOf(currentRemoteUser);
remoteUsers.remove(index);
if (index == 0) {
currentRemoteUser = null;
}
else {
currentRemoteUser = remoteUsers.get(index - 1);
}
}
resumeBtStateMachine();
break;
case CMD_DO_MEASUREMENT:
if (data[3] == 0) {
Timber.d("Measure command successfully received");