# HG changeset patch
# User mkroening@CL-ENS241-07.cedarville.edu
# Date 2013-03-25 16:38:51
# Node ID e9fb1e1bfee0c14544b6734052e0ec17cb5fcd9e
# Parent  62fbc7ad93b6fb6c49a4c96cd91a705d08073d8c

Camera functions

diff --git a/slave/slave/config.h b/slave/slave/config.h
--- a/slave/slave/config.h
+++ b/slave/slave/config.h
@@ -30,8 +30,8 @@
 //Sensors and IO
 #define SENSOR_LOOP 200				// Frequency of sensor reads (in ms) (should be 200)
 #define HEATER_THRESHOLD 0			// Temperature threshold in Fahrenheit where heater is activated
-#define CAMERA_FREQ 30000		// Camera pulse frequency
-#define CAMERA_PULSE 50			// Camera pulse duration
+#define CAMERA_FREQ 10000		// Camera pulse frequency (Should be 30000 for 30 Secs)
+#define CAMERA_PULSE 500			// Camera pulse duration
 
  //I2C Addresses
  #define EEPROM_ADDR 0xA0		// Read 0xA1 - Write 0xA0
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
@@ -57,10 +57,10 @@ int8_t	moduleID;	// Slave Module ID from
 	moduleID = (moduleID & 0b0111);				//Mask bits
 	*/
 
-//	while(moduleID==0)           //UNCOMMENT ALL THIS
-//	{
-//		moduleID = i2c_read(EEPROM_ADDR, 0x05);
-//	}
+	while(moduleID==0)           //UNCOMMENT ALL THIS
+	{
+		moduleID = i2c_read(EEPROM_ADDR, 0x05);
+	}
  }
  
  
diff --git a/slave/slave/modules.c b/slave/slave/modules.c
--- a/slave/slave/modules.c
+++ b/slave/slave/modules.c
@@ -149,7 +149,7 @@
  {
 	// Gathers data and performs functions for cameras daughter board
 		
-		cameras_readAccelXYZ();
+		//cameras_readAccelXYZ();
 		
 		if ((time_millis() - pulseOn) > CAMERA_PULSE)
 		{