seniordesign-firmware Changeset - 0568291d2d64

Changeset - 0568291d2d64

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 1 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-05 16:42:02
ethanzonca@CL-ENS241-08.cedarville.edu

Merge

1 file changed with 6 insertions and 6 deletions:

slave/slave/lib/masterComm.c

0 comments (0 inline, 0 general)

slave/slave/lib/masterComm.c

➞

Show inline comments

@@ @@ -58,34 +58,34 @@ void masterComm_types() @@
 			break;
 		default:
 			dataTypes = DATATYPES_GENERIC;
 			break;
+	}
+}
 void masterComm_packetSend_unsigned(uint8_t id, uint32_t data)
+{
 	serial0_sendChar('[');
-	snprintf(buff2,64,"%u%u",id,data);
+	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%d",id,data);
+	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());
@@ @@ -102,34 +102,34 @@ void masterComm_modules() @@
 		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 */0);
+			masterComm_packetSend_unsigned(4,/*Ambient Light Get Function Here */123);
 			// Send Humidity
-			masterComm_packetSend_unsigned(5,/*Humidity Get Function Here */0);
+			masterComm_packetSend_unsigned(5,/*Humidity Get Function Here */456);
 			// Send Pressure
-			masterComm_packetSend_unsigned(6,/*Pressure Get Function Here */0);
+			masterComm_packetSend_unsigned(6,/*Pressure Get Function Here */7890);
 			// Send Altitude
-			masterComm_packetSend_unsigned(7,/*Altitude Get Function Here */0);
+			masterComm_packetSend_unsigned(7,/*Altitude Get Function Here */456789);
 			break;
 		case 2:
 			// Geiger
 			// Send CPM (radiation)
 			masterComm_packetSend_unsigned(8,geiger_getCpm());
 			break;
 		case 3:
 			// Camera

0 comments (0 inline, 0 general)