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

@@ @@ -251,13 +251,13 @@ uint16_t sensors_getHumid(void) // Get @@
 uint32_t sensors_getLux(void)		// Gets light from variable
+{
 	return lux;
+}
 //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;
+}
 uint32_t sensors_getAltitude(void)
+{

slave/slave/modules.c

➞

Show inline comments

@@ @@ -41,12 +41,13 @@ @@
+	}
+ }
  void modules_run(uint8_t id)
+ {
 	 sensors_readBatt();				//Data Read
 	switch(id)
+	{
 		case 0:
 			modules_generic();
 			break;
@@ @@ -123,13 +124,12 @@ @@
 	// Gathers data and performs functions for sensor daughter board
 	sensors_readBoardTemp();		//Data Read
 	sensors_readSpiTemp();			//Data Read
 	sensors_readPressure();			//Data Read
 	//sensors_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
 	sensors_readBatt();				//Data Read
+ }
  void modules_geiger()
+ {
 	// No data gatering function needed for geiger daughter board

slave/slave/slave.c

➞

Show inline comments

@@ @@ -79,13 +79,13 @@ int main(void) @@
 			led_on(0);
 			sensors_readBoardTemp();	// Read board temperature sensor (Common on all slaves) (Data Read)
 			modules_run(io_getModuleId());		// Runs specific module functions (like data reading)
 			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
 			led_off(0);
 			led_off(2);
+		}

0 comments (0 inline, 0 general)