seniordesign-firmware Changeset - 047bf62162d3

Changeset - 047bf62162d3

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-03-14 18:40:55
kripperger@CL-SEC241-09.cedarville.edu

3 files changed with 12 insertions and 4 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

@@ @@ -91,26 +91,24 @@ @@
 	// Setup for interrupt input on PA0 (PCINT0)
 	PCMSK0 |= (1 << PCINT0);	// Enable interrupt for PA0
 	PCICR |= (1 << PCIE0);		// Enable ioc section PCIF0
 	// Setup for interrupt from Timer2
 	ASSR &= ~(1 << EXCLK);	// Disable external clock input (enabling crystal use)
 	ASSR |= (1 << AS2);		// Enable timer2 async mode with an external crystal
 	_delay_ms(250);			// Let external 32KHz crystal stabilize
 	TCCR2B = 0x05;			// Set the prescaler to 128: 32.768kHz / 128 = 1Hz overflow
 	TIFR2 = 0x01;			// Reset timer2 overflow interrupt flag
 	TIMSK2 = 0x01;			// Enable interrupt on overflow
 	sei();					// Enable all interrupts
+ }
  void modules_cameras_setup()
+ {
+ }
  void modules_generic()
+ {

slave/slave/slave.c

➞

Show inline comments

@@ @@ -23,44 +23,48 @@ @@
 #include "modules.h"
 #include "lib/serial.h"
 #include "lib/serparser.h"
 #include "lib/led.h"
 #include "lib/inputOutput.h"
 #include "lib/i2c.h"
 #include "lib/spi.h"
 #include "lib/geiger.h"
 #include "lib/sensors.h"
 #include "lib/cameras.h"
 #include "lib/loopTimer.h"
 #include "lib/masterComm.h"
+#include "lib/watchdog.h"
 void micro_setup()
+{
 	// Generic microcontroller config options
 	sei();	// Enable interrupts
+}
 int main(void)
+{
 	// Writes ID to EEPROM, change for all modules and delete after programming
 	// 0 is for generic setup, 1 is for sensors, 2 is for Geiger, 3 is for cameras
 	//i2c_write(EEPROM_ADDR, 0x05, 0x03);
 	// Initialize
 	// Power debounce
 	_delay_ms(20);
 	// Initialize
 	micro_setup();			// Generic microcontroller config options
 	time_setup();			// Setup loop timer and interrupts (TIMER0)
 	watchdog_setup();		// Setup watchdog timer
 	led_configure();		// Configure ports and registers for LED operation
 	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
 	// Serial output //DEBUG
 	char buff[128];						//Buffer for serial output //DEBUG
 	serial0_sendString("Starting Slave\r\n");	//DEBUG

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -199,24 +199,30 @@ @@
     <Compile Include="lib\serparser.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\serparser.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\spi.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\spi.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\watchdog.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="lib\watchdog.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="modules.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="modules.h">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="slave.c">
       <SubType>compile</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="lib" />

0 comments (0 inline, 0 general)