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

diff --git a/server/sensor.h b/server/sensor.h
index bdab0f9..2e7bf4a 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -8,20 +8,28 @@
 
 #include "data.h"
 
+
+
 /** Number of sensors **/
-#define NUMSENSORS 6 
+#define NUMSENSORS 10
 
 /** 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_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];
 
@@ -32,14 +40,14 @@ typedef struct
 	SensorId id;
 	/** DataFile to store sensor values in **/
 	DataFile data_file;
-	/** Indicates whether the Sensor is not stopped **/
+	/** Indicates whether the Sensor is active or not **/
 	bool activated;
-	/** 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