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

diff --git a/server/sensor.h b/server/sensor.h
index 55b7d89..bd43fc1 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -9,22 +9,16 @@
 #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 
 
 typedef enum SensorId 
 {
 	ANALOG_TEST0,
 	ANALOG_TEST1,
+	ANALOG_FAIL0,
 	DIGITAL_TEST0,
-	DIGITAL_TEST1
+	DIGITAL_TEST1,
+	DIGITAL_FAIL0
 } SensorId;
 
 
@@ -49,6 +43,14 @@ typedef struct
 
 } 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;
+} SensorThres;
 
 extern void Sensor_Init(); // One off initialisation of *all* sensors
 
@@ -65,7 +67,6 @@ extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a s
 
 extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
 
-
-
 #endif //_SENSOR_H
 
+