X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=server%2Fsensor.h;h=2e7bf4afe38701170279d97e479edb771c49c30d;hb=df1a9751a2d23cc9d43bf49c069ac9effc2a752f;hp=182d8aed83d5d954e2a8f79df91f54153c22b6a4;hpb=ed189a5dd5b5ca6c052d75704dec3f58fe410387;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index 182d8ae..2e7bf4a 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -8,22 +8,28 @@
 
 #include "data.h"
 
+
+
 /** Number of sensors **/
-#define NUMSENSORS 8
+#define NUMSENSORS 10
 
 /** Sensor ids - there should be correspondence with the names in g_sensor_names **/
 typedef enum SensorId 
 {
-	ANALOG_TEST0,
-	ANALOG_TEST1,
-	ANALOG_REALTEST,
-	ANALOG_FAIL0,
-	DIGITAL_TEST0,
-	DIGITAL_TEST1,
-	DIGITAL_REALTEST,
-	DIGITAL_FAIL0
+	STRAIN0,
+	STRAIN1,
+	STRAIN2,
+	STRAIN3,
+	PRESSURE0,
+	PRESSURE1,
+	PRESSURE_FEEDBACK,
+	MICROPHONE,
+	ENCLOSURE.
+	DILATOMETER
 } SensorId;
 
+
+
 /** Human readable names for the sensors **/
 extern const char * g_sensor_names[NUMSENSORS];
 
@@ -40,6 +46,8 @@ typedef struct
 	pthread_t thread;
 	/** Most recently recorded data **/
 	DataPoint newest_data;
+	
+	
 } Sensor;
 
 // Structure to define the warning and error thresholds of the sensors