X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=6c51ac17855214c2e9dcfb25b61d72849f1d9208;hb=9e7cfbbc6137056bba8ed8644fc6ecfe398553fe;hp=55b7d89d2c2deffc1bb5f2d67fd96e86e2c5a588;hpb=d0f77e15cfa58191a7683caf343037c25be9f31c;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index 55b7d89..6c51ac1 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -9,30 +9,22 @@
 #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
-
+#define NUMSENSORS 6 
 
+/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
 typedef enum SensorId 
 {
 	ANALOG_TEST0,
 	ANALOG_TEST1,
+	ANALOG_FAIL0,
 	DIGITAL_TEST0,
-	DIGITAL_TEST1
+	DIGITAL_TEST1,
+	DIGITAL_FAIL0
 } SensorId;
 
-
-
 /** Human readable names for the sensors **/
 extern const char * g_sensor_names[NUMSENSORS];
 
-
 /** Structure to represent a sensor **/
 typedef struct
 {
@@ -46,9 +38,16 @@ typedef struct
 	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
 
@@ -56,16 +55,18 @@ extern void Sensor_StartAll(const char * experiment_name); // Start all Sensors
 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_Pause(Sensor *s);
+extern void Sensor_Resume(Sensor *s);
+extern void Sensor_PauseAll();
+extern void Sensor_ResumeAll();
 
 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 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
 
+