[Stirrer]

- put things into base class

git-svn-id: http://moon:8086/svn/projects/HendiControl@135 fda53097-d464-4ada-af97-ba876c37ca34

Control/brewpi/stirrer.py

@@ -1,52 +1,55 @@
 from astirrer import AStirrer
+import time
 
 class Stirrer(AStirrer):
-	def __init__(self, params):
-		self.params = params
-		self.speed = 0
-		self.cycleTime = 1
-		self.dutyCycle = 1
-		self.cycleCounter = 0
-		self.isOn = 0
+	def __init__(self, dt):
+		super(Stirrer, self).__init__(dt)
 		self.isMasterOn = 0
 
-	def process(self):
-		dt = self.params["dt"]
+	def __del__(self):
+		self.deactivate()
 
-		self.cycleCounter -= dt
-		if self.cycleCounter <= 0:
-			self.cycleCounter = self.cycleTime
+	def activate(self):
+		self.isMasterOn = 1
+		self.log("Stirrer: switched On")
 
-		if self.cycleCounter <= (self.cycleTime * self.dutyCycle):
-			if not self.isOn:
-				self.log ("Stirrer: On")
-				self.isOn = 1
-		else:
-			if self.isOn:
-				self.log ("Stirrer: Off")
-				self.isOn = 0
-
-	def setSpeed(self, speed):
-		self.log ("Stirrer: Set speed to {} %".format(speed))
-		self.speed = speed
-
-	def setCycleTime(self, time):
-		self.log ("Stirrer: Set cycle time to {} s".format(time))
-		self.cycleTime = time
-
-	def setDutyCycle(self, dutyCycle):
-		self.log ("Stirrer: Set duty cycle to {} %".format(100*dutyCycle))
-		self.dutyCycle = dutyCycle
+	def deactivate(self):
+		self.isMasterOn = 0
+		self.log("Stirrer: switched Off")
 
 	def getSpeed(self):
 		if self.isOn and self.isMasterOn:
 			return self.speed
 		return 0
 
-	def start(self):
-		self.isMasterOn = 1
-		self.log("Stirrer: switched On")
+	def onSetSpeed(self, speed):
+		self.log("Stirrer: Set speed to {} %".format(speed))
 
-	def stop(self):
-		self.isMasterOn = 0
-		self.log("Stirrer: switched Off")
+
+if __name__ == '__main__':
+	s = Stirrer(1.0)
+	s.activate()
+
+	print ("Set some speeds")
+	s.setSpeed(50)
+	time.sleep(2)
+	s.setSpeed(100)
+	time.sleep(2)
+	s.setSpeed(50)
+	time.sleep(2)
+
+	print ("Pulsed operation, duty cycle = 50%")
+	s.setDutyCycle(0.5)
+	s.setCycleTime(10)
+	for i in range(1,30):
+		s.process()
+		time.sleep(1)
+
+	print ("Pulsed operation, duty cycle = 20%")
+	s.setDutyCycle(0.2)
+	s.setCycleTime(10)
+	for i in range(1,30):
+		s.process()
+		time.sleep(1)
+
+	s.deactivate()