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

Inlife: use doubles when doing the calculations

Browse Source
This commit is contained in:
Erik Johansson
2018-11-21 08:16:00 +01:00
parent a3e4cdb977
commit 8ab7d17d7e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothInlife.java
View File

@@ -185,10 +185,10 @@ public class BluetoothInlife extends BluetoothCommunication {
} }
float fatKg = weight - lbm; float fatKg = weight - lbm;
float fat = (fatKg / weight) * 100.0f; double fat = (fatKg / weight) * 100.0;
float water = (0.73f * (weight - fatKg) / weight) * 100.0f; double water = (0.73f * (weight - fatKg) / weight) * 100.0;
float muscle = (0.548f * lbm / weight) * 100.0f; double muscle = (0.548 * lbm / weight) * 100.0;
float bone = 0.05158f * lbm; double bone = 0.05158 * lbm;
double visceral; double visceral;
final float height = selectedUser.getBodyHeight(); final float height = selectedUser.getBodyHeight();
@@ -221,10 +221,10 @@ public class BluetoothInlife extends BluetoothCommunication {
ScaleMeasurement measurement = new ScaleMeasurement(); ScaleMeasurement measurement = new ScaleMeasurement();
measurement.setWeight(weight); measurement.setWeight(weight);
measurement.setFat(fat); measurement.setFat((float) fat);
measurement.setWater(water); measurement.setWater((float) water);
measurement.setMuscle(muscle); measurement.setMuscle((float) muscle);
measurement.setBone(bone); measurement.setBone((float) bone);
measurement.setLbm(lbm); measurement.setLbm(lbm);
measurement.setVisceralFat((float) visceral); measurement.setVisceralFat((float) visceral);