X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=8b200773b23dcbe832140cd3bbdd41b908273085;hb=f5d659a02be34c0b0b0a7660ad283c90c4a3c182;hp=b9a5aaded02aea4d1903bfd3ab19d699c139415e;hpb=01e621afb7cfbc4b570cac55128f5023798a9ce3;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index b9a5aad..8b20077 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -5,13 +5,59 @@
  */
 
 
-
 #ifndef _SENSOR_H
 #define _SENSOR_H
 
+/** Number of data points to keep in sensor buffers **/
+#define SENSOR_DATABUFSIZ 10
+
+#define SENSOR_QUERYBUFSIZ 10
+
+/** Number of sensors **/
+#define NUMSENSORS 4
+
+
+/** Structure to represent data recorded by a sensor at an instant in time **/
+typedef struct
+{
+	/** Time at which data was taken **/
+	double time_stamp; 
+	/** Value of data **/
+	double value;
+} DataPoint;
+
+/** Structure to represent a sensor **/
+typedef struct
+{
+	/** ID number of the sensor **/
+	enum {ANALOG_TEST0=2, ANALOG_TEST1=0, DIGITAL_TEST0=1, DIGITAL_TEST1=3} id;
+	/** Buffer to store data from the sensor **/
+	DataPoint buffer[SENSOR_DATABUFSIZ];
+	/** Index of last point written in the data buffer **/
+	int write_index;
+	/** Number of points read **/
+	long points_read;
+	/** Binary file to write data into when buffer is full **/
+	FILE * file;
+	/** Thread running the sensor **/
+	pthread_t thread;
+	/** Mutex to protect access to stuff **/
+	pthread_mutex_t mutex;
+
+	
+} Sensor;
+
+
+
+
+extern void Sensor_Spawn(); // Initialise sensor
+extern void Sensor_Join(); //Join sensor threads
+extern void * Sensor_Main(void * args); // main loop for sensor thread; pass a Sensor* cast to void*
+
+extern int Sensor_Query(Sensor * s, DataPoint * buffer, int bufsiz); // fill buffer with sensor data
 
+extern void Sensor_Handler(FCGIContext *context, char * params);
 
-extern void * Sensor_Main(void * args); // main loop for sensor thread
 
 #endif //_SENSOR_H