Merge branch 'master' of github:/szmoore/MCTX3420
[matches/MCTX3420.git] / server / sensor.c
index a3580b7..98896e8 100644 (file)
@@ -7,7 +7,7 @@
 #include "common.h"
 #include "sensor.h"
 #include "options.h"
-#include "gpio.h"
+#include "bbb_pin.h"
 #include <math.h>
 
 /** Array of sensors, initialised by Sensor_Init **/
@@ -18,8 +18,8 @@ const SensorThreshold thresholds[NUMSENSORS]= {
        //Max Safety, Min safety, Max warning, Min warning
        {1,-1,1,-1},            // ANALOG_TEST0
        {500,0,499,0},          // ANALOG_TEST1
+       {5000,0,5000,0},                // ANALOG_REALTEST
        {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
@@ -43,8 +43,15 @@ void Sensor_Init()
        {
                g_sensors[i].id = i;
                Data_Init(&(g_sensors[i].data_file));
-               g_sensors[i].record_data = false;       
        }
+
+       // Get the ADCs
+       ADC_Export();
+
+       // GPIO1_28 used as a pulse for sampling
+       GPIO_Export(GPIO1_28);
+       // GPIO0_30 toggled during sampling
+       GPIO_Export(GPIO0_30);
 }
 
 /**
@@ -65,7 +72,6 @@ void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg)
                                // 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)
                                {
@@ -75,9 +81,11 @@ void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg)
                                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!
+                       }
+               case CONTROL_RESUME: //Case fallthrough, no break before
+                       {
+                               int ret;
+                               s->activated = true; // Don't forget this!
 
                                // Create the thread
                                ret = pthread_create(&(s->thread), NULL, Sensor_Loop, (void*)(s));
@@ -85,23 +93,29 @@ void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg)
                                {
                                        Fatal("Failed to create Sensor_Loop for Sensor %d", s->id);
                                }
+
+                               Log(LOGDEBUG, "Resuming sensor %d", s->id);
                        }
-                       break;
+               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);
+                       Log(LOGDEBUG, "Paused sensor %d", s->id);
+               break;
+               
+               case CONTROL_STOP:
+                       if (s->activated) //May have been paused before
+                       {
+                               s->activated = false;
+                               pthread_join(s->thread, NULL);
+                       }
 
                        Data_Close(&(s->data_file)); // Close DataFile
                        s->newest_data.time_stamp = 0;
                        s->newest_data.value = 0;
+                       Log(LOGDEBUG, "Stopped sensor %d", s->id);
                break;
                default:
                        Fatal("Unknown control mode: %d", mode);
@@ -130,12 +144,13 @@ 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);
+               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)
        {
-               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);       
+               Log(LOGWARN, "Sensor %s at %f is above or below its warning value of %f or %f\n", value, g_sensor_names[id],thresholds[id].max_warn, thresholds[id].min_warn);  
        }
 }
 
@@ -154,9 +169,32 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
        gettimeofday(&t, NULL);
        d->time_stamp = TIMEVAL_DIFF(t, *Control_GetStartTime());
 
+       static bool result = true;
+       
+       
        // Read value based on Sensor Id
        switch (s->id)
        {
+               case ANALOG_REALTEST:
+               {
+                       static bool set = false;
+                       
+                       GPIO_Set(GPIO0_30, true);
+                       d->value = 0;//(double)ADC_Read(ADC0);  //ADC #0 on the Beaglebone
+                       //Log(LOGDEBUG, "Got value %f from ADC0", d->value);
+                       GPIO_Set(GPIO0_30, false);
+                       set = !set;
+                       GPIO_Set(GPIO1_28, set);
+                       
+                       break;
+               }
+               
+               default:
+                       d->value = rand() % 2;
+                       usleep(1000000);
+                       break;
+               
+
                case ANALOG_TEST0:
                {
                        d->value = (double)(rand() % 100) / 100;
@@ -169,18 +207,15 @@ 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 = 250;
+                       d->value = 0;
                        //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;
@@ -198,17 +233,17 @@ bool Sensor_Read(Sensor * s, DataPoint * d)
                        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;
+               //default:
+               //      Fatal("Unknown sensor id: %d", s->id);
+               //      break;
        }       
-       usleep(100000); // simulate delay in sensor polling
+       
 
        // Perform sanity check based on Sensor's ID and the DataPoint
        Sensor_CheckData(s->id, d->value);
 
        // Update latest DataPoint if necessary
-       bool result = (d->value != s->newest_data.value);
+       
        if (result)
        {
                s->newest_data.time_stamp = d->time_stamp;
@@ -230,20 +265,12 @@ void * Sensor_Loop(void * arg)
        // Until the sensor is stopped, record data points
        while (s->activated)
        {
-               if (s->record_data)
-               {
-                       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
+               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:
                {
-                       //Do something? wait?
-                       usleep(100000);
+                       //Log(LOGDEBUG, "Sensor %d saves data [%f,%f]", s->id, d.time_stamp, d.value);
+                       Data_Save(&(s->data_file), &d, 1); // Record it
                }
        }
        
@@ -290,6 +317,7 @@ void Sensor_BeginResponse(FCGIContext * context, SensorId id, DataFormat format)
                case JSON:
                        FCGI_BeginJSON(context, STATUS_OK);
                        FCGI_JSONLong("id", id);
+                       FCGI_JSONPair("name", g_sensor_names[id]);
                        break;
                default:
                        FCGI_PrintRaw("Content-type: text/plain\r\n\r\n");

UCC git Repository :: git.ucc.asn.au