Changeset - dade34bdd36d
[Not reviewed]
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:
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 = 1;
 
	
 
	/*
 
	// This method is temporary as the next release will read the module ID from EEPROM
slave/slave/modules.c
Show inline comments
 
@@ -90,14 +90,14 @@
 
 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)
 
@@ -135,7 +135,7 @@
 
	sensors_readSpiTemp();			//Data Read	
 
	sensors_readPressure();			//Data Read
 
	//sensors_readHumid();			//Data Read
 
	sensors_readLux();				//Data Read
 
	//sensors_readLux();				//Data Read
 
	 
 
 }
 
  
0 comments (0 inline, 0 general)