- refactored

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

Control/brewpi/controller.py

@@ -178,18 +178,18 @@ class Controller():
 			self.time_v = np.append(self.time_v, self.time/60)
 			self.power_v = np.append(self.power_v, power)
 			self.error_v = np.append(self.error_v, pid_err)
-			#self.error_v = np.append(self.error_v, self.stirrer.getRpm())
+			#self.error_v = np.append(self.error_v, self.stirrer.getSpeed())
 
 
 			# -----------------------------------------
 			if ovenStateNext != self.ovenState:
 				self.log("{} -> {}".format(self.ovenState, ovenStateNext))
 				if ovenStateNext == ovenStates.HEAT:
-					self.stirrer.setRpm(self.stirrSpeedHeat)
+					self.stirrer.setSpeed(self.stirrSpeedHeat)
 					self.stirrer.setDutyCycle(1.0)
 
 				if ovenStateNext == ovenStates.HOLD:
-					self.stirrer.setRpm(self.stirrSpeedRast)
+					self.stirrer.setSpeed(self.stirrSpeedRast)
 					self.stirrer.setDutyCycle(self.stirrDutyRast)
 
 			if controllerStateNext != self.controllerState:

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):