From 7cad6660066db1aa802ccb111f547b0f80fedbe5 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 25 Mar 2019 21:05:42 +0000
Subject: [PATCH] - fixed stirrer

git-svn-id: http://moon:8086/svn/projects/HendiControl@137 fda53097-d464-4ada-af97-ba876c37ca34
---
 Control/brewpi/astirrer.py   | 7 ++-----
 Control/brewpi/pololu1376.py | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Control/brewpi/astirrer.py b/Control/brewpi/astirrer.py
index 2e141d9..36f7c98 100644
--- a/Control/brewpi/astirrer.py
+++ b/Control/brewpi/astirrer.py
@@ -9,7 +9,7 @@ class AStirrer(abc.ABC):
 		self.cycleTime = 1
 		self.dutyCycle = 1
 		self.cycleCounter = 0
-		self.isOn = 0
+		self.isOn = 1
 
 	def log(self, s):
 		print("{:.2f}: {}".format(time.time(), s))
@@ -35,17 +35,14 @@ class AStirrer(abc.ABC):
 
 	def setSpeed(self, speed):
 		self.speed = speed
-		if self.isOn:
+		if self.isOn or self.dutyCycle == 1:
 			self.onSetSpeed(speed)
-		self.log ("Stirrer: Set speed to {} %".format(speed))
 
 	def setCycleTime(self, time):
 		self.cycleTime = time
-		self.log ("Stirrer: Set cycle time to {} s".format(time))
 
 	def setDutyCycle(self, dutyCycle):
 		self.dutyCycle = dutyCycle
-		self.log ("Stirrer: Set duty cycle to {} %".format(100*dutyCycle))
 
 	@abc.abstractmethod
 	def getSpeed(self):
diff --git a/Control/brewpi/pololu1376.py b/Control/brewpi/pololu1376.py
index ba9ac07..9c0dfeb 100644
--- a/Control/brewpi/pololu1376.py
+++ b/Control/brewpi/pololu1376.py
@@ -43,6 +43,7 @@ class Pololu1376(AStirrer):
 
 	def onSetSpeed(self, speed):
 		self.ser_send("F" + str(speed) + "%")
+		self.log("Stirrer: Set speed to {} %".format(speed))
 
 
 if __name__ == '__main__':