From: Sam Moore <matches@ucc.asn.au>
Date: Sun, 22 Sep 2013 04:04:49 +0000 (+0800)
Subject: Merge branch 'master' of github:/szmoore/MCTX3420
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=e0f849d11ae14ee0637786b6663436aafff90254;p=matches%2FMCTX3420.git

Merge branch 'master' of github:/szmoore/MCTX3420
---

e0f849d11ae14ee0637786b6663436aafff90254
diff --cc server/sensor.c
index 28c3f5e,e429958..98896e8
--- a/server/sensor.c
+++ b/server/sensor.c
@@@ -138,8 -144,9 +144,9 @@@ void Sensor_CheckData(SensorId id, doub
  {
  	if( value > thresholds[id].max_error || value < thresholds[id].min_error)
  	{
 -		Log(LOGERR, "Sensor %s is above or below its safety value of %f or %f\n", g_sensor_names[id],thresholds[id].max_error, thresholds[id].min_error);
 +		Log(LOGERR, "Sensor %s at %f is above or below its safety value of %f or %f\n", value, g_sensor_names[id],thresholds[id].max_error, thresholds[id].min_error);
  		//new function that stops actuators?
+ 		//Control_SetMode(CONTROL_EMERGENCY, NULL)
  	}
  	else if( value > thresholds[id].max_warn || value < thresholds[id].min_warn)
  	{