mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-29 02:59:57 +02:00
Code Issues Releases Wiki Activity

Ignore duplicate weight measurements (1byone)

Browse Source 
As reported in #159.
This commit is contained in:
Erik Johansson
2018-07-04 00:56:46 +02:00
parent e0331c54c0
commit a2543afe02
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,8 @@ public class BluetoothOneByone extends BluetoothCommunication {
private final UUID CMD_MEASUREMENT_CHARACTERISTIC = UUID.fromString("0000fff1-0000-1000-8000-00805f9b34fb"); // write only private final UUID CMD_MEASUREMENT_CHARACTERISTIC = UUID.fromString("0000fff1-0000-1000-8000-00805f9b34fb"); // write only
private final UUID WEIGHT_MEASUREMENT_CONFIG = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"); private final UUID WEIGHT_MEASUREMENT_CONFIG = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
private float lastWeight;
public BluetoothOneByone(Context context) { public BluetoothOneByone(Context context) {
super(context); super(context);
} }
@@ -50,6 +52,7 @@ public class BluetoothOneByone extends BluetoothCommunication {
protected boolean nextInitCmd(int stateNr) { protected boolean nextInitCmd(int stateNr) {
switch (stateNr) { switch (stateNr) {
case 0: case 0:
lastWeight = 0;
setIndicationOn(WEIGHT_MEASUREMENT_SERVICE_BODY_COMPOSITION, WEIGHT_MEASUREMENT_CHARACTERISTIC_BODY_COMPOSITION, WEIGHT_MEASUREMENT_CONFIG); setIndicationOn(WEIGHT_MEASUREMENT_SERVICE_BODY_COMPOSITION, WEIGHT_MEASUREMENT_CHARACTERISTIC_BODY_COMPOSITION, WEIGHT_MEASUREMENT_CONFIG);
break; break;
case 1: case 1:
@@ -104,10 +107,14 @@ public class BluetoothOneByone extends BluetoothCommunication {
Timber.d("weight: %.2f, impedance: %d", weight, impedance); Timber.d("weight: %.2f, impedance: %d", weight, impedance);
ScaleMeasurement scaleBtData = new ScaleMeasurement(); // This check should be a bit more elaborate, but it works for now...
if (weight != lastWeight) {
lastWeight = weight;
scaleBtData.setWeight(weight); ScaleMeasurement scaleBtData = new ScaleMeasurement();
scaleBtData.setWeight(weight);
addScaleData(scaleBtData); addScaleData(scaleBtData);
}
} }
} }