X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=server%2Fsensor.h;h=bdab0f90474032b80a1635ce02641ce9accd7261;hb=c92490dbf1e2a383b83f012815e6c93bd8245d7a;hp=bd43fc19adce9e012afbfdacd44c218ad651d979;hpb=ef065a355c92c834adcfa49f866d23ef4153cf36;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index bd43fc1..bdab0f9 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -11,6 +11,7 @@
 /** Number of sensors **/
 #define NUMSENSORS 6 
 
+/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
 typedef enum SensorId 
 {
 	ANALOG_TEST0,
@@ -21,12 +22,9 @@ typedef enum SensorId
 	DIGITAL_FAIL0
 } SensorId;
 
-
-
 /** Human readable names for the sensors **/
 extern const char * g_sensor_names[NUMSENSORS];
 
-
 /** Structure to represent a sensor **/
 typedef struct
 {
@@ -34,13 +32,14 @@ typedef struct
 	SensorId id;
 	/** DataFile to store sensor values in **/
 	DataFile data_file;
+	/** Indicates whether the Sensor is not stopped **/
+	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
@@ -50,19 +49,16 @@ typedef struct
 	double min_error;
 	double max_warn;
 	double min_warn;
-} SensorThres;
+} SensorThreshold;
 
 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_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
-extern void Sensor_CheckData(SensorId id, DataPoint * d); // Check a DataPoint
+extern void Sensor_CheckData(SensorId id, double value); // Check a DataPoint
 extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a string Id
 
 extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data