From 2d7c52de44c9dd051eb5760dead6eb3960f89652 Mon Sep 17 00:00:00 2001 From: lolouk44 Date: Mon, 3 Feb 2020 10:44:10 +0000 Subject: [PATCH] Cleanup --- src/Xiaomi_Scale_Body_Metrics.py | 7 ++++--- src/body_score.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Xiaomi_Scale_Body_Metrics.py b/src/Xiaomi_Scale_Body_Metrics.py index 079aa32..059e1ee 100644 --- a/src/Xiaomi_Scale_Body_Metrics.py +++ b/src/Xiaomi_Scale_Body_Metrics.py @@ -1,4 +1,5 @@ from math import floor +import sys from body_scales import bodyScales class bodyMetrics: @@ -17,15 +18,15 @@ class bodyMetrics: exit() elif weight < 10 or weight > 200: print("Weight is either too low or too high (limits: <10kg and >200kg) or scale is sleeping") - sys.stderr.write('Weight is above 10kg or below 200kg or scale is sleeping\n') + sys.stderr.write('Weight is above 10kg or below 200kg or scale is sleeping\n') exit() elif age > 99: print("Age is too high (limit >99 years) or scale is sleeping") - sys.stderr.write('Age is above 99 years or scale is sleeping\n') + sys.stderr.write('Age is above 99 years or scale is sleeping\n') exit() elif impedance > 3000: print("Impedance is above 3000ohm or scale is sleeping") - sys.stderr.write('Impedance is above 3000ohm or scale is sleeping\n') + sys.stderr.write('Impedance is above 3000ohm or scale is sleeping\n') exit() # Set the value to a boundary if it overflows diff --git a/src/body_score.py b/src/body_score.py index 12f1d6d..be16d97 100644 --- a/src/body_score.py +++ b/src/body_score.py @@ -95,11 +95,11 @@ class bodyScore: return self.getMalus(self.bodyfat, scale[3], scale[2], 20, 10) + 10.0 # High part of normal fat - elif self.bodyfat <= normal[2]: + elif self.bodyfat <= scale[2]: return self.getMalus(self.bodyfat, scale[2], best, 3, 9) + 3.0 # Very low in fat - elif self.bodyfat < normal[0]: + elif self.bodyfat < scale[0]: return self.getMalus(self.bodyfat, 1.0, scale[0], 3, 10) + 3.0