seniordesign-firmware Changeset - b4f5f0f9c2c9

Changeset - b4f5f0f9c2c9

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-05 15:50:23
ethanzonca@CL-ENS241-08.cedarville.edu

Merge

3 files changed with 8 insertions and 8 deletions:

slave/slave/modules.c

slave/slave/slave.c

slave/slave/slave.cproj

0 comments (0 inline, 0 general)

slave/slave/modules.c

➞

Show inline comments

@@ @@ -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();
+ }

slave/slave/slave.c

➞

Show inline comments

@@ @@ -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)
+    {

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -77,7 +77,7 @@ @@
       </OverrideVtorValue>
       <Channel>
         <host>127.0.0.1</host>
-        <port>60480</port>
+        <port>61820</port>
         <ssl>False</ssl>
       </Channel>
       <ToolOptions>

0 comments (0 inline, 0 general)