From bf753fb36292413e0d89b34b0c71745b121e2ed3 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 3 Apr 2019 17:34:18 +0000 Subject: [PATCH] - added get/setPowerWatts git-svn-id: http://moon:8086/svn/projects/HendiControl@219 fda53097-d464-4ada-af97-ba876c37ca34 --- Control/brewpi/hendiCtrl.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Control/brewpi/hendiCtrl.py b/Control/brewpi/hendiCtrl.py index bad5e19..7731ba1 100644 --- a/Control/brewpi/hendiCtrl.py +++ b/Control/brewpi/hendiCtrl.py @@ -148,10 +148,9 @@ class HendiCtrl(): digits_per_watt = pwr_digits_range/pwr_watts_range pwr_digits = pwr_digits_min + digits_per_watt * (power_watts - pwr_watts_min) - max_digit = max(pwr_digits_max, pwr_digits_min) - min_digit = min(pwr_digits_max, pwr_digits_min) - pwr_digit = min(max_digit, max(min_digit, pwr_digits)) + 0.5 - + max_digits = max(pwr_digits_max, pwr_digits_min) + min_digits = min(pwr_digits_max, pwr_digits_min) + pwr_digits = int(min(max_digits, max(min_digits, pwr_digits)) + 0.5) self.setPowerDigits(pwr_digits) def getPowerWatts(self): @@ -164,11 +163,11 @@ class HendiCtrl(): pwr_digits_range = pwr_digits_max - pwr_digits_min digits_per_watt = pwr_digits_range/pwr_watts_range - max_digit = max(pwr_digits_max, pwr_digits_min) - min_digit = min(pwr_digits_max, pwr_digits_min) - pwr_digit = int(self.getPowerDigits()) + max_digits = max(pwr_digits_max, pwr_digits_min) + min_digits = min(pwr_digits_max, pwr_digits_min) + pwr_digits = int(self.getPowerDigits()) - pwr_watts = (pwr_digit - pwr_digits_min)/digits_per_watt + pwr_watts_min + pwr_watts = (pwr_digits - pwr_digits_min)/digits_per_watt + pwr_watts_min return int(pwr_watts)