X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=182d8aed83d5d954e2a8f79df91f54153c22b6a4;hb=6a5de8e3b2870ca950f2116aeb9561ad7d707427;hp=bdab0f90474032b80a1635ce02641ce9accd7261;hpb=f09f5c5a4c7dc9cf958e4557b7cb31cabdca833d;p=matches%2FMCTX3420.git diff --git a/server/sensor.h b/server/sensor.h index bdab0f9..182d8ae 100644 --- a/server/sensor.h +++ b/server/sensor.h @@ -9,16 +9,18 @@ #include "data.h" /** Number of sensors **/ -#define NUMSENSORS 6 +#define NUMSENSORS 8 /** 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 } SensorId; @@ -32,10 +34,8 @@ 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 **/