X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;h=b065708717038f7461f60b2a351d42db1688c329;hb=851c1d78e4530ecaac3aca9d39b19932d8607431;hp=227ea42bdcaaa0b4072082e042f9f91f5da28860;hpb=d0f77e15cfa58191a7683caf343037c25be9f31c;p=matches%2FMCTX3420.git diff --git a/server/sensor.c b/server/sensor.c index 227ea42..b065708 100644 --- a/server/sensor.c +++ b/server/sensor.c @@ -12,10 +12,22 @@ /** 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", - "digital_test0", "digital_test1" + "analog_fail0", "digital_test0", + "digital_test1", "digital_fail0" }; /** @@ -27,7 +39,7 @@ void Sensor_Init() { g_sensors[i].id = i; Data_Init(&(g_sensors[i].data_file)); - g_sensors[i].record_data = false; + g_sensors[i].record_data = false; } } @@ -40,7 +52,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); } @@ -90,6 +102,26 @@ void Sensor_StartAll(const char * experiment_name) Sensor_Start(g_sensors+i, experiment_name); } + +/** + * Checks the sensor data for unsafe or unexpected results + * @param sensor_id - The ID of the sensor + * @param value - The value from the sensor to test + */ +void Sensor_CheckData(SensorId id, double value) +{ + 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); + //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); + } +} + + /** * Read a DataPoint from a Sensor; block until value is read * @param id - The ID of the sensor @@ -110,19 +142,29 @@ 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 + break; case DIGITAL_TEST0: d->value = t.tv_sec % 2; break; case DIGITAL_TEST1: d->value = (t.tv_sec+1)%2; break; + case DIGITAL_FAIL0: + if( rand() % 100 > 98) + d->value = 2; + d->value = rand() % 2; + //Gives 0 or 1 or a 2 every 1/100 times + break; default: Fatal("Unknown sensor id: %d", s->id); break; @@ -130,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); @@ -142,35 +184,6 @@ bool Sensor_Read(Sensor * s, DataPoint * d) return result; } -/** - * Checks the sensor data for unsafe or unexpected results - * @param sensor_id - The ID of the sensor - * @param d - DataPoint to check - */ -void Sensor_CheckData(SensorId id, DataPoint * d) -{ - //TODO: Implement - /* - switch (sensor_id) - { - case ANALOG_TEST0: - { - if( *sensor value* > ANALOG_TEST0_SAFETY) - { - LogEx(LOGERR, GetData, Sensor analog_test0 is above the safe value); - //new log function that stops actuators? - } - //Also include a warning level? - else if( *sensor value* > ANALOG_TEST0_WARN) - { - LogEx(LOGWARN, GetData, Sensor analog_test0); - } - } - } - */ -} - - /** * Record data from a single Sensor; to be run in a seperate thread * @param arg - Cast to Sensor* - Sensor that the thread will handle @@ -225,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) { @@ -236,7 +249,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"); @@ -277,11 +289,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}, @@ -302,67 +314,21 @@ void Sensor_Handler(FCGIContext *context, char * params) return; } - // Get Sensor - Sensor * s = NULL; - // Error checking on sensor id if (id < 0 || id >= NUMSENSORS) { - Log(LOGERR, "Invalid id %d", id); - } - else - { - s = g_sensors+id; + FCGI_RejectJSON(context, "Invalid sensor id"); + return; } + Sensor * s = g_sensors+id; - DataFormat format = JSON; + DataFormat format = Data_GetFormat(&(values[FORMAT])); - // 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 - Log(LOGERR, "Unknown format type \"%s\"", fmt_str); - } - - - // 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))) - { - // 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); - } - else if (s != NULL) // 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; - 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); - } + // Print Data + Data_Handler(&(s->data_file), &(values[START_TIME]), &(values[END_TIME]), format, current_time); // Finish response Sensor_EndResponse(context, id, format); @@ -370,3 +336,4 @@ void Sensor_Handler(FCGIContext *context, char * params) } +