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 11 insertions and 3 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

@@ @@ -100,8 +100,6 @@ @@
 	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
+ }

slave/slave/slave.c

➞

Show inline comments

@@ @@ -32,7 +32,7 @@ @@
 #include "lib/cameras.h"
 #include "lib/loopTimer.h"
 #include "lib/masterComm.h"
+#include "lib/watchdog.h"
 void micro_setup()
@@ @@ -49,9 +49,13 @@ int main(void) @@
 	// 0 is for generic setup, 1 is for sensors, 2 is for Geiger, 3 is for cameras
 	//i2c_write(EEPROM_ADDR, 0x05, 0x03);
 	// 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

slave/slave/slave.cproj

➞

Show inline comments

@@ @@ -208,6 +208,12 @@ @@
     <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>

0 comments (0 inline, 0 general)