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

Add Medisana BS430 to list of supported scales

Browse Source
This commit is contained in:
Ivan Vershinin
2018-12-14 10:51:05 +02:00
parent 99e3f88a4c
commit ca3c210000
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothFactory.java
View File

@@ -59,8 +59,14 @@ public class BluetoothFactory {
}
// BS444 || BS440
if (deviceName.startsWith("013197") || deviceName.startsWith("0202B6")) {
return new BluetoothMedisanaBS44x(context);
return new BluetoothMedisanaBS44x(context, true);
}
//BS430
if (deviceName.startsWith("0203B")) {
return new BluetoothMedisanaBS44x(context, false);
}
if (deviceName.startsWith("SWAN") || name.equals("icomon".toLowerCase(Locale.US))) {
return new BluetoothMGB(context);
}

14
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothMedisanaBS44x.java
View File

@@ -34,12 +34,16 @@ public class BluetoothMedisanaBS44x extends BluetoothCommunication {
private ScaleMeasurement btScaleMeasurement;
private boolean applyOffset;
// Scale time is in seconds since 2010-01-01
private static final long SCALE_UNIX_TIMESTAMP_OFFSET = 1262304000;
public BluetoothMedisanaBS44x(Context context) {
public BluetoothMedisanaBS44x(Context context, boolean applyOffset) {
super(context);
btScaleMeasurement = new ScaleMeasurement();
this.applyOffset = applyOffset;
}
@Override
@@ -79,7 +83,9 @@ public class BluetoothMedisanaBS44x extends BluetoothCommunication {
case 3:
// send magic number to receive weight data
long timestamp = new Date().getTime() / 1000;
timestamp -= SCALE_UNIX_TIMESTAMP_OFFSET;
if(applyOffset){
timestamp -= SCALE_UNIX_TIMESTAMP_OFFSET;
}
byte[] date = Converters.toInt32Le(timestamp);
byte[] magicBytes = new byte[] {(byte)0x02, date[0], date[1], date[2], date[3]};
@@ -117,7 +123,9 @@ public class BluetoothMedisanaBS44x extends BluetoothCommunication {
private void parseWeightData(byte[] weightData) {
float weight = Converters.fromUnsignedInt16Le(weightData, 1) / 100.0f;
long timestamp = Converters.fromUnsignedInt32Le(weightData, 5);
timestamp += SCALE_UNIX_TIMESTAMP_OFFSET;
if (applyOffset) {
timestamp += SCALE_UNIX_TIMESTAMP_OFFSET;
}
btScaleMeasurement.setDateTime(new Date(timestamp * 1000));
btScaleMeasurement.setWeight(weight);