seniordesign-firmware Changeset - 03f315df1ad5

Changeset - 03f315df1ad5

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-02-04 17:25:50
kripperger@CL-SEC241-09.cedarville.edu

Fixes so it compiles onto slave

2 files changed with 6 insertions and 6 deletions:

slave/slave/modules.c

slave/slave/slave.cproj

0 comments (0 inline, 0 general)

slave/slave/modules.c

➞

Show inline comments

@@ @@ -70,25 +70,25 @@ @@
+ }
  void modules_generic_setup()
+ {
+ }
  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
 	// Setup for interrupt input on PA0 (PCINT0)
 	PCMSK0 |= (1 << PCINT0);	// Enable interrupt for PA0
 	PCICR |= (1 << PCIE0);		// Enable ioc section PCIF0
@@ @@ -113,28 +113,28 @@ @@
  void modules_generic()
+ {
 	// Gathers data and performs functions for generic daughter board
+ }
  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()
+ {
 	// No data gatering function needed for geiger daughter board
 		// This is taken care of in interrupt (See geiger.c)
+ }
  void modules_cameras()

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -68,25 +68,25 @@ @@
     </com_atmel_avrdbg_tool_ispmk2>
     <preserveEEPROM>True</preserveEEPROM>
     <com_atmel_avrdbg_tool_avrdragon>
       <ToolType>com.atmel.avrdbg.tool.avrdragon</ToolType>
       <ToolName>AVR Dragon</ToolName>
       <ToolNumber>00A200035378</ToolNumber>
       <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>
           <JtagProgClock>1000000</JtagProgClock>
           <IspClock>2000000</IspClock>
           <JtagInChain>false</JtagInChain>
           <JtagEnableExtResetOnStartSession>false</JtagEnableExtResetOnStartSession>
           <JtagDevicesBefore>0</JtagDevicesBefore>
           <JtagDevicesAfter>0</JtagDevicesAfter>

0 comments (0 inline, 0 general)