X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensor.h;h=c6cfbe0d9858eddbd66e84edcae2988c0c98890d;hb=91c67a417caaeeedb38b385d27b927344872abe2;hp=4009e5ade58b06a58ca175416d0fd0239b0f3622;hpb=621ec4c4752d4a01838aa1866cfc1bc401021dcb;p=matches%2FMCTX3420.git

diff --git a/server/sensor.h b/server/sensor.h
index 4009e5a..c6cfbe0 100644
--- a/server/sensor.h
+++ b/server/sensor.h
@@ -1,7 +1,6 @@
-
 /**
  * @file sensor.h
- * @purpose Declarations for sensor thread related stuff
+ * @brief Declarations for sensor thread related stuff
  */
 
 
@@ -14,28 +13,29 @@
 #define SENSOR_QUERYBUFSIZ 10
 
 /** Number of sensors **/
-#define NUMSENSORS 1
+#define NUMSENSORS 4
+
 
 /** Structure to represent data recorded by a sensor at an instant in time **/
 typedef struct
 {
 	/** Time at which data was taken **/
-	float time;
+	double time_stamp; 
 	/** Value of data **/
-	float value;
+	double value;
 } DataPoint;
 
 /** Structure to represent a sensor **/
 typedef struct
 {
 	/** ID number of the sensor **/
-	enum {SENSOR_TEST0=0, SENSOR_TEST1=1, SENSOR_NONE} id;
+	enum {ANALOG_TEST0=2, ANALOG_TEST1=0, DIGITAL_TEST0=1, DIGITAL_TEST1=3} id;
 	/** Buffer to store data from the sensor **/
 	DataPoint buffer[SENSOR_DATABUFSIZ];
 	/** Index of last point written in the data buffer **/
 	int write_index;
-	/** Offset position in binary file for query thread to read from**/
-	int read_offset;
+	/** Number of points read **/
+	long points_read;
 	/** Binary file to write data into when buffer is full **/
 	FILE * file;
 	/** Thread running the sensor **/
@@ -46,10 +46,11 @@ typedef struct
 	
 } Sensor;
 
-/** Array of Sensors **/
-extern Sensor g_sensors[];
 
-extern void Sensor_Init(Sensor * s, int id); // Initialise sensor
+
+
+extern void Sensor_Spawn(); // Initialise sensor
+extern void Sensor_Join(); //Join sensor threads
 extern void * Sensor_Main(void * args); // main loop for sensor thread; pass a Sensor* cast to void*
 
 extern int Sensor_Query(Sensor * s, DataPoint * buffer, int bufsiz); // fill buffer with sensor data