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

@@ @@ -233,33 +233,33 @@ int16_t sensors_getSpiTemp(void) // Gets @@
 	return spiTemp;
+}
 int8_t sensors_getBoardTemp(void)	// Gets board temperature from variable
+{
 	return boardTemp;
+}
 int32_t sensors_getPressure(void)	// Gets pressure from variable
+{
 	return pressure;
+}
 uint16_t sensors_getHumid(void)			// Gets relative humidity from variable
+{
 	return humid;
+}
 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)
+{
 	return altitude;
+}
@@ \ No newline at end of file @@

slave/slave/modules.c

➞

Show inline comments

@@ @@ -23,48 +23,49 @@ @@
 			modules_generic_setup();
 			break;
 		case 1:
 			modules_sensors_setup();
 			break;
 		case 2:
 			modules_geiger_setup();
 			break;
 		case 3:
 			modules_cameras_setup();
 			break;
 		default:
 			modules_generic_setup();
 			break;
+	}
+ }
  void modules_run(uint8_t id)
+ {
 	 sensors_readBatt();				//Data Read
 	switch(id)
+	{
 		case 0:
 			modules_generic();
 			break;
 		case 1:
 			modules_sensors();
 			break;
 		case 2:
 			modules_geiger();
 			break;
 		case 3:
 			modules_cameras();
 			break;
 		default:
 			modules_generic();
 			break;
+	}
+ }
@@ @@ -105,41 +106,40 @@ @@
+ }
  void modules_cameras_setup()
+ {
+ }
  void modules_generic()
+ {
 	// Gathers data and performs functions for generic daughter board
+ }
  void modules_sensors()
+ {
 	// 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
 		// This is taken care of in interrupt (See geiger.c)
+ }
  void modules_cameras()
+ {
 	// Gathers data and performs functions for cameras daughter board
+ }
@@ \ No newline at end of file @@

slave/slave/slave.c

➞

Show inline comments

@@ @@ -61,49 +61,49 @@ int main(void) @@
 	//uint8_t test2;	//Debug
 	// Serial output //DEBUG
 	char buff[128];							//Buffer for serial output //DEBUG
 	serial0_sendString("Starting Slave\r\n");
     while(1)
+    {
 		// Master communication
 		masterComm_checkParser();
 		// Main slave operations
 		if ((time_millis() % SENSOR_LOOP) == 0)	// Uses program timer to run every so often. Time interval defined in config.h
+		{
 			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);
+		}
+    }
 	return 0;
+}
 		/********Examples of data reading and getting******************
 		x = geiger_getCpm();				//Data get
 		x = sensors_getSpiTemp();			//Data get
 		x = sensors_getBoardTemp();			//Data get
 		sensors_readSpiTemp();				//Data Read
 		sensors_readBoardTemp();			//Data Read

0 comments (0 inline, 0 general)