1
0
mirror of https://github.com/oliexdev/openScale.git synced 2025-09-09 08:00:39 +02:00

crop milliseconds and seconds to avoid duplicate entries and set visceral fat for Exingtech Y1

This commit is contained in:
OliE
2018-05-31 09:00:08 +02:00
parent e4981f2240
commit 6f31417e2e

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.utils.Converters;
import java.util.Calendar;
import java.util.Date;
import java.util.UUID;
@@ -98,7 +99,7 @@ public class BluetoothExingtechY1 extends BluetoothCommunication {
float water = Converters.fromUnsignedInt16Be(weightBytes, 8) / 10.0f; // %
float bone = Converters.fromUnsignedInt16Be(weightBytes, 10) / 10.0f; // kg
float muscle = Converters.fromUnsignedInt16Be(weightBytes, 12) / 10.0f; // %
float visc_muscle = weightBytes[14] & 0xFF; // %
float visc_fat = weightBytes[14] & 0xFF; // %
float calorie = Converters.fromUnsignedInt16Be(weightBytes, 15);
float bmi = Converters.fromUnsignedInt16Be(weightBytes, 17) / 10.0f;
@@ -111,7 +112,12 @@ public class BluetoothExingtechY1 extends BluetoothCommunication {
scaleBtData.setMuscle(muscle);
scaleBtData.setWater(water);
scaleBtData.setBone(bone);
scaleBtData.setDateTime(new Date());
scaleBtData.setVisceralFat(visc_fat);
Calendar dateTime = Calendar.getInstance();
dateTime.set(Calendar.MILLISECOND, 0);
dateTime.set(Calendar.SECOND, 0);
scaleBtData.setDateTime(dateTime.getTime());
addScaleData(scaleBtData);
}