seniordesign-firmware Changeset - be448d98aa94

Changeset - be448d98aa94

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

kripperger@CL-SEC241-09.cedarville.edu - 12 years ago 2013-04-29 20:06:39
kripperger@CL-SEC241-09.cedarville.edu

Allowed for Char sensor ID

1 file changed with 12 insertions and 12 deletions:

slave/slave/lib/masterComm.c

0 comments (0 inline, 0 general)

slave/slave/lib/masterComm.c

➞

Show inline comments

@@ @@ -85,7 +85,7 @@ void masterComm_types() @@
 void masterComm_packetSend_unsigned(uint8_t id, uint32_t data)	//Sends the data type and data to master for unsigned data
+{
 	serial0_sendChar('[');
-	snprintf(buff2,64,"%u%lu",id,data);
+	snprintf(buff2,64,"%c%lu",id,data);
 	serial0_sendString(buff2);
 	serial0_sendChar(']');
 	serial0_sendChar(masterComm_checksum(buff2));
@@ @@ -94,7 +94,7 @@ void masterComm_packetSend_unsigned(uint @@
 void masterComm_packetSend_signed(uint8_t id, int32_t data)	//Sends the data type and data to master for signed data
+{
 	serial0_sendChar('[');
-	snprintf(buff2,64,"%u%ld",id,data);
+	snprintf(buff2,64,"%c%ld",id,data);
 	serial0_sendString(buff2);
 	serial0_sendChar(']');
 	serial0_sendChar(masterComm_checksum(buff2));
@@ @@ -105,13 +105,13 @@ void masterComm_packetSend_signed(uint8_ @@
 void masterComm_modules()
+{
 	// Send Board Temperature (Common for all modules)
 	masterComm_packetSend_signed(0,sensors_getBoardTemp());
+	masterComm_packetSend_signed('0',sensors_getBoardTemp());
 	// Send Heater Status (Common for all modules)
 	masterComm_packetSend_unsigned(1,io_heaterStatus());
+	masterComm_packetSend_unsigned('1',io_heaterStatus());
 	// Send Battery Level (Common for all modules)
 	masterComm_packetSend_unsigned(2,sensors_getBatt());
+	masterComm_packetSend_unsigned('2',sensors_getBatt());
 	// Send module specific sensor readings
@@ @@ -126,26 +126,26 @@ void masterComm_modules() @@
 			// Sensors
 			// Send SPI Temperature (Air)
 			masterComm_packetSend_signed(3,sensors_getSpiTemp());
+			masterComm_packetSend_signed('3',sensors_getSpiTemp());
 			// Send Ambient Light (Needs to be formatted)
 			masterComm_packetSend_unsigned(4,sensors_getLux());
+			masterComm_packetSend_unsigned('4',sensors_getLux());
 			// Send Humidity
 			masterComm_packetSend_unsigned(5,/*Humidity Get Function Here */999);
+			masterComm_packetSend_unsigned('5',/*Humidity Get Function Here */999);
 			// Send Pressure
 			masterComm_packetSend_unsigned(6,sensors_getPressure());
+			masterComm_packetSend_unsigned('6',sensors_getPressure());
 			// Send Altitude
 			masterComm_packetSend_unsigned(7,sensors_getAltitude());
+			masterComm_packetSend_unsigned('7',sensors_getAltitude());
 			break;
 		case 2:
 			// Geiger
 			// Send CPM (radiation)
 			masterComm_packetSend_unsigned(8,geiger_getCpm());
+			masterComm_packetSend_unsigned('8',geiger_getCpm());
 			break;
 		case 3:
@@ @@ -155,7 +155,7 @@ void masterComm_modules() @@
 		case 4:
 			// Custom Daughterboard 1
+			//masterComm_packetSend_signed('A',sensors_getAnalog(3));	// EXAMPLE
 			break;
 		case 5:

0 comments (0 inline, 0 general)