# HG changeset patch
# User ethanzonca@CL-ENS241-08.cedarville.edu
# Date 2013-02-21 16:37:40
# Node ID b1ac4ce97b322999490882eee2203e86c0db796d
# Parent  6ab6b1fe23146719cc9d78c043a1c3e31fb3e2f5
# Parent  561ff9d0140aa36d4da4f6e7cd1d5f5fe728cf38

merge

diff --git a/slave/slave/lib/inputOutput.c b/slave/slave/lib/inputOutput.c
--- a/slave/slave/lib/inputOutput.c
+++ b/slave/slave/lib/inputOutput.c
@@ -33,7 +33,7 @@ int8_t	moduleID;	// Slave Module ID from
 	ADCSRA |= (1 << ADATE);									// Enables auto trigger, determined in ADCSRB bits ADTS
 	//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
+	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
 	
diff --git a/slave/slave/lib/sensors.h b/slave/slave/lib/sensors.h
--- a/slave/slave/lib/sensors.h
+++ b/slave/slave/lib/sensors.h
@@ -15,7 +15,7 @@ void sensors_readSpiTemp(void);		// Read
 void sensors_readBoardTemp(void);	// Reads board temperature
 void sensors_readPressure(void);	// Reads pressure
 void sensors_readHumid(void);		// Reads humidity
-void sensors_readLux(void);		// Reads lux
+void sensors_readLux(void);			// Reads lux
 void sensors_readBatt(void);
 
 int16_t sensors_getSpiTemp(void);	// Gets spi temperature from variable
@@ -24,6 +24,6 @@ int32_t sensors_getPressure(void);	// Ge
 uint16_t sensors_getHumid(void);	// Gets humidity from variable
 uint32_t sensors_getLux(void);		// Gets lux from variable
 int8_t sensors_getBatt(void);		// Gets battery voltage from variable
-uint32_t sensors_getAltitude(void);		// Gets altitude from variable
+uint32_t sensors_getAltitude(void);	// Gets altitude from variable
 
 #endif /* SENSORS_H_ */
\ No newline at end of file
diff --git a/slave/slave/modules.c b/slave/slave/modules.c
--- a/slave/slave/modules.c
+++ b/slave/slave/modules.c
@@ -44,6 +44,7 @@
  
  void modules_run(uint8_t id)
  {
+	 sensors_readBatt();				//Data Read
 	switch(id)
 	{
 		case 0:
@@ -126,7 +127,6 @@
 	sensors_readPressure();			//Data Read
 	//sensors_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
-	sensors_readBatt();				//Data Read
 	 
  }
   
diff --git a/slave/slave/slave.c b/slave/slave/slave.c
--- a/slave/slave/slave.c
+++ b/slave/slave/slave.c
@@ -82,7 +82,7 @@ int main(void)
 			
 			io_regulateTemp();			// Gets board temperature and enables heater if below threshold
 
-			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu |Battery: %u \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt()); //DEBUG
+			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu |Battery: %i \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt()); //DEBUG
 			serial0_sendString(buff); //DEBUG
 
 			_delay_ms(2);		// Delay to prevent the sensor loop from running again before time_millis changes