seniordesign-firmware Changeset - e3854a3907c2

Changeset - e3854a3907c2

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-02-15 14:16:56
kripperger@CL-SEC241-09.cedarville.edu

Seup up sensor data to masterComms

3 files changed with 9 insertions and 9 deletions:

slave/slave/lib/masterComm.c

slave/slave/modules.c

slave/slave/slave.c

0 comments (0 inline, 0 general)

slave/slave/lib/masterComm.c

➞

Show inline comments

@@ @@ -69,79 +69,79 @@ void masterComm_packetSend_unsigned(uint @@
 	serial0_sendChar('[');
 	snprintf(buff2,64,"%u%lu",id,data);
 	serial0_sendString(buff2);
 	serial0_sendChar(']');
 	serial0_sendChar(masterComm_checksum(buff2));
+}
 void masterComm_packetSend_signed(uint8_t id, int32_t data)
+{
 	serial0_sendChar('[');
 	snprintf(buff2,64,"%u%ld",id,data);
 	serial0_sendString(buff2);
 	serial0_sendChar(']');
 	serial0_sendChar(masterComm_checksum(buff2));
+}
 void masterComm_modules()
+{
 	// Send Board Temperature (Common for all modules)
 	masterComm_packetSend_signed(0,sensors_getBoardTemp());
 	// Send Heater Status (Common for all modules)
-	masterComm_packetSend_unsigned(1,/*Heater Status Get Function Here */0);
+	masterComm_packetSend_unsigned(1,io_heaterStatus());
 	// Send Battery Level (Common for all modules)
-	masterComm_packetSend_unsigned(2,/*Battery Level Get Function Here */0);
+	masterComm_packetSend_unsigned(2,/*Battery Level Get Function Here */999);
 	// Send module specific sensor readings
 	switch(io_getModuleId())
+	{
 		case 0:
 			// Generic
 			break;
 		case 1:
 			// Sensors
 			// Send SPI Temperature (Air)
 			masterComm_packetSend_unsigned(3,sensors_getSpiTemp());
 			// Send Ambient Light (Needs to be formatted)
-			masterComm_packetSend_unsigned(4,/*Ambient Light Get Function Here */44);
+			masterComm_packetSend_unsigned(4,sensors_getLux());
 			// Send Humidity
-			masterComm_packetSend_unsigned(5,/*Humidity Get Function Here */55);
+			masterComm_packetSend_unsigned(5,/*Humidity Get Function Here */999);
 			// Send Pressure
-			masterComm_packetSend_unsigned(6,/*Pressure Get Function Here */66);
+			masterComm_packetSend_unsigned(6,sensors_getPressure());
 			// Send Altitude
-			masterComm_packetSend_unsigned(7,/*Altitude Get Function Here */77);
+			masterComm_packetSend_unsigned(7,sensors_getAltitude());
 			break;
 		case 2:
 			// Geiger
 			// Send CPM (radiation)
 			masterComm_packetSend_unsigned(8,geiger_getCpm());
 			break;
 		case 3:
 			// Camera
 			break;
 		default:
 			break;
+	}
+}
 void masterComm_send()
+{

slave/slave/modules.c

➞

Show inline comments

@@ @@ -103,43 +103,43 @@ @@
 	sei();					// Enable all interrupts
+ }
  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_readHumid();			//Data Read
 	sensors_readLux();				//Data Read
 	sensors_readBatt();
+	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 \r\n",io_getModuleId(),sensors_getBoardTemp(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude()); //DEBUG
+			snprintf(buff,128,"|ModuleID: %u |BoardTemp: %i |Heater: %u |Millis: %lu |Lux: %lu |Pressure: %lu |Altitude: %lu \r\n",io_getModuleId(),sensors_getBoardTemp(),io_heaterStatus(),time_millis(),sensors_getLux(),sensors_getPressure(),sensors_getAltitude()); //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)