seniordesign-firmware Changeset - ba937cd712de

Changeset - ba937cd712de

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-03-26 17:03:41
ethanzonca@CL-ENS241-08.cedarville.edu

merge

3 files changed with 7 insertions and 7 deletions:

slave/slave/config.h

slave/slave/lib/inputOutput.c

slave/slave/modules.c

0 comments (0 inline, 0 general)

slave/slave/config.h

➞

Show inline comments

@@ @@ -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

slave/slave/lib/inputOutput.c

➞

Show inline comments

@@ @@ -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);
+	}
+ }

slave/slave/modules.c

➞

Show inline comments

@@ @@ -149,7 +149,7 @@ @@
+ {
 	// Gathers data and performs functions for cameras daughter board
 		cameras_readAccelXYZ();
+		//cameras_readAccelXYZ();
 		if ((time_millis() - pulseOn) > CAMERA_PULSE)
+		{

0 comments (0 inline, 0 general)