# HG changeset patch
# User kripperger@CL-SEC241-09.cedarville.edu
# Date 2013-03-28 15:04:31
# Node ID bbe7bcc4bf574ad24c32cc2528a7742b24697e20
# Parent  ba937cd712de103da0f2f657ba6f0d498be4d320

Humidity debugging

diff --git a/slave/slave/config.h b/slave/slave/config.h
--- a/slave/slave/config.h
+++ b/slave/slave/config.h
@@ -37,7 +37,7 @@
  #define EEPROM_ADDR 0xA0		// Read 0xA1 - Write 0xA0
  #define BOARDTEMP_ADDR 0x90	// Read 0x91 - Write 0x90
  #define PRESSURE_ADDR 0xEE		// Read 0xEF - Write 0xEE
- #define HUMID_ADDR 0x26		// Read 0x27 - Write 0x26
+ #define HUMID_ADDR 0x27		// Read 0x28 - Write 0x27
  #define LIGHT_ADDR 0x94		// Read 0x95 - Write 0x94
  #define ACCEL_ADDR	0x38		// Read 0x39 - Write 0x38
  #define RTC_ADDR 0xB2			//DEBUG [Used for testing]      // Read 0xA3 - Write 0xA2
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
@@ -195,7 +195,7 @@ void sensors_readHumid()
 	humid = i2c_read16(HUMID_ADDR);
 	
 	//calculations to relative humidity: humid = (humid/((2^14) - 1))*100%       >> is divide by power, << is multiply by power, 2^14-1 = 16383
-	humid = (humid / 16383) * 100;
+	 //humid = (humid / 16383) * 100;
 }
 
 void sensors_readLux()
diff --git a/slave/slave/modules.c b/slave/slave/modules.c
--- a/slave/slave/modules.c
+++ b/slave/slave/modules.c
@@ -133,7 +133,7 @@
 	sensors_readBoardTemp();		//Data Read
 	sensors_readSpiTemp();			//Data Read
 	sensors_readPressure();			//Data Read
-	//sensors_readHumid();			//Data Read
+	sensors_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
 	 
  }
diff --git a/slave/slave/slave.c b/slave/slave/slave.c
--- a/slave/slave/slave.c
+++ b/slave/slave/slave.c
@@ -94,7 +94,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: %u |Humidity: %u \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt(),sensors_getHumid()); //DEBUG
 			serial1_sendString(buff); //DEBUG
 			
 			led_off(0);