From 8f62825c94facf676b7b128b198d72ad894d322e Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 20 Apr 2020 11:47:20 +0000
Subject: [PATCH] - fixed stirrers and plants

git-svn-id: http://moon:8086/svn/projects/HendiControl@374 fda53097-d464-4ada-af97-ba876c37ca34
---
 Control/brewpi/astirrer.py           |  1 +
 Control/brewpi/brewpi.py             |  9 ++++-----
 Control/brewpi/plant.py              |  2 +-
 Control/brewpi/stirrer_pololu1376.py | 11 +++++------
 Control/brewpi/stirrer_sim.py        | 15 +++++++++------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Control/brewpi/astirrer.py b/Control/brewpi/astirrer.py
index f8fdc4c..50884be 100644
--- a/Control/brewpi/astirrer.py
+++ b/Control/brewpi/astirrer.py
@@ -8,6 +8,7 @@ class AStirrer(abc.ABC):
 		return ""
  	
 	def __init__(self, dt):
+		self.log("Create")
 		self.dt = dt
 		self.speed = 0
 		self.cycleTime = 1
diff --git a/Control/brewpi/brewpi.py b/Control/brewpi/brewpi.py
index 02e44e7..0922605 100755
--- a/Control/brewpi/brewpi.py
+++ b/Control/brewpi/brewpi.py
@@ -4,11 +4,10 @@ import argparse
 import signal
 import json
 from controller import Controller, commands
-from mass import Mass
-from stirrer import Stirrer
-from pololu1376 import Pololu1376
+from plant_sim import Plant_sim
 from plant import Plant
-
+from stirrer_sim import Stirrer_sim
+from stirrer_pololu1376 import Stirrer_pololu1376
 from matplotlib.pyplot import figure, clf, plot, xlabel, ylabel, xlim, ylim, title, grid, axes, show, subplot
 
 def results_plot(self):
@@ -99,7 +98,7 @@ if __name__ == '__main__':
 	configJson = json.load(fp)
 
 	plant_class = globals()[configJson["Controller"]['plant_name']]
-	plant = plant_class()
+	plant = plant_class(configJson["Plant"])
 	ruehrer_class = globals()[configJson["Controller"]['stirrer_name']]
 	ruehrer = ruehrer_class(configJson["Stirrer"])
 
diff --git a/Control/brewpi/plant.py b/Control/brewpi/plant.py
index 3b3d2ca..06152cc 100644
--- a/Control/brewpi/plant.py
+++ b/Control/brewpi/plant.py
@@ -6,7 +6,7 @@ from hendiCtrl import HendiCtrl
 from max31865 import Max31865
 
 class Plant(APlant):
-	def __init__(self):
+	def __init__(self, params):
 		self.heater = HendiCtrl('/dev/ttyUSB0', 115200)
 		self.tempsensor = Max31865()
 		self.P = 0
diff --git a/Control/brewpi/stirrer_pololu1376.py b/Control/brewpi/stirrer_pololu1376.py
index 4446335..c3bff1e 100644
--- a/Control/brewpi/stirrer_pololu1376.py
+++ b/Control/brewpi/stirrer_pololu1376.py
@@ -4,12 +4,12 @@ import time
 import serial
 
 
-class Pololu1376(AStirrer):
+class Stirrer_pololu1376(AStirrer):
 	def name(self):
-		return "Stirrer"
+		return "Stirrer_pololu1376"
 	
 	def __init__(self, params):
-		super(Pololu1376, self).__init__(params["dt"])
+		super(Stirrer_pololu1376, self).__init__(params["dt"])
 		self.isMasterOn = 0
 
 		self.ser_speed = params["speed"]
@@ -24,7 +24,6 @@ class Pololu1376(AStirrer):
 
 		self.ser_send('V')
 		self.ser_recv()
-		self.log("Create Pololu1376")
 
 	def ser_send(self, cmd):
 		self.ser.write((cmd + '\r\n').encode())
@@ -40,13 +39,13 @@ class Pololu1376(AStirrer):
 
 	def activate(self):
 		if self.isMasterOn == 0:
-			self.log("switched On")
+			self.log("Switched On")
 		self.isMasterOn = 1
 		self.ser_send("go")
 
 	def deactivate(self):
 		if self.isMasterOn == 1:
-			self.log("switched Off")
+			self.log("Switched Off")
 		self.isMasterOn = 0
 		self.ser_send("x")
 
diff --git a/Control/brewpi/stirrer_sim.py b/Control/brewpi/stirrer_sim.py
index 77fd564..08cb59e 100644
--- a/Control/brewpi/stirrer_sim.py
+++ b/Control/brewpi/stirrer_sim.py
@@ -1,9 +1,12 @@
 from astirrer import AStirrer
 import time
 
-class Stirrer(AStirrer):
+class Stirrer_sim(AStirrer):
+	def name(self):
+		return "Stirrer_sim"
+
 	def __init__(self, params):
-		super(Stirrer, self).__init__(params['dt'])
+		super(Stirrer_sim, self).__init__(params['dt'])
 		self.isMasterOn = 0
 
 	def __del__(self):
@@ -11,12 +14,12 @@ class Stirrer(AStirrer):
 
 	def activate(self):
 		if self.isMasterOn == 0:
-			self.log("Stirrer: switched On")
+			self.log("Switched On")
 		self.isMasterOn = 1
 
 	def deactivate(self):
 		if self.isMasterOn == 1:
-			self.log("Stirrer: switched Off")
+			self.log("Switched Off")
 		self.isMasterOn = 0
 
 	def getSpeed(self):
@@ -25,11 +28,11 @@ class Stirrer(AStirrer):
 		return 0
 
 	def onSetSpeed(self, speed):
-		self.log("Stirrer: Set speed to {} %".format(speed))
+		self.log("Set speed to {} %".format(speed))
 
 
 if __name__ == '__main__':
-	s = Stirrer(1.0)
+	s = Stirrer_sim({'dt' : 1.0})
 	s.activate()
 
 	print ("Set some speeds")