- raise exception i case hendi cannot be enabled

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

Control/brewpi/controller.py

@@ -174,10 +174,14 @@ class Controller(TimerListener):
 			try:
 				msg = self.queue.get(block=True, timeout=wait)
 				print ("Received: ", msg)
+			except:
+				continue
+
 			if msg == commands.PAUSE:
 				pass
-
 			elif msg == commands.RUN:
+				self.stirrer.activate()
+				self.plant.activate(True)
 				if not self.processTimer.isActive:
 					self.fp_log = open(self.receipe['Name'] + '.log', "w")
 					self.time = 0
@@ -186,8 +190,6 @@ class Controller(TimerListener):
 					self.processTimer.start(self.dt / self.sim_warp_factor)
 
 					# Stirrer and plant
-						self.stirrer.activate()
-						self.plant.activate(True)
 					self.stirrer.setCycleTime(self.stirrCycleTime)
 					self.receipe_done = False
 				else:
@@ -203,8 +205,6 @@ class Controller(TimerListener):
 
 			elif msg == commands.STIRR_OFF:
 				self.stirrer.deactivate()
-			except:
-				pass
 
 		# Stirrer and plant
 		self.stirrer.deactivate()

Control/brewpi/hendiCtrl.py

@@ -114,9 +114,9 @@ class HendiCtrl():
 		self.__write(req)
 		rsp = self.__read()
 		if "OK" not in rsp[0]:
-			raise Exception("Command not accepted ({})".format(rsp[1]))
+			raise Exception(rsp[1])
 
-		return rsp[1]
+		return rsp[1] == '1'
 		
 	def getCapabilties(self):
 		return self.caps

Control/brewpi/plant.py

@@ -16,16 +16,24 @@ class Plant(APlant):
 		self.cycleCounter = 0
 
 	def activate(self, enable=True):
-		if enable == True:
+		if enable:
-			self.heater.remoteEnable(enable)
-			self.heater.setSwitch(enable)
 			if not self.heater.isRemoteEnable():
-				raise Exception ("Heater: Cannot enable remote mode!")
+				try:				
+					self.heater.remoteEnable(enable)
+				except:
+					raise Exception("Error: Could not activate heater!")
+			self.heater.setSwitch(enable)
+			print ("Plant activated")
 		else:
+			if self.heater.isRemoteEnable():
 				self.heater.setSwitch(enable)
 				self.heater.remoteEnable(enable)
+				print ("Plant deactivated")
 
 	def process(self, dt=1):
+		if not self.heater.isRemoteEnable():
+			return
+
 		isOn = self.isOn
 		self.cycleCounter += dt
 		if self.cycleCounter >= self.cycleTime: