- fixed stirrers and plants

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

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"])