X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=182d8aed83d5d954e2a8f79df91f54153c22b6a4;hb=b7150f722995ea6807182da24653a15693a82698;hp=6c51ac17855214c2e9dcfb25b61d72849f1d9208;hpb=9e7cfbbc6137056bba8ed8644fc6ecfe398553fe;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index 6c51ac1..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,8 +34,8 @@ typedef struct
 	SensorId id;
 	/** DataFile to store sensor values in **/
 	DataFile data_file;
-	/** Indicates whether the Sensor should record data **/
-	bool record_data;
+	/** Indicates whether the Sensor is active or not **/
+	bool activated;
 	/** Thread the Sensor is running in **/
 	pthread_t thread;
 	/** Most recently recorded data **/
@@ -51,14 +53,8 @@ typedef struct
 
 extern void Sensor_Init(); // One off initialisation of *all* sensors
 
-extern void Sensor_StartAll(const char * experiment_name); // Start all Sensors recording data
-extern void Sensor_StopAll(); // Stop all Sensors recording data
-extern void Sensor_Start(Sensor * s, const char * experiment_name); // Start a sensor recording datas
-extern void Sensor_Stop(Sensor * s); // Stop a Sensor from recording data
-extern void Sensor_Pause(Sensor *s);
-extern void Sensor_Resume(Sensor *s);
-extern void Sensor_PauseAll();
-extern void Sensor_ResumeAll();
+extern void Sensor_SetModeAll(ControlModes mode, void * arg);
+extern void Sensor_SetMode(Sensor * s, ControlModes mode, void * arg);
 
 extern void * Sensor_Loop(void * args); // Main loop for a thread that handles a Sensor
 extern bool Sensor_Read(Sensor * s, DataPoint * d); // Read a single DataPoint, indicating if it has changed since the last one