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

@@ @@ -34,42 +34,42 @@ int8_t moduleID; // Slave Module ID from @@
 	//ADCSRA |= (1 << ADIF);								//
 	//ADCSRA |= (1 << ADIE);								// ADC interrupt enable set
 	ADCSRB &= ~((1 << ADTS2) | (1 << ADTS1) | (1 << ADTS0));// Set ADC auto trigger source to free running mode
 	ADCSRA |= (1 << ADEN);									// Enable ADC
 	ADCSRA |= (1 << ADSC);									// Start ADC measurements.  ADC should now continuously run conversions, which are stored in ADCH 0x79
+ }
  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
 	PORTC |= (1 << PC2);	// Pull pins on rotary dip high
 	PORTC |= (1 << PC3);	// Pull pins on rotary dip high
 	PORTC |= (1 << PC4);	// Pull pins on rotary dip high
 	PORTC |= (1 << PC5);	// Pull pins on rotary dip high
 	moduleID = ((PINC & 0b00011100) >> 2);		// Read Dip Encoder
 	moduleID = ~moduleID;						//Invert Dip reading
 	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);
 	//}
+ }
  uint8_t io_getModuleId()
+ {
 	return moduleID;
+ }
  void io_heaterOn()
+ {
 	PORTB |= (1 << PB4);	//ON

slave/slave/modules.c

➞

Show inline comments

@@ @@ -87,26 +87,26 @@ @@
 	sensors_setupPressure();
+ }
  void modules_geiger_setup()
+ {
 	// Pin setup
 	DDRA &= ~(1 << DDA0);	// PA0 is an input
 	DDRA |= (1 << DDA1);	// PA1 is an output
 	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)
 	ASSR |= (1 << AS2);		// Enable timer2 async mode with an external crystal
 	_delay_ms(100);			// 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
+ }

slave/slave/slave.c

➞

Show inline comments

@@ @@ -35,25 +35,25 @@ @@
 #include "lib/loopTimer.h"
 #include "lib/masterComm.h"
 #include "lib/watchdog.h"
 bool WDTreset = false;
 void micro_setup()
+{
 	// Generic microcontroller config options
 	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
+}
 int main(void)
+{
 	// Initialize
 	micro_setup();			// Generic microcontroller config options
 	time_setup();			// Setup loop timer and interrupts (TIMER0)

0 comments (0 inline, 0 general)