- refactored

- integrated stirrer

components/actor/__init__.py

@@ -1 +1,2 @@
 from components.actor.heaterFactory import HeaterFactory
+from components.actor.stirrerFactory import StirrerFactory

components/actor/heaterFactory.py

@@ -2,10 +2,10 @@
 
 class HeaterFactory:
 	@staticmethod
-	def create(name):
+	def create(name, params):
 		if "sim" in name:
 			from components.actor.heater_sim import HeaterSim
 			return HeaterSim()
 		elif "Hendi" in name:
 			from components.actor.heater_hendi import HeaterHendi
-			return HeaterHendi('/dev/ttyUSB0', 115200)
+			return HeaterHendi(params)

components/actor/heater_hendi.py

@@ -3,12 +3,12 @@ from hendiCtrl import HendiCtrl
 
 
 class HeaterHendi(AHeater):
-	def __init__(self, port, baudrate):
+	def __init__(self, params):
 		AHeater.__init__(self)
 		self.power_set = self.get_power_min()
 		self.is_active = False
 		self.power_eff = 0
-		self.hendi = HendiCtrl(port, baudrate)
+		self.hendi = HendiCtrl(params['port'], params['baudrate'])
 
 	def get_power_min(self):
 		caps = self.hendi.getCapabilties()

components/actor/stirrerFactory.py

@@ -2,10 +2,10 @@
 
 class StirrerFactory:
 	@staticmethod
-	def create(name, dt):
+	def create(name, params):
 		if "sim" in name:
 			from components.actor.stirrersim import StirrerSim
-			return StirrerSim(dt)
+			return StirrerSim(params)
 		elif "1376" in name:
 			from components.actor.stirrerpololu1376 import StirrerPololu1376
-			return StirrerPololu1376(dt, '/dev/ttyUSB0', 115200)
+			return StirrerPololu1376(params)

components/actor/stirrerpololu1376.py

@@ -8,7 +8,7 @@ class StirrerPololu1376(AStirrer):
 		return "Pololu1376"
 	
 	def __init__(self, dt, port, baudrate):
-		super(StirrerPololu1376, self).__init__(dt)
+		AStirrer.__init__(self, dt)
 		self.isMasterOn = 0
 
 		self.ser_speed = baudrate

components/actor/stirrersim.py

@@ -3,11 +3,8 @@ import time
 
 
 class StirrerSim(AStirrer):
-	def name(self):
-		return "FakeStirrer"
-
-	def __init__(self, dt):
-		super(StirrerSim, self).__init__(dt)
+	def __init__(self, params):
+		AStirrer.__init__(self, params['dt'])
 
 	def __del__(self):
 		self.activate(False)