- refactored

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

Control/brewpi/stirrer.py

@@ -3,7 +3,7 @@ from astirrer import AStirrer
 class Stirrer(AStirrer):
 	def __init__(self, params):
 		self.params = params
-		self.rpm = 0
+		self.speed = 0
 		self.cycleTime = 1
 		self.dutyCycle = 1
 		self.cycleCounter = 0
@@ -26,9 +26,9 @@ class Stirrer(AStirrer):
 				self.log ("Stirrer: Off")
 				self.isOn = 0
 
-	def setRpm(self, rpm):
-		self.log ("Stirrer: Set RPM to {} rpm".format(rpm))
-		self.rpm = rpm
+	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))
@@ -38,9 +38,9 @@ class Stirrer(AStirrer):
 		self.log ("Stirrer: Set duty cycle to {} %".format(100*dutyCycle))
 		self.dutyCycle = dutyCycle
 
-	def getRpm(self):
+	def getSpeed(self):
 		if self.isOn and self.isMasterOn:
-			return self.rpm
+			return self.speed
 		return 0
 
 	def start(self):