Update comments for Doxygen. Move old, unused files to the testing folder.

[matches/MCTX3420.git] / server / sensor.h

diff --git a/server/sensor.h b/server/sensor.h
index 0188361..b2bb63c 100644 (file)
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -61,6 +61,9 @@ typedef struct
        int averages;
        /** Current data **/
        DataPoint current_data;
+
+       /** Summed data **/
+       DataPoint averaged_data;
        /** Number of points read so far before applying average **/
        int num_read;
 
@@ -77,11 +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 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);