X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=36fdb2719e178e4256a051287a19383e01396be5;hb=41bb73186e41a5601407a4d39bfd8c6817c02d74;hp=8ae56609d9c63b5a8d217d809106722c86400fec;hpb=18027c718bc45eaa191068da1e739eebeb6111e4;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index 8ae5660..36fdb27 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -14,6 +14,13 @@
 /** Number of sensors **/
 #define NUMSENSORS 4
 
+/** 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,
@@ -21,6 +28,13 @@ typedef enum SensorId {
 	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];
 
@@ -44,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 **/