X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=a499b77ca1eec4df3daf78a229dac11e1b68ee21;hb=8f94dbb551783aad414b57ba6da4596f19dc80a6;hp=36fdb2719e178e4256a051287a19383e01396be5;hpb=e27bcae7779827a3858cf82d18ede9c66ee6d950;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index 36fdb27..a499b77 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -6,80 +6,67 @@
 #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
+#include "data.h"
 
 /** Number of sensors **/
 #define NUMSENSORS 4
 
 /** Safety Values for sensors **/
+//TODO: Probably better to use an array instead
 #define ANALOG_TEST0_SAFETY 1000
 #define ANALOG_TEST1_SAFETY 1000
 #define DIGITAL_TEST0_SAFETY 1
 #define DIGITAL_TEST1_SAFETY 1
 
 
-typedef enum SensorId {
+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 **/
+	/** DataFile to store sensor values in **/
+	DataFile data_file;
+	/** Indicates whether the Sensor should record data **/
+	bool record_data;
+	/** Thread the Sensor is running in **/
 	pthread_t thread;
-	/** Mutex to protect access to stuff **/
-	pthread_mutex_t mutex;
+	/** Most recently recorded data **/
+	DataPoint newest_data;
 
 	
 } Sensor;
 
 
+extern void Sensor_Init(); // One off initialisation of *all* sensors
+
+extern void Sensor_StartAll(const char * experiment_name); // Start all Sensors recording data
+extern void Sensor_StopAll(); // Stop all Sensors recording data
+extern void Sensor_Start(Sensor * s, const char * experiment_name); // Start a sensor recording datas
+extern void Sensor_Stop(Sensor * s); // Stop a Sensor from recording data
+
 
+extern void * Sensor_Loop(void * args); // Main loop for a thread that handles a Sensor
+extern bool Sensor_Read(Sensor * s, DataPoint * d); // Read a single DataPoint, indicating if it has changed since the last one
+extern void Sensor_CheckData(SensorId id, DataPoint * d); // Check a DataPoint
+extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a string Id
 
-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 void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
 
-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