seniordesign-firmware Changeset - c3d8f52b562a

Changeset - c3d8f52b562a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-03 22:04:56
kripperger@CL-SEC241-09.cedarville.edu

Geiger work

3 files changed with 8 insertions and 8 deletions:

slave/slave/lib/inputOutput.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -43,7 +43,7 @@ int8_t moduleID; // Slave Module ID from @@
  void io_readModuleId()
+ {
 	// Get ID from rotary dip and return it.
-	moduleID = 0;
+	moduleID = 2;
 	/*
 	// This method is temporary as the next release will read the module ID from EEPROM
@@ @@ -57,10 +57,10 @@ int8_t moduleID; // Slave Module ID from @@
 	moduleID = (moduleID & 0b0111);				//Mask bits
 	*/
 	while(moduleID==0)           //UNCOMMENT ALL THIS
+	{
 		moduleID = i2c_read(EEPROM_ADDR, 0x05);
+	}
 	//while(moduleID==0)           //UNCOMMENT ALL THIS
 	//{
 	//	moduleID = i2c_read(EEPROM_ADDR, 0x05);
 	//}
+ }

slave/slave/modules.c

➞

Show inline comments

@@ @@ -96,8 +96,8 @@ @@
 	geiger_on();	// Turn on HV supply
 	// Setup for interrupt input on PA0 (PCINT0)
 	PCMSK0 |= (1 << PCINT0);	// Enable interrupt for PA0
 	PCICR |= (1 << PCIE0);		// Enable ioc section PCIF0
 	//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)

slave/slave/slave.c

➞

Show inline comments

@@ @@ -44,7 +44,7 @@ void micro_setup() @@
 	WDTreset = ((MCUSR & 0b00001000) > 0);	// Check if WDT reset occured
 	MCUSR = 0;		// Clear reset flags
 	wdt_disable();	// Disable WDT
-	_delay_ms(20);	// Power debounce
+	_delay_ms(50);	// Power debounce
 	sei();			// Enable interrupts
+}

0 comments (0 inline, 0 general)