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

@@ @@ -90,10 +90,10 @@ void masterComm_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
@@ @@ -111,16 +111,16 @@ void masterComm_modules() @@
 			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:

slave/slave/modules.c

➞

Show inline comments

@@ @@ -124,9 +124,9 @@ @@
 	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
+ }

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 \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

0 comments (0 inline, 0 general)