mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 16:53:04 +02:00
Code Issues Releases Wiki Activity

Merge #358 + some cleanup

Browse Source
This commit is contained in:
Erik Johansson
2018-11-27 20:14:37 +01:00
parent 9e3e592355 34baeb2296
commit b29d8a1e6d
1 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothSenssun.java
View File

@@ -35,8 +35,9 @@ public class BluetoothSenssun extends BluetoothCommunication {
private final UUID WEIGHT_MEASUREMENT_CHARACTERISTIC = BluetoothGattUuid.fromShortCode(0xfff1); // read, notify private final UUID WEIGHT_MEASUREMENT_CHARACTERISTIC = BluetoothGattUuid.fromShortCode(0xfff1); // read, notify
private final UUID CMD_MEASUREMENT_CHARACTERISTIC = BluetoothGattUuid.fromShortCode(0xfff2); // write only private final UUID CMD_MEASUREMENT_CHARACTERISTIC = BluetoothGattUuid.fromShortCode(0xfff2); // write only
private int gotData; private boolean scaleGotUserData;
private int FatMus = 0; long firstFixWeight = -1 ;
private byte WeightFatMus = 0;
private ScaleMeasurement measurement; private ScaleMeasurement measurement;
public BluetoothSenssun(Context context) { public BluetoothSenssun(Context context) {
@@ -48,7 +49,16 @@ public class BluetoothSenssun extends BluetoothCommunication {
return "Senssun"; return "Senssun";
} }
@Override
protected boolean doScanWhileConnecting() {
// Senssun seems to have problem connecting if scan is running (see ##309)
return false;
}
private void sendUserData() { private void sendUserData() {
if (scaleGotUserData) {
return;
}
final ScaleUser selectedUser = OpenScale.getInstance().getSelectedScaleUser(); final ScaleUser selectedUser = OpenScale.getInstance().getSelectedScaleUser();
byte gender = selectedUser.getGender().isMale() ? (byte)0xf1 : (byte)0x01; byte gender = selectedUser.getGender().isMale() ? (byte)0xf1 : (byte)0x01;
@@ -74,7 +84,9 @@ public class BluetoothSenssun extends BluetoothCommunication {
setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC, setNotificationOn(WEIGHT_MEASUREMENT_SERVICE, WEIGHT_MEASUREMENT_CHARACTERISTIC,
BluetoothGattUuid.DESCRIPTOR_CLIENT_CHARACTERISTIC_CONFIGURATION); BluetoothGattUuid.DESCRIPTOR_CLIENT_CHARACTERISTIC_CONFIGURATION);
sendUserData(); sendUserData();
gotData = 0; firstFixWeight = -1;
WeightFatMus = 0;
scaleGotUserData = false;
break; break;
default: default:
// Finish init if everything is done // Finish init if everything is done
@@ -100,17 +112,15 @@ public class BluetoothSenssun extends BluetoothCommunication {
// The first notification only includes weight and all other fields are // The first notification only includes weight and all other fields are
// either 0x00 (user info) or 0xff (fat, water, etc.) // either 0x00 (user info) or 0xff (fat, water, etc.)
if (data != null) { if (data != null && !isBitSet(WeightFatMus, 3)) { //only if not saved
parseBytes(data); parseBytes(data);
if (measurement != null && measurement.getWeight() != 0.0 && gotData == 0) { Timber.d("WFM %02X %d ", WeightFatMus, (System.currentTimeMillis() - firstFixWeight));
Timber.d("meas: %s", measurement); if (isBitSet(WeightFatMus, 2) && firstFixWeight > 0) {
if (((System.currentTimeMillis() - firstFixWeight) > 2500 && WeightFatMus == (1 << 2)) //wait 1.5 seconds for Data
|| WeightFatMus == 0x07) { // got all Data to save
addScaleData(measurement); addScaleData(measurement);
gotData = 1; WeightFatMus |= 1 << 3;
} }
if (measurement != null && measurement.getWeight() != 0.0 && FatMus == 0x03 && gotData != 2) {
Timber.d("meas: %s", measurement);
addScaleData(measurement);
gotData = 2;
} }
} }
} }
@@ -122,12 +132,23 @@ public class BluetoothSenssun extends BluetoothCommunication {
int type = weightBytes[6] & 0xff; int type = weightBytes[6] & 0xff;
Timber.d("type %02X", type); Timber.d("type %02X", type);
switch (type) { switch (type) {
case 0x00:
if (weightBytes[2] == (byte)0x10) {
scaleGotUserData = true;
}
break;
case 0xa0: case 0xa0:
sendUserData(); sendUserData();
break; break;
case 0xaa: case 0xaa:
float weight = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // kg float weight = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // kg
measurement.setWeight(weight); measurement.setWeight(weight);
if (!isBitSet(WeightFatMus, 2)) {
WeightFatMus |= 1 << 2 ;
firstFixWeight = System.currentTimeMillis() ;
}
sendUserData(); sendUserData();
break; break;
case 0xb0: case 0xb0:
@@ -135,14 +156,14 @@ public class BluetoothSenssun extends BluetoothCommunication {
float water = Converters.fromUnsignedInt16Be(weightBytes, 4) / 10.0f; // % float water = Converters.fromUnsignedInt16Be(weightBytes, 4) / 10.0f; // %
measurement.setFat(fat); measurement.setFat(fat);
measurement.setWater(water); measurement.setWater(water);
FatMus |= 0x2; WeightFatMus |= 1 << 1;
break; break;
case 0xc0: case 0xc0:
float bone = Converters.fromUnsignedInt16Le(weightBytes, 4) / 10.0f; // kg float bone = Converters.fromUnsignedInt16Le(weightBytes, 4) / 10.0f; // kg
float muscle = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // % float muscle = Converters.fromUnsignedInt16Be(weightBytes, 2) / 10.0f; // %
measurement.setMuscle(muscle); measurement.setMuscle(muscle);
measurement.setBone(bone); measurement.setBone(bone);
FatMus |= 0x1; WeightFatMus |= 1;
break; break;
case 0xd0: case 0xd0:
float calorie = Converters.fromUnsignedInt16Be(weightBytes, 2); float calorie = Converters.fromUnsignedInt16Be(weightBytes, 2);
@@ -155,8 +176,6 @@ public class BluetoothSenssun extends BluetoothCommunication {
//date //date
break; break;
} }
//measurement.setDateTime(lastWeighted);
measurement.setDateTime(new Date()); measurement.setDateTime(new Date());
} }
} }