X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=3de48e0bafb3b672b4e4560f308d8a33baf232e1;hb=6bc90047ed36b392d90a1bf778baf9687b835f2d;hp=bb2fb9ea697ecb5707a865d0c8691677b4aa40ef;hpb=83a3a266ff3cfecea7a6275924f3bdd15dfe6436;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index bb2fb9e..3de48e0 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -51,14 +51,22 @@ typedef struct
 	InitFn init;
 	/** Function to cleanup the sensor **/
 	CleanFn cleanup;
+	/** Function to sanity check the sensor readings **/
+	SanityFn sanity;
 	/** Human readable name of the sensor **/
 	const char * name;
-	/** Thresholds on the sensor **/
-	SensorThreshold thresholds;
 	/** Sampling rate **/
-	int sample_us;
-	/** Averages per DataPoint **/
+	struct timespec sample_time;
+	/** Number of averages per sample **/
 	int averages;
+	/** Current data **/
+	DataPoint current_data;
+
+	/** Summed data **/
+	DataPoint averaged_data;
+	/** Number of points read so far before applying average **/
+	int num_read;
+
 
 	
 } Sensor;
@@ -73,11 +81,12 @@ 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(Sensor * s, double value); // Check a DataPoint
 extern Sensor * Sensor_Identify(const char * str); // Identify a Sensor from a string
 
 extern void Sensor_Handler(FCGIContext *context, char * params); // Handle a FCGI request for Sensor data
 
+extern DataPoint Sensor_LastData(int id);
+
 extern const char * Sensor_GetName(int id);