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

@@ @@ -76,13 +76,13 @@ @@
+ }
  void modules_sensors_setup()
+ {
 	DESELECT_TEMP;
 	setup_spi();
 	sensors_setupPressure();
+	//sensors_setupPressure();
+ }
  void modules_geiger_setup()
+ {
 	// Pin setup
 	DDRA &= ~(1 << DDA0);	// PA0 is an input
@@ @@ -119,16 +119,16 @@ @@
+ }
  void modules_sensors()
+ {
 	// 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();
+ }
  void modules_geiger()
+ {

slave/slave/slave.c

➞

Show inline comments

@@ @@ -52,23 +52,23 @@ int main(void) @@
 	io_configure();			// Configure IO ports and registers
 	i2c_init();				// Setup I2C
 	serial0_setup();		// Config serial port
 	io_readModuleId();
 	modules_setup(io_getModuleId());				// Run setup functions for specific module
 	//uint8_t test;		//Debug
 	//uint8_t test2;	//Debug
 	// Serial output //DEBUG
 	char buff[64];							//Buffer for serial output //DEBUG
 	serial0_sendString("Starting Slave\r\n");
     while(1)
+    {
 		// Master communication
 		masterComm_checkParser();

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -74,13 +74,13 @@ @@
       <KeepTimersRunning>true</KeepTimersRunning>
       <OverrideVtor>false</OverrideVtor>
       <OverrideVtorValue>
       </OverrideVtorValue>
       <Channel>
         <host>127.0.0.1</host>
-        <port>60480</port>
+        <port>61820</port>
         <ssl>False</ssl>
       </Channel>
       <ToolOptions>
         <InterfaceName>ISP</InterfaceName>
         <InterfaceProperties>
           <JtagDbgClock>0</JtagDbgClock>

0 comments (0 inline, 0 general)