# HG changeset patch
# User kripperger@CL-SEC241-09.cedarville.edu
# Date 2013-03-21 14:34:51
# Node ID 735b62d9b05edd1b9a7cea985f7af7b5168ab2a4
# Parent  006bbb89fd70aace828cd2f57e8593de0edb7f9c

Camera work

diff --git a/slave/slave/config.h b/slave/slave/config.h
--- a/slave/slave/config.h
+++ b/slave/slave/config.h
@@ -30,6 +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
 
  //I2C Addresses
  #define EEPROM_ADDR 0xA0		// Read 0xA1 - Write 0xA0
diff --git a/slave/slave/modules.c b/slave/slave/modules.c
--- a/slave/slave/modules.c
+++ b/slave/slave/modules.c
@@ -14,6 +14,9 @@
  #include "lib/spi.h"
  #include "lib/i2c.h"
  #include "lib/sensors.h"
+ #include "lib/loopTimer.h"
+ 
+ uint32_t lastPicture;
  
  void modules_setup(uint8_t id)
  {
@@ -140,13 +143,15 @@
  void modules_cameras()
  {
 	// Gathers data and performs functions for cameras daughter board
-	int16_t pcount;
-	if pcount == 1000
-	{
+
 		cameras_readAccelXYZ();
-		cameras_sendPulse();
-		pcount = 0;
-	}
-	pcount	++;  
+		
+		if ((time_millis() - lastPicture) > CAMERA_FREQ)	// Frequency of photos
+		{
+			cameras_sendPulse();
+			lastPicture = time_millis();
+		}
+			
+
  } 
   
\ No newline at end of file