X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;h=f3860c9434a1a102af4e86933163be28caf6e255;hb=46c219c69676ea4e6f467692b7db6e48a708ab80;hp=0edb086e0c46876ab77a96744698313409034cd5;hpb=ef065a355c92c834adcfa49f866d23ef4153cf36;p=matches%2FMCTX3420.git diff --git a/server/sensor.c b/server/sensor.c index 0edb086..f3860c9 100644 --- a/server/sensor.c +++ b/server/sensor.c @@ -5,6 +5,7 @@ */ #include "common.h" +#include "control.h" #include "sensor.h" #include "options.h" #include @@ -12,6 +13,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", @@ -41,7 +53,7 @@ void Sensor_Start(Sensor * s, const char * experiment_name) { // Set filename char filename[BUFSIZ]; - if (sprintf(filename, "%s_%d", experiment_name, s->id) >= BUFSIZ) + if (sprintf(filename, "%s_s%d", experiment_name, s->id) >= BUFSIZ) { Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ); } @@ -99,33 +111,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 +143,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 +165,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 +173,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); @@ -259,7 +250,6 @@ void Sensor_BeginResponse(FCGIContext * context, SensorId id, DataFormat format) case JSON: FCGI_BeginJSON(context, STATUS_OK); FCGI_JSONLong("id", id); - FCGI_JSONKey("data"); break; default: FCGI_PrintRaw("Content-type: text/plain\r\n\r\n"); @@ -324,66 +314,34 @@ void Sensor_Handler(FCGIContext *context, char * params) // Error occured; FCGI_RejectJSON already called return; } - else if (id < 0 || id >= NUMSENSORS) + + // Error checking on sensor id + if (id < 0 || id >= NUMSENSORS) { - FCGI_RejectJSON(context, "Invalid sensor id specified"); + FCGI_RejectJSON(context, "Invalid sensor id"); return; } - - // Get Sensor and format Sensor * s = g_sensors+id; - DataFormat format = JSON; - // Check if format type was specified - if (FCGI_RECEIVED(values[FORMAT].flags)) - { - if (strcmp(fmt_str, "json") == 0) - format = JSON; - else if (strcmp(fmt_str, "tsv") == 0) - format = TSV; - else - { - FCGI_RejectJSON(context, "Unknown format type specified."); - return; - } - } + DataFormat format = Data_GetFormat(&(values[FORMAT])); - // Begin response - Sensor_BeginResponse(context, id, format); - - // If a time was specified - if (FCGI_RECEIVED(values[START_TIME].flags) || FCGI_RECEIVED(values[END_TIME].flags)) + if (Control_Lock()) { - // Wrap times relative to the current time - if (start_time < 0) - start_time += current_time; - if (end_time < 0) - end_time += current_time; - - // Print points by time range - Data_PrintByTimes(&(s->data_file), start_time, end_time, format); + // Begin response + Sensor_BeginResponse(context, id, format); + + // Print Data + Data_Handler(&(s->data_file), &(values[START_TIME]), &(values[END_TIME]), format, current_time); + + // Finish response + Sensor_EndResponse(context, id, format); + + Control_Unlock(); } - else // No time was specified; just return a recent set of points + else { - 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; - pthread_mutex_unlock(&(s->data_file.mutex)); - - // Bounds check - if (start_index < 0) - start_index = 0; - if (end_index < 0) - end_index = 0; - - // Print points by indexes - Log(LOGDEBUG, "Sensor %d file \"%s\" indexes %d->%d", s->id, s->data_file.filename, start_index, end_index); - Data_PrintByIndexes(&(s->data_file), start_index, end_index, format); + FCGI_RejectJSON(context, "Experiment is not running."); } - - // Finish response - Sensor_EndResponse(context, id, format); - }