X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;h=5d618589d6e6a25ade5c45beb065f9f3aba32581;hb=386b08fd98454455c5b5eb5fbaeaf83126897f9f;hp=9e0c266def12e16419d5697801db776c0a8a66e9;hpb=daa632fd405efaf8656efa8f506fc50d1e48ec94;p=matches%2FMCTX3420.git

diff --git a/server/sensor.c b/server/sensor.c
index 9e0c266..5d61858 100644
--- a/server/sensor.c
+++ b/server/sensor.c
@@ -12,6 +12,17 @@
 /** Array of sensors, initialised by Sensor_Init **/
 static Sensor g_sensors[NUMSENSORS]; //global to this file
 
+/** Array of sensor threshold structures defining the safety values of each sensor**/
+const SensorThreshold thresholds[NUMSENSORS]= {
+	//Max Safety, Min safety, Max warning, Min warning
+	{1,-1,1,-1},		// ANALOG_TEST0
+	{500,0,499,0},		// ANALOG_TEST1
+	{5,-5,4,-4},		// ANALOG_FAIL0
+	{1,0,1,0},		// DIGITAL_TEST0
+	{1,0,1,0},		// DIGITAL_TEST1
+	{1,0,1,0}		// DIGITAL_FAIL0
+};
+
 /** Human readable names for the sensors **/
 const char * g_sensor_names[NUMSENSORS] = {	
 	"analog_test0", "analog_test1", 
@@ -99,33 +110,14 @@ void Sensor_StartAll(const char * experiment_name)
  */
 void Sensor_CheckData(SensorId id, double value)
 {
-	switch (sensor_id)
+	if( value > thresholds[id].max_error || value < thresholds[id].min_error)
 	{
-		case ANALOG_FAIL0:
-		{
-			if( value > ANALOG_FAIL0_SAFETY || value < ANALOG_FAIL0_MIN_SAFETY)
-			{
-				Log(LOGERR, "Sensor analog_fail0 is above or below its safety value of %d or %d\n", ANALOG_FAIL0_SAFETY, ANALOG_FAIL0_MIN_SAFETY);
-			//new function that stops actuators?
-			}
-			else if( value > ANALOG_FAIL0_WARN || value < ANALOG_FAIL0_MIN_WARN)
-			{
-				Log(LOGWARN, "Sensor analog_test0 is above or below its warning value of %d or %d\n", ANALOG_FAIL0_WARN, ANALOG_FAIL0_MIN_WARN);	
-			}
-			break;
-		}
-		case DIGITAL_FAIL0:
-		{	
-			if( value != 0 && value != 1)
-			{
-				Log(LOGERR, "Sensor digital_fail0 is not 0 or 1\n");
-			}
-			break;
-		}
-		default:
-		{
-		//So it doesn't complain about the missing cases - in practice we will need all sensors to be checked as above, no need to include a default as we should only pass valid sensor_id's; unless for some reason we have a sensor we don't need to check (but then why would you pass to this function in the first place :P)
-		}
+		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);
+		//new function that stops actuators?
+	}
+	else if( value > thresholds[id].max_warn || value < thresholds[id].min_warn)
+	{
+		Log(LOGWARN, "Sensor %s is above or below its warning value of %f or %f\n", g_sensor_names[id],thresholds[id].max_warn, thresholds[id].min_warn);	
 	}
 }
 
@@ -150,17 +142,16 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
 		case ANALOG_TEST0:
 			d->value = (double)(rand() % 100) / 100;
 			break;
-
 		case ANALOG_TEST1:
 		{
 			static int count = 0;
+			count %= 500;
 			d->value = count++;
 			break;
 		}
 		case ANALOG_FAIL0:
 			d->value = (double)(rand() % 6) * -( rand() % 2) / ( rand() % 100 + 1);
 			//Gives a value between -5 and 5
-			CheckSensor(sensor_id, d->value);
 			break;
 		case DIGITAL_TEST0:
 			d->value = t.tv_sec % 2;
@@ -173,7 +164,6 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
 				d->value = 2;
 			d->value = rand() % 2; 
 			//Gives 0 or 1 or a 2 every 1/100 times
-			CheckSensor(sensor_id, d->value);
 			break;
 		default:
 			Fatal("Unknown sensor id: %d", s->id);
@@ -182,7 +172,7 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
 	usleep(100000); // simulate delay in sensor polling
 
 	// Perform sanity check based on Sensor's ID and the DataPoint
-	Sensor_CheckData(s->id, d);
+	Sensor_CheckData(s->id, d->value);
 
 	// Update latest DataPoint if necessary
 	bool result = (d->value != s->newest_data.value);
@@ -248,8 +238,8 @@ Sensor * Sensor_Identify(const char * id_str)
 /**
  * Helper: Begin sensor response in a given format
  * @param context - the FCGIContext
- * @param format - Format
  * @param id - ID of sensor
+ * @param format - Format
  */
 void Sensor_BeginResponse(FCGIContext * context, SensorId id, DataFormat format)
 {
@@ -300,11 +290,11 @@ void Sensor_Handler(FCGIContext *context, char * params)
 	int id = 0;
 	double start_time = 0;
 	double end_time = current_time;
-	char * fmt_str;
+	const char * fmt_str;
 
 	// key/value pairs
 	FCGIValue values[] = {
-		{"id", &id, FCGI_REQUIRED(FCGI_LONG_T)}, 
+		{"id", &id, FCGI_REQUIRED(FCGI_INT_T)}, 
 		{"format", &fmt_str, FCGI_STRING_T}, 
 		{"start_time", &start_time, FCGI_DOUBLE_T}, 
 		{"end_time", &end_time, FCGI_DOUBLE_T},
@@ -324,20 +314,14 @@ void Sensor_Handler(FCGIContext *context, char * params)
 		// Error occured; FCGI_RejectJSON already called
 		return;
 	}
-
-	// Get Sensor
-	Sensor * s = NULL;
-
-	// Error checking on sensor id
-	if (id < 0 || id >= NUMSENSORS)
-	{
-		Log(LOGERR, "Invalid id %d", id);
-	}
-	else
+	else if (id < 0 || id >= NUMSENSORS)
 	{
-		s = g_sensors+id;
+		FCGI_RejectJSON(context, "Invalid sensor id specified");
+		return;
 	}
-	
+
+	// Get Sensor and format
+	Sensor * s = g_sensors+id;
 	DataFormat format = JSON;
 
 	// Check if format type was specified
@@ -347,17 +331,18 @@ void Sensor_Handler(FCGIContext *context, char * params)
 			format = JSON;
 		else if (strcmp(fmt_str, "tsv") == 0)
 			format = TSV;
-		else
-			Log(LOGERR, "Unknown format type \"%s\"", fmt_str);
+		else 
+		{
+			FCGI_RejectJSON(context, "Unknown format type specified.");
+			return;
+		}
 	}
 
-	
-	
 	// Begin response
 	Sensor_BeginResponse(context, id, format);
 	
 	// If a time was specified
-	if ((s != NULL) && (FCGI_RECEIVED(values[START_TIME].flags) || FCGI_RECEIVED(values[END_TIME].flags)))
+	if (FCGI_RECEIVED(values[START_TIME].flags) || FCGI_RECEIVED(values[END_TIME].flags))
 	{
 		// Wrap times relative to the current time
 		if (start_time < 0)
@@ -367,13 +352,12 @@ void Sensor_Handler(FCGIContext *context, char * params)
 
 		// Print points by time range
 		Data_PrintByTimes(&(s->data_file), start_time, end_time, format);
-
 	}
-	else if (s != NULL) // No time was specified; just return a recent set of points
+	else // No time was specified; just return a recent set of points
 	{
 		pthread_mutex_lock(&(s->data_file.mutex));
 			int start_index = s->data_file.num_points-DATA_BUFSIZ;
-			int end_index = s->data_file.num_points-1;
+			int end_index = s->data_file.num_points;
 		pthread_mutex_unlock(&(s->data_file.mutex));
 
 		// Bounds check