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

diff --git a/server/sensor.h b/server/sensor.h
index 5cdfbaa..bb2fb9e 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -7,6 +7,7 @@
 #define _SENSOR_H
 
 #include "data.h"
+#include "device.h"
 
 
 /** 
@@ -18,6 +19,7 @@ extern int g_num_sensors; // in sensor.c
 
 
 /** Structure to define the warning and error thresholds of the sensors **/
+//TODO: Replace with a call to an appropriate "Sanity" function? (see the actuator code)
 typedef struct
 {
 	/** Maximum safe value **/
@@ -30,13 +32,6 @@ typedef struct
 	double min_warn;
 } SensorThreshold;
 
-/** Function pointer for sensor reading **/
-typedef bool (*ReadFn)(int, double * val);
-/** Function pointer for sensor initialisation **/
-typedef bool (*InitFn)(const char *, int);
-/** Function pointer for sensor cleanup **/
-typedef bool (*CleanFn)(int);
-
 /** Structure to represent a sensor **/
 typedef struct
 {
@@ -60,6 +55,11 @@ typedef struct
 	const char * name;
 	/** Thresholds on the sensor **/
 	SensorThreshold thresholds;
+	/** Sampling rate **/
+	int sample_us;
+	/** Averages per DataPoint **/
+	int averages;
+
 	
 } Sensor;