X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=b2bb63c2fc952d5e387e4e53cdf2b341067e8c97;hb=a671f27ecb900f91bf32b8b13edb678009e319c1;hp=bb2fb9ea697ecb5707a865d0c8691677b4aa40ef;hpb=83a3a266ff3cfecea7a6275924f3bdd15dfe6436;p=matches%2FMCTX3420.git diff --git a/server/sensor.h b/server/sensor.h index bb2fb9e..b2bb63c 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; @@ -72,12 +80,13 @@ 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(Sensor * s, double value); // Check a DataPoint +//extern bool Sensor_Read(Sensor * s, DataPoint * d); // Read a single DataPoint, indicating if it has changed since the last one 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);