From: Jeremy Tan <jeremy@jx.tan.fake>
Date: Sun, 22 Sep 2013 00:43:17 +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=ed189a5dd5b5ca6c052d75704dec3f58fe410387;hp=--cc;p=matches%2FMCTX3420.git

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

ed189a5dd5b5ca6c052d75704dec3f58fe410387
diff --cc server/sensor.c
index 64c7aa9,9d0b33c..e429958
--- a/server/sensor.c
+++ b/server/sensor.c
@@@ -39,7 -43,16 +43,15 @@@ void Sensor_Init(
  	{
  		g_sensors[i].id = i;
  		Data_Init(&(g_sensors[i].data_file));
 -		g_sensors[i].record_data = false;	
  	}
+ 
+ 	// Get the ADCs
+ 	ADC_Export();
+ 
+ 	// GPIO1_28 used as a pulse for sampling
+ 	GPIO_Export(GPIO1_28);
+ 	// GPIO0_30 toggled during sampling
+ 	GPIO_Export(GPIO0_30);
  }
  
  /**