X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=36fdb2719e178e4256a051287a19383e01396be5;hb=41bb73186e41a5601407a4d39bfd8c6817c02d74;hp=d0ab7d53e1eea8e8c95776db754e43e283add53c;hpb=b1a8334f97f84e10ee9cef96377bbdcfbf5f945c;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index d0ab7d5..36fdb27 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -1,16 +1,85 @@
 /**
  * @file sensor.h
- * @purpose Declarations for sensor thread stuff
+ * @brief Declarations for sensor thread related stuff
  */
 
-///TODO: Add more; this is currently just for testing
-
 #ifndef _SENSOR_H
 #define _SENSOR_H
 
+/** Number of data points to keep in sensor buffers **/
+#define SENSOR_DATABUFSIZ 10
+/** Size of the query buffer. @see Sensor_Handler **/
+#define SENSOR_QUERYBUFSIZ 10
+
+/** Number of sensors **/
+#define NUMSENSORS 4
+
+/** Safety Values for sensors **/
+#define ANALOG_TEST0_SAFETY 1000
+#define ANALOG_TEST1_SAFETY 1000
+#define DIGITAL_TEST0_SAFETY 1
+#define DIGITAL_TEST1_SAFETY 1
+
+
+typedef enum SensorId {
+	ANALOG_TEST0,
+	ANALOG_TEST1,
+	DIGITAL_TEST0,
+	DIGITAL_TEST1
+} SensorId;
+
+typedef enum
+{
+	JSON, // JSON data
+	CSV, // Comma seperated vector
+	TSV // Tab seperated vector
+} OutputType;
+
+/** Human readable names for the sensors **/
+extern const char * g_sensor_names[NUMSENSORS];
+
+/** 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 **/
+	SensorId 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;
+	/** Number of points written to file **/
+	long points_written;
+	/** 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_Main(void * args); // main loop for sensor thread
+extern void Sensor_Handler(FCGIContext *context, char * params);
 
 #endif //_SENSOR_H