# HG changeset patch
# User ethanzonca@CL-ENS241-08.cedarville.edu
# Date 2013-02-05 15:50:23
# Node ID b4f5f0f9c2c9754345d5df85aa389f6255b149f9
# Parent  8bafd525c5116967c09c4804a7da35a535a25f90
# Parent  03f315df1ad521adc2181d62c05b928e7ebad019

Merge

diff --git a/slave/slave/modules.c b/slave/slave/modules.c
--- a/slave/slave/modules.c
+++ b/slave/slave/modules.c
@@ -79,7 +79,7 @@
  {
 	DESELECT_TEMP;
 	setup_spi();
-	sensors_setupPressure();
+	//sensors_setupPressure();
  }
   
  void modules_geiger_setup()
@@ -122,10 +122,10 @@
  {
 	// Gathers data and performs functions for sensor daughter board
 	sensors_readBoardTemp();		//Data Read
-	sensors_readSpiTemp();			//Data Read
-	sensors_readPressure();			//Data Read
-	sensors_readHumid();			//Data Read
-	sensors_readLight();			//Data Read
+	//sensors_readSpiTemp();			//Data Read
+	//sensors_readPressure();			//Data Read
+	//sensors_readHumid();				//Data Read
+	//sensors_readLight();				//Data Read
 	//sensors_readBatt();
 	 
  }
diff --git a/slave/slave/slave.c b/slave/slave/slave.c
--- a/slave/slave/slave.c
+++ b/slave/slave/slave.c
@@ -55,7 +55,7 @@ int main(void)
 	
 	io_readModuleId();
 	modules_setup(io_getModuleId());				// Run setup functions for specific module
-	
+
 	
 	//uint8_t test;		//Debug
 	//uint8_t test2;	//Debug	
@@ -65,7 +65,7 @@ int main(void)
 	char buff[64];							//Buffer for serial output //DEBUG
 	serial0_sendString("Starting Slave\r\n");
 	
-	
+			
     while(1)
     {	
 		
diff --git a/slave/slave/slave.cproj b/slave/slave/slave.cproj
--- a/slave/slave/slave.cproj
+++ b/slave/slave/slave.cproj
@@ -77,7 +77,7 @@
       </OverrideVtorValue>
       <Channel>
         <host>127.0.0.1</host>
-        <port>60480</port>
+        <port>61820</port>
         <ssl>False</ssl>
       </Channel>
       <ToolOptions>