X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=1b44673208e2bb2f2c3d2a912dfd433cb21de386;hb=f44384c0c76c6621f049ade9e2de00be4bfeafd0;hp=bd43fc19adce9e012afbfdacd44c218ad651d979;hpb=daa632fd405efaf8656efa8f506fc50d1e48ec94;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index bd43fc1..1b44673 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
 {
@@ -40,7 +38,6 @@ typedef struct
 	pthread_t thread;
 	/** Most recently recorded data **/
 	DataPoint newest_data;
-
 } Sensor;
 
 // Structure to define the warning and error thresholds of the sensors
@@ -50,7 +47,7 @@ typedef struct
 	double min_error;
 	double max_warn;
 	double min_warn;
-} SensorThres;
+} SensorThreshold;
 
 extern void Sensor_Init(); // One off initialisation of *all* sensors
 
@@ -62,7 +59,7 @@ extern void Sensor_Stop(Sensor * s); // Stop a Sensor from recording data
 
 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