- removed AtemperatureSensor::process

- task is AttributeChange
- hareden against Tempsensor exceptions

brewpi.py

@@ -23,7 +23,8 @@ if __name__ == '__main__':
 
 	# Sensor
 	sensor = TempSensorFactory.create(config['Controller']['sensor_name'], temp_offset=-0.15)
-	taskmgr.add(TempSensorTask(sensor, DT_TASK, dispatcher.msgio_get("Sensor")))
+	sensor_task = TempSensorTask(sensor, DT_TASK, dispatcher.msgio_get("Sensor"))
+	taskmgr.add(sensor_task)
 
 	# Plant
 	pot_params = config['Plant']
@@ -65,7 +66,7 @@ if __name__ == '__main__':
 	tc.set_on_changed("y", heater_task.actor)
 
 	# Assign temp. sensor readings to tc
-	sensor.set_on_changed("temp", ChangedFloat(tc.set_theta_ist, prec=2).set)
+	sensor_task.set_on_changed("temp", ChangedFloat(tc.set_theta_ist, prec=2).set)
 
 	# Assign heater power set to tc model
 	heater.set_on_changed("power_set", tc.set_model_power)

components/atemperatureSensor.py

@@ -13,7 +13,3 @@ class ATemperatureSensor(AttributeChange):
 	@abc.abstractmethod
 	def temperature(self):
 		return None
-
-	@abc.abstractmethod
-	def process(self):
-		pass

components/sensor/tempSensorSim.py

@@ -8,15 +8,11 @@ class TempSensorSim(ATemperatureSensor):
 
 	def __init__(self, *args, **kwargs):
 		ATemperatureSensor.__init__(self)
-		self.temp = 22.37
-		self.temp_set = self.temp
+		self.temp_set = 19.99
 		self.k_noise = 0.01
 
 	def set_fake_temp(self, temp):
 		self.temp_set = temp
 
 	def temperature(self):
-		return self.temp
-
-	def process(self):
-		self.temp = self.temp_set + self.k_noise * np.random.normal(0, 1) / np.sqrt(12.0)
+		return self.temp_set + self.k_noise * np.random.normal(0, 1) / np.sqrt(12.0)

components/sensor/tempSensor_max31865.py

@@ -106,10 +106,6 @@ class TempSensor_max31865(ATemperatureSensor):
 
 		return Rv, Tv
 
-	def process(self):
-		temp = self.temperature()
-		self.temp = temp
-
 # Main
 if __name__ == '__main__':
 

tasks/task.py

@@ -1,9 +1,11 @@
 import abc
 import asyncio
+from utils.value import AttributeChange
 
 
-class ATask:
+class ATask(AttributeChange):
 	def __init__(self, interval):
+		AttributeChange.__init__(self)
 		self.interval = interval
 
 	@abc.abstractmethod

tasks/tempsensor.py

@@ -12,6 +12,7 @@ class TempSensorTask(ATask):
 		self.msg_handler = msg_handler
 		msg_handler.set_recv_handler(self.recv)
 		self.sensor = sensor_device
+		self.temp = self.sensor.temperature()
 
 	def on_temp_changed(self, value):
 		asyncio.create_task(self.send({'Temp': value}))
@@ -25,7 +26,10 @@ class TempSensorTask(ATask):
 	async def on_process(self):
 		print("{}: Started with interval {} s".format(self.msg_handler.get_key(), self.interval))
 		temp = ChangedFloat(self.on_temp_changed, prec=1)
-		self.sensor.set_on_changed("temp", temp.set)
+		self.set_on_changed("temp", temp.set)
 		while True:
-			self.sensor.process()
+			try:
+				self.temp = self.sensor.temperature()
+			except Exception:
+				pass
 			await asyncio.sleep(self.interval)