mirror of
https://github.com/oliexdev/openScale.git
synced 2025-08-22 00:06:48 +02:00
fixed female calculation for mi scale v2
This commit is contained in:
@@ -133,27 +133,32 @@ public class MiScaleLib {
|
|||||||
|
|
||||||
if (sex == 0 && age <= 49) {
|
if (sex == 0 && age <= 49) {
|
||||||
lbmSub = 9.25f;
|
lbmSub = 9.25f;
|
||||||
} else if (sex == 1 && age > 49) {
|
} else if (sex == 0 && age > 49) {
|
||||||
lbmSub = 7.25f;
|
lbmSub = 7.25f;
|
||||||
}
|
}
|
||||||
|
|
||||||
float lbmCoeff = getLBMCoefficient(weight, impedance);
|
float lbmCoeff = getLBMCoefficient(weight, impedance);
|
||||||
|
float coeff = 1.0f;
|
||||||
|
|
||||||
if (sex == 1 && weight < 61) {
|
if (sex == 1 && weight < 61.0f) {
|
||||||
bodyFat = (1.0f - (((lbmCoeff - lbmSub) * 0.98f) / weight)) * 100.0f;
|
coeff = 0.98f;
|
||||||
}
|
}
|
||||||
else if (sex == 0 && weight < 50) {
|
else if (sex == 0 && weight > 60.0f) {
|
||||||
bodyFat = (1.0f - (((lbmCoeff - lbmSub) * 1.02f) / weight)) * 100.0f;
|
coeff = 0.96f;
|
||||||
|
|
||||||
|
if (height > 160.0f) {
|
||||||
|
coeff *= 1.03f;
|
||||||
}
|
}
|
||||||
else if (sex == 0 && weight < 60) {
|
} else if (sex == 0 && weight < 50.0f) {
|
||||||
bodyFat = (1.0f - (((lbmCoeff - lbmSub) * 0.96f) / weight)) * 100.0f;
|
coeff = 1.02f;
|
||||||
|
|
||||||
|
if (height > 160.0f) {
|
||||||
|
coeff *= 1.03f;
|
||||||
}
|
}
|
||||||
else if (sex == 0 && height < 160) {
|
|
||||||
bodyFat = (1.0f - (((lbmCoeff - lbmSub) * 1.03f) / weight)) * 100.0f;
|
|
||||||
} else {
|
|
||||||
bodyFat = (1.0f - ((lbmCoeff - lbmSub) / weight)) * 100.0f;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bodyFat = (1.0f - (((lbmCoeff - lbmSub) * coeff) / weight)) * 100.0f;
|
||||||
|
|
||||||
if (bodyFat > 63.0f) {
|
if (bodyFat > 63.0f) {
|
||||||
bodyFat = 75.0f;
|
bodyFat = 75.0f;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user