seniordesign-firmware Changeset - 69eb638df718

Changeset - 69eb638df718

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 2 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-12 16:03:21
ethanzonca@CL-ENS241-08.cedarville.edu

Merge

2 files changed with 3 insertions and 3 deletions:

slave/slave/config.h

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/config.h

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ @@
 #define DATATYPES_CAMERA 3
 //Sensors and IO
-#define SENSOR_LOOP 3000				// Frequency of sensor reads (in ms) (should be 200)
+#define SENSOR_LOOP 100				// Frequency of sensor reads (in ms) (should be 200)
 #define HEATER_THRESHOLD 40			// Temperature threshold in Fahrenheit where heater is activated
  //I2C Addresses

slave/slave/slave.c

➞

Show inline comments

@@ @@ -82,8 +82,8 @@ int main(void) @@
 			io_regulateTemp();			// Gets board temperature and enables heater if below threshold
 			snprintf(buff,64,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |SpiTemp: %i\r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getSpiTemp()); //DEBUG
 			serial0_sendString(buff); //DEBUG
 			//snprintf(buff,64,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |SpiTemp: %i\r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getSpiTemp()); //DEBUG
 			//serial0_sendString(buff); //DEBUG
 			_delay_ms(2);		// Delay to prevent the sensor loop from running again before time_millis changes
 			led_off(0);

0 comments (0 inline, 0 general)