Merge branch 'master' of https://github.com/szmoore/MCTX3420

[matches/MCTX3420.git] / server / sensor.h

diff --git a/server/sensor.h b/server/sensor.h
index 182d8ae..2e7bf4a 100644 (file)
--- 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