# HG changeset patch
# User mkroening@CL-ENS241-07.cedarville.edu
# Date 2013-02-21 15:46:13
# Node ID 561ff9d0140aa36d4da4f6e7cd1d5f5fe728cf38
# Parent  632be4bc87e246447228deefb11b7010a764bf85

ADC is responsive, moved out of slave daughter

diff --git a/slave/slave/lib/sensors.c b/slave/slave/lib/sensors.c
--- a/slave/slave/lib/sensors.c
+++ b/slave/slave/lib/sensors.c
@@ -254,7 +254,7 @@ uint32_t sensors_getLux(void)		// Gets l
 }
 
 //possibly uint8_t
-uint8_t sensors_getBatt(void)		// Gets battery voltage from variable
+int8_t sensors_getBatt(void)		// Gets battery voltage from variable
 {
 	return batt;
 }
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