seniordesign-firmware Changeset - 561ff9d0140a

Changeset - 561ff9d0140a

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

mkroening@CL-ENS241-07.cedarville.edu - 12 years ago 2013-02-21 15:46:13
mkroening@CL-ENS241-07.cedarville.edu

ADC is responsive, moved out of slave daughter

3 files changed with 3 insertions and 3 deletions:

slave/slave/lib/sensors.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/sensors.c

➞

Show inline comments

@@ @@ -254,7 +254,7 @@ uint32_t sensors_getLux(void) // Gets l @@
+}
 //possibly uint8_t
-uint8_t sensors_getBatt(void)		// Gets battery voltage from variable
+int8_t sensors_getBatt(void)		// Gets battery voltage from variable
+{
 	return batt;
+}

slave/slave/modules.c

➞

Show inline comments

@@ @@ -44,6 +44,7 @@ @@
  void modules_run(uint8_t id)
+ {
 	 sensors_readBatt();				//Data Read
 	switch(id)
+	{
 		case 0:
@@ @@ -126,7 +127,6 @@ @@
 	sensors_readPressure();			//Data Read
 	//sensors_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
 	sensors_readBatt();				//Data Read
+ }

slave/slave/slave.c

➞

Show inline comments

@@ @@ -82,7 +82,7 @@ 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
+			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu |Battery: %i \r\n ",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude(),sensors_getBatt()); //DEBUG
 			serial0_sendString(buff); //DEBUG
 			_delay_ms(2);		// Delay to prevent the sensor loop from running again before time_millis changes

0 comments (0 inline, 0 general)