X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.c;h=a3580b7793db4ced710fef483559ea4b497733cc;hb=466cbf5433adfc4fef7065164918201039159aff;hp=f3860c9434a1a102af4e86933163be28caf6e255;hpb=46c219c69676ea4e6f467692b7db6e48a708ab80;p=matches%2FMCTX3420.git diff --git a/server/sensor.c b/server/sensor.c index f3860c9..a3580b7 100644 --- a/server/sensor.c +++ b/server/sensor.c @@ -5,9 +5,9 @@ */ #include "common.h" -#include "control.h" #include "sensor.h" #include "options.h" +#include "gpio.h" #include /** Array of sensors, initialised by Sensor_Init **/ @@ -19,16 +19,19 @@ const SensorThreshold thresholds[NUMSENSORS]= { {1,-1,1,-1}, // ANALOG_TEST0 {500,0,499,0}, // ANALOG_TEST1 {5,-5,4,-4}, // ANALOG_FAIL0 + {500,0,499,0}, // ANALOG_REALTEST {1,0,1,0}, // DIGITAL_TEST0 {1,0,1,0}, // DIGITAL_TEST1 + {1,0,1,0}, // DIGITAL_REALTEST {1,0,1,0} // DIGITAL_FAIL0 }; /** Human readable names for the sensors **/ const char * g_sensor_names[NUMSENSORS] = { "analog_test0", "analog_test1", - "analog_fail0", "digital_test0", - "digital_test1", "digital_fail0" + "analog_realtest", "analog_fail0", + "digital_test0", "digital_test1", + "digital_realtest", "digital_fail0" }; /** @@ -45,62 +48,76 @@ void Sensor_Init() } /** - * Start a Sensor recording DataPoints - * @param s - The Sensor to start - * @param experiment_name - Prepended to DataFile filename + * Sets the sensor to the desired control mode. No checks are + * done to see if setting to the desired mode will conflict with + * the current mode - the caller must guarantee this itself. + * @param s The sensor whose mode is to be changed + * @param mode The mode to be changed to + * @param arg An argument specific to the mode to be set. + * e.g for CONTROL_START it represents the experiment name. */ -void Sensor_Start(Sensor * s, const char * experiment_name) +void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg) { - // Set filename - char filename[BUFSIZ]; - if (sprintf(filename, "%s_s%d", experiment_name, s->id) >= BUFSIZ) + switch(mode) { - Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ); - } - - Log(LOGDEBUG, "Sensor %d with DataFile \"%s\"", s->id, filename); - // Open DataFile - Data_Open(&(s->data_file), filename); - - s->record_data = true; // Don't forget this! - - // Create the thread - pthread_create(&(s->thread), NULL, Sensor_Loop, (void*)(s)); -} - -/** - * Stop a Sensor from recording DataPoints. Blocks until it has stopped. - * @param s - The Sensor to stop - */ -void Sensor_Stop(Sensor * s) -{ - // Stop - if (s->record_data) - { - s->record_data = false; - pthread_join(s->thread, NULL); // Wait for thread to exit - Data_Close(&(s->data_file)); // Close DataFile - s->newest_data.time_stamp = 0; - s->newest_data.value = 0; + case CONTROL_START: + { + // Set filename + char filename[BUFSIZ]; + const char *experiment_name = (const char*) arg; + int ret; + + if (snprintf(filename, BUFSIZ, "%s_s%d", experiment_name, s->id) >= BUFSIZ) + { + Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ); + } + + Log(LOGDEBUG, "Sensor %d with DataFile \"%s\"", s->id, filename); + // Open DataFile + Data_Open(&(s->data_file), filename); + + s->activated = true; + s->record_data = true; // Don't forget this! + + // Create the thread + ret = pthread_create(&(s->thread), NULL, Sensor_Loop, (void*)(s)); + if (ret != 0) + { + Fatal("Failed to create Sensor_Loop for Sensor %d", s->id); + } + } + break; + case CONTROL_EMERGENCY: + case CONTROL_PAUSE: + s->record_data = false; + break; + case CONTROL_RESUME: + s->record_data = true; + break; + case CONTROL_STOP: + s->activated = false; + s->record_data = false; + pthread_join(s->thread, NULL); + + Data_Close(&(s->data_file)); // Close DataFile + s->newest_data.time_stamp = 0; + s->newest_data.value = 0; + break; + default: + Fatal("Unknown control mode: %d", mode); } } /** - * Stop all Sensors - */ -void Sensor_StopAll() -{ - for (int i = 0; i < NUMSENSORS; ++i) - Sensor_Stop(g_sensors+i); -} - -/** - * Start all Sensors + * Sets all sensors to the desired mode. + * @see Sensor_SetMode for more information. + * @param mode The mode to be changed to + * @param arg An argument specific to the mode to be set. */ -void Sensor_StartAll(const char * experiment_name) +void Sensor_SetModeAll(ControlModes mode, void * arg) { - for (int i = 0; i < NUMSENSORS; ++i) - Sensor_Start(g_sensors+i, experiment_name); + for (int i = 0; i < NUMSENSORS; i++) + Sensor_SetMode(&g_sensors[i], mode, arg); } @@ -135,14 +152,16 @@ bool Sensor_Read(Sensor * s, DataPoint * d) // Set time stamp struct timeval t; gettimeofday(&t, NULL); - d->time_stamp = TIMEVAL_DIFF(t, g_options.start_time); + d->time_stamp = TIMEVAL_DIFF(t, *Control_GetStartTime()); // Read value based on Sensor Id switch (s->id) { case ANALOG_TEST0: + { d->value = (double)(rand() % 100) / 100; break; + } case ANALOG_TEST1: { static int count = 0; @@ -150,8 +169,14 @@ bool Sensor_Read(Sensor * s, DataPoint * d) d->value = count++; break; } + case ANALOG_REALTEST: + { + //d->value = ADCRead(0); //ADC #0 on the Beaglebone + break; + } case ANALOG_FAIL0: - d->value = (double)(rand() % 6) * -( rand() % 2) / ( rand() % 100 + 1); + d->value = 250; + //d->value = (double)(rand() % 6) * -( rand() % 2) / ( rand() % 100 + 1); //Gives a value between -5 and 5 break; case DIGITAL_TEST0: @@ -160,6 +185,13 @@ bool Sensor_Read(Sensor * s, DataPoint * d) case DIGITAL_TEST1: d->value = (t.tv_sec+1)%2; break; + case DIGITAL_REALTEST: + { + // Can pass pin as argument, just using 20 as an example here + // Although since pins will be fixed, can just define it here if we need to + //d->value = pinRead(20); //Pin 20 on the Beaglebone + break; + } case DIGITAL_FAIL0: if( rand() % 100 > 98) d->value = 2; @@ -196,14 +228,22 @@ void * Sensor_Loop(void * arg) Log(LOGDEBUG, "Sensor %d starts", s->id); // Until the sensor is stopped, record data points - while (s->record_data) + while (s->activated) { - DataPoint d; - //Log(LOGDEBUG, "Sensor %d reads data [%f,%f]", s->id, d.time_stamp, d.value); - if (Sensor_Read(s, &d)) // If new DataPoint is read: + if (s->record_data) { - //Log(LOGDEBUG, "Sensor %d saves data [%f,%f]", s->id, d.time_stamp, d.value); - Data_Save(&(s->data_file), &d, 1); // Record it + DataPoint d; + //Log(LOGDEBUG, "Sensor %d reads data [%f,%f]", s->id, d.time_stamp, d.value); + if (Sensor_Read(s, &d)) // If new DataPoint is read: + { + //Log(LOGDEBUG, "Sensor %d saves data [%f,%f]", s->id, d.time_stamp, d.value); + Data_Save(&(s->data_file), &d, 1); // Record it + } + } + else + { + //Do something? wait? + usleep(100000); } } @@ -285,7 +325,7 @@ void Sensor_Handler(FCGIContext *context, char * params) { struct timeval now; gettimeofday(&now, NULL); - double current_time = TIMEVAL_DIFF(now, g_options.start_time); + double current_time = TIMEVAL_DIFF(now, *Control_GetStartTime()); int id = 0; double start_time = 0; @@ -325,23 +365,14 @@ void Sensor_Handler(FCGIContext *context, char * params) DataFormat format = Data_GetFormat(&(values[FORMAT])); - if (Control_Lock()) - { - // 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); + // Begin response + Sensor_BeginResponse(context, id, format); - Control_Unlock(); - } - else - { - FCGI_RejectJSON(context, "Experiment is not running."); - } + // Print Data + Data_Handler(&(s->data_file), &(values[START_TIME]), &(values[END_TIME]), format, current_time); + + // Finish response + Sensor_EndResponse(context, id, format); }