From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Mon, 9 Sep 2013 06:32:39 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=30279eaa8f8de4250df8cc0fa47c5febf83e56cf;p=matches%2FMCTX3420.git

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

Conflicts:
	server/sensor.c
---

30279eaa8f8de4250df8cc0fa47c5febf83e56cf
diff --cc server/sensor.h
index 9bdefda,36fdb27..dd919f9
--- a/server/sensor.h
+++ b/server/sensor.h
@@@ -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 **/