seniordesign-firmware Changeset - 065c4b037614

Changeset - 065c4b037614

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 1 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-03-18 15:19:35
ethanzonca@CL-ENS241-08.cedarville.edu

merge

1 file changed with 3 insertions and 7 deletions:

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/slave.c

➞

Show inline comments

@@ @@ -74,11 +74,7 @@ int main(void) @@
 		// Master communication
 		masterComm_checkParser();	//Checks parser for data requests from master
 		led_on(0);
 		led_on(1);
 		led_on(2);
 		led_on(3);
 		io_heaterOn();
 		// Main slave operations
 		if ((time_millis() % SENSOR_LOOP) == 0)	// Uses program timer to run every so often. Time interval defined in config.h
+		{
@@ @@ -90,8 +86,8 @@ 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
 			serial0_sendString(buff); //DEBUG
 //			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
 //			serial0_sendString(buff); //DEBUG
 			_delay_ms(1);		// Delay to prevent the sensor loop from running again before time_millis changes
 			led_off(0);

0 comments (0 inline, 0 general)