Get rid of OpenCV for now

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

diff --git a/server/sensor.h b/server/sensor.h
index f6c9047..36fdb27 100644 (file)
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -8,19 +8,34 @@
 
 /** Number of data points to keep in sensor buffers **/
 #define SENSOR_DATABUFSIZ 10
-
+/** Size of the query buffer. @see Sensor_Handler **/
 #define SENSOR_QUERYBUFSIZ 10
 
 /** Number of sensors **/
 #define NUMSENSORS 4
 
-typedef enum SensorId{
+/** Safety Values for sensors **/
+#define ANALOG_TEST0_SAFETY 1000
+#define ANALOG_TEST1_SAFETY 1000
+#define DIGITAL_TEST0_SAFETY 1
+#define DIGITAL_TEST1_SAFETY 1
+
+
+typedef enum SensorId {
        ANALOG_TEST0,
        ANALOG_TEST1,
        DIGITAL_TEST0,
        DIGITAL_TEST1
 } SensorId;
 
+typedef enum
+{
+       JSON, // JSON data
+       CSV, // Comma seperated vector
+       TSV // Tab seperated vector
+} OutputType;
+
+/** Human readable names for the sensors **/
 extern const char * g_sensor_names[NUMSENSORS];
 
 /** Structure to represent data recorded by a sensor at an instant in time **/
@@ -43,6 +58,8 @@ typedef struct
        int write_index;
        /** Number of points read **/
        long points_read;
+       /** Number of points written to file **/
+       long points_written;
        /** Binary file to write data into when buffer is full **/
        FILE * file;
        /** Thread running the sensor **/
@@ -64,6 +81,5 @@ extern int Sensor_Query(Sensor * s, DataPoint * buffer, int bufsiz); // fill buf
 
 extern void Sensor_Handler(FCGIContext *context, char * params);
 
-
 #endif //_SENSOR_H