Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

Conflicts:
	server/sensor.c

diff --combined server/sensor.h
index 9bdefda,36fdb27..dd919f9
--- 1/server/sensor.h
--- 2/server/sensor.h
+++ b/server/sensor.h
@@@ -14,6 -14,13 +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 +28,13 @@@
        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,10 -58,10 +58,12 @@@ typedef struc
        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;
 +      /** Number of data points stored in file **/
 +      long points_stored;
        /** Thread running the sensor **/
        pthread_t thread;
        /** Mutex to protect access to stuff **/
@@@ -67,6 -81,5 +83,6 @@@ extern int Sensor_Query(Sensor * s, Dat
  
  extern void Sensor_Handler(FCGIContext *context, char * params);
  
 +extern void Sensor_Handler2(FCGIContext *context, char *params);
  #endif //_SENSOR_H