seniordesign-firmware Changeset - c926355530a3

Changeset - c926355530a3

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-03-14 23:41:02
kripperger@CL-SEC241-09.cedarville.edu

This messes everything up

2 files changed with 10 insertions and 7 deletions:

slave/slave/lib/inputOutput.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -54,16 +54,16 @@ int8_t moduleID; // Slave Module ID from @@
 	moduleID = ((PINC & 0b00011100) >> 2);		// Read Dip Encoder
 	moduleID = ~moduleID;						//Invert Dip reading
 	moduleID = (moduleID & 0b0111);				//Mask bits
 	*/
 	while(moduleID==0)
+	{
 		moduleID = i2c_read(EEPROM_ADDR, 0x05);
+	}
 //	while(moduleID==0)           //UNCOMMENT ALL THIS
 //	{
 //		moduleID = i2c_read(EEPROM_ADDR, 0x05);
 //	}
+ }
  uint8_t io_getModuleId()
+ {
 	return moduleID;

slave/slave/slave.c

➞

Show inline comments

@@ @@ -52,13 +52,13 @@ int main(void) @@
 	// 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
+	//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();
@@ @@ -71,14 +71,17 @@ int main(void) @@
     while(1)
+    {
 		// Master communication
 		masterComm_checkParser();	//Checks parser for data requests from master
 		led_on(0);
 		led_on(1);
 		led_on(2);
 		led_on(3);
 		io_heaterOn();
 		// Main slave operations
 		if ((time_millis() % SENSOR_LOOP) == 0)	// Uses program timer to run every so often. Time interval defined in config.h
+		{
 			led_on(0);
 			sensors_readBatt();				// Read Battery level

0 comments (0 inline, 0 general)