X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=55b7d89d2c2deffc1bb5f2d67fd96e86e2c5a588;hb=5ab6641e1e2c28d85440f4cbe4c4091d0c54d1ab;hp=4009e5ade58b06a58ca175416d0fd0239b0f3622;hpb=7ca215713fa73c84ba0b46c9e7299386bd5cf5b8;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
deleted file mode 100644
index 4009e5a..0000000
--- a/server/sensor.h
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/**
- * @file sensor.h
- * @purpose Declarations for sensor thread related stuff
- */
-
-
-#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 1
-
-/** Structure to represent data recorded by a sensor at an instant in time **/
-typedef struct
-{
-	/** Time at which data was taken **/
-	float time;
-	/** Value of data **/
-	float value;
-} DataPoint;
-
-/** Structure to represent a sensor **/
-typedef struct
-{
-	/** ID number of the sensor **/
-	enum {SENSOR_TEST0=0, SENSOR_TEST1=1, SENSOR_NONE} id;
-	/** Buffer to store data from the sensor **/
-	DataPoint buffer[SENSOR_DATABUFSIZ];
-	/** Index of last point written in the data buffer **/
-	int write_index;
-	/** Offset position in binary file for query thread to read from**/
-	int read_offset;
-	/** 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;
-
-/** Array of Sensors **/
-extern Sensor g_sensors[];
-
-extern void Sensor_Init(Sensor * s, int id); // Initialise sensor
-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);
-
-
-#endif //_SENSOR_H
-