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

Ignore duplicate data and save LBM

Browse Source 
Plus some cleanups. For #352
This commit is contained in:
Erik Johansson
2018-11-20 16:30:25 +01:00
parent 38e91f94f9
commit afa9d3425e
1 changed files with 48 additions and 18 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/BluetoothInlife.java
View File

@@ -25,6 +25,7 @@ import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;
import com.health.openscale.core.utils.Converters; import com.health.openscale.core.utils.Converters;
import java.util.Arrays;
import java.util.UUID; import java.util.UUID;
import timber.log.Timber; import timber.log.Timber;
@@ -37,6 +38,8 @@ public class BluetoothInlife extends BluetoothCommunication {
private final byte START_BYTE = 0x02; private final byte START_BYTE = 0x02;
private final byte END_BYTE = (byte)0xaa; private final byte END_BYTE = (byte)0xaa;
private byte[] lastData = null;
private int getActivityLevel(ScaleUser scaleUser) { private int getActivityLevel(ScaleUser scaleUser) {
switch (scaleUser.getActivityLevel()) { switch (scaleUser.getActivityLevel()) {
case SEDENTARY: case SEDENTARY:
@@ -51,6 +54,17 @@ public class BluetoothInlife extends BluetoothCommunication {
return 0; return 0;
} }
private void sendCommand(int command, byte[] parameters) {
byte[] data = {START_BYTE, (byte)command, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, END_BYTE};
if (parameters != null) {
for (int i = 0; i < parameters.length; ++i) {
data[i + 2] = parameters[i];
}
}
data[data.length - 2] = xorChecksum(data, 1, data.length - 3);
writeBytes(WEIGHT_SERVICE, WEIGHT_CMD_CHARACTERISTIC, data);
}
public BluetoothInlife(Context context) { public BluetoothInlife(Context context) {
super(context); super(context);
} }
@@ -74,11 +88,8 @@ public class BluetoothInlife extends BluetoothCommunication {
byte userId = (byte)scaleUser.getId(); byte userId = (byte)scaleUser.getId();
byte age = (byte)scaleUser.getAge(); byte age = (byte)scaleUser.getAge();
byte height = (byte)scaleUser.getBodyHeight(); byte height = (byte)scaleUser.getBodyHeight();
byte[] data = {START_BYTE, (byte)0xd2, level, sex, userId, age, height,
0, 0, 0, 0, 0, 0, END_BYTE};
data[data.length - 2] = xorChecksum(data, 1, data.length - 3);
writeBytes(WEIGHT_SERVICE, WEIGHT_CMD_CHARACTERISTIC, data); sendCommand(0xd2, new byte[] {level, sex, userId, age, height});
break; break;
default: default:
return false; return false;
@@ -115,20 +126,40 @@ public class BluetoothInlife extends BluetoothCommunication {
return; return;
} }
if (Arrays.equals(data, lastData)) {
Timber.d("Ignoring duplicate data");
return;
}
lastData = data;
switch (data[1]) {
case (byte) 0x0f:
Timber.d("Scale disconnecting");
return;
case (byte) 0xd8:
float weight = Converters.fromUnsignedInt16Be(data, 2) / 10.0f;
Timber.d("Current weight %.2f kg", weight);
return;
case (byte) 0xdd:
break;
case (byte) 0xdf:
Timber.d("Data received by scale: %s", data[2] == 0 ? "OK" : "error");
return;
default:
Timber.d("Unknown command 0x%02x", data[1]);
return;
}
float weight = Converters.fromUnsignedInt16Be(data, 2) / 10.0f; float weight = Converters.fromUnsignedInt16Be(data, 2) / 10.0f;
if (data[1] == (byte)0xd8) {
Timber.d("Current weight %.2f kg", weight);
return;
}
if (data[1] != (byte)0xdd) {
Timber.d("Unknown command 0x%02x", data[1]);
return;
}
float lbm = Converters.fromUnsignedInt24Be(data, 4) / 1000.0f; float lbm = Converters.fromUnsignedInt24Be(data, 4) / 1000.0f;
// TODO: convert visceral factor to visceral fat
float visceralFactor = Converters.fromUnsignedInt16Be(data, 7) / 10.0f;
float bmr = Converters.fromUnsignedInt16Be(data, 9) / 10.0f;
Timber.d("Weight=%.1f, LBM=%.3f, visceral factor=%.1f, BMR=%.1f",
weight, lbm, visceralFactor, bmr);
final ScaleUser selectedUser = OpenScale.getInstance().getSelectedScaleUser(); final ScaleUser selectedUser = OpenScale.getInstance().getSelectedScaleUser();
switch (getActivityLevel(selectedUser)) { switch (getActivityLevel(selectedUser)) {
case 0: case 0:
@@ -153,11 +184,10 @@ public class BluetoothInlife extends BluetoothCommunication {
measurement.setWater(water); measurement.setWater(water);
measurement.setMuscle(muscle); measurement.setMuscle(muscle);
measurement.setBone(bone); measurement.setBone(bone);
measurement.setLbm(lbm);
addScaleData(measurement); addScaleData(measurement);
byte[] done = {START_BYTE, (byte)0xd4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, END_BYTE}; sendCommand(0xd4, null);
done[done.length - 2] = xorChecksum(done, 1, done.length - 3);
writeBytes(WEIGHT_SERVICE, WEIGHT_CMD_CHARACTERISTIC, done);
} }
} }