- fixed

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

Control/brewpi/astirrer.py

@@ -54,4 +54,4 @@ class AStirrer(abc.ABC):
 
 	@abc.abstractmethod
 	def deactivate(self):
-		pass
+		pass

Control/brewpi/brewpi.py

@@ -6,6 +6,7 @@ from controller import Controller
 from mass import Mass
 from stirrer import Stirrer
 from matplotlib.pyplot import figure, clf, plot, xlabel, ylabel, xlim, ylim, title, grid, axes, show, subplot
+from pololu1376 import Pololu1376
 
 def results_plot(self):
 
@@ -40,7 +41,9 @@ if __name__ == '__main__':
 	configJson = json.load(fp)
 
 	plant = Mass(configJson["WaterSim"])
-	ruehrer = Stirrer(configJson["Stirrer"])
+#	ruehrer = Stirrer(configJson["Controller"]['dt'])
+	ruehrer = Pololu1376(configJson["Controller"]['dt'], "/dev/ttyACM0", "115200")
+
 	ablauf = Controller(configJson["Controller"], plant, ruehrer)
 
 	fp = open("Rezept-001.json")

Control/brewpi/controller.py

@@ -30,7 +30,7 @@ class Controller():
 		self.power_v = np.empty(0)
 		self.error_v = np.empty(0)
 		self.time = 0
-		self.sim_warp_factor = 100
+		self.sim_warp_factor = 10
 		self.report_interval = 1.0
 		self.report_last_time = 0
 		self.thread = None
@@ -89,7 +89,7 @@ class Controller():
 	def rast(self, rast):
 
 		# Stirrer
-		self.stirrer.start()
+		self.stirrer.activate()
 		self.stirrer.setCycleTime(self.stirrCycleTime)
 
 		# Temperature
@@ -217,4 +217,4 @@ class Controller():
 
 			time.sleep(time_to_sleep)
 
-		self.stirrer.stop()
+		self.stirrer.deactivate()

Control/brewpi/pololu1376.py

@@ -53,7 +53,7 @@ if __name__ == '__main__':
 	print ("Set some speeds")
 	s.setSpeed(50)
 	time.sleep(2)
-	s.setSpeed(100)
+	s.setSpeed(20)
 	time.sleep(2)
 	s.setSpeed(50)
 	time.sleep(2)