seniordesign-firmware Changeset - dade34bdd36d

Changeset - dade34bdd36d

Parent rev.

Child rev.

[Not reviewed]

Launch-1 default

0 2 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-08 14:01:23
kripperger@CL-SEC241-09.cedarville.edu

launch day

2 files changed with 5 insertions and 5 deletions:

slave/slave/lib/inputOutput.c

slave/slave/modules.c

0 comments (0 inline, 0 general)

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -40,13 +40,13 @@ int8_t moduleID; // Slave Module ID from @@
+ }
  void io_readModuleId()
+ {
 	// Get ID from rotary dip and return it.
-	moduleID = 0;
+	moduleID = 1;
 	/*
 	// 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

slave/slave/modules.c

➞

Show inline comments

@@ @@ -87,20 +87,20 @@ @@
 	sensors_setupPressure();
+ }
  void modules_geiger_setup()
+ {
 	// Pin setup
 	DDRA &= ~(1 << DDA0);	// PA0 is an input
+	//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
@@ @@ -132,13 +132,13 @@ @@
+ {
 	// Gathers data and performs functions for sensor daughter board
 	sensors_readBoardTemp();		//Data Read
 	sensors_readSpiTemp();			//Data Read
 	sensors_readPressure();			//Data Read
 	//sensors_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
+	//sensors_readLux();				//Data Read
+ }
  void modules_geiger()
+ {
 	// No data gatering function needed for geiger daughter board

0 comments (0 inline, 0 general)