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

diff --git a/server/sensor.h b/server/sensor.h
index b9a5aad..3f833d1 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -1,17 +1,72 @@
-
 /**
  * @file sensor.h
- * @purpose Declarations for sensor thread related stuff
+ * @brief Declarations for sensor thread related stuff
  */
 
-
-
 #ifndef _SENSOR_H
 #define _SENSOR_H
 
+#include "data.h"
+
+/** Number of sensors **/
+#define NUMSENSORS 6 
+
+typedef enum SensorId 
+{
+	ANALOG_TEST0,
+	ANALOG_TEST1,
+	ANALOG_FAIL0,
+	DIGITAL_TEST0,
+	DIGITAL_TEST1,
+	DIGITAL_FAIL0
+} SensorId;
+
+
+
+/** Human readable names for the sensors **/
+extern const char * g_sensor_names[NUMSENSORS];
 
 
-extern void * Sensor_Main(void * args); // main loop for sensor thread
+/** Structure to represent a sensor **/
+typedef struct
+{
+	/** ID number of the sensor **/
+	SensorId id;
+	/** 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;
+	/** Most recently recorded data **/
+	DataPoint newest_data;
+
+} Sensor;
+
+// Structure to define the warning and error thresholds of the sensors
+typedef struct
+{
+	double max_error;
+	double min_error;
+	double max_warn;
+	double min_warn;
+} SensorThreshold;
+
+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, double value); // Check a DataPoint
+extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a string Id
+
+extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
 
 #endif //_SENSOR_H
 
+