seniordesign-firmware Changeset - 48235b240e56

Changeset - 48235b240e56

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-04-18 22:00:27
ethanzonca@CL-ENS241-08.cedarville.edu

Fixed issue where master battery voltage was not included in APRS transmission. Switched vBatt identifier from 'l' to 'b'

1 file changed with 2 insertions and 2 deletions:

master/master/lib/sensordata.c

0 comments (0 inline, 0 general)

master/master/lib/sensordata.c

➞

Show inline comments

@@ @@ -81,13 +81,13 @@ char* slavesensors_getAPRScomment(char* @@
 	snprintf(commentBuffer,bufferSize, "~v%s~_%s~|%s", get_speedKnots(), get_latitudeLSBs(), get_longitudeLSBs());
 	if(isEven)
+	{
 		// Master details
 		uint16_t len = strlen(commentBuffer);
 		snprintf(commentBuffer + len, bufferSize-len, "~t9%d~s%s~h%s", sensors_getBoardTemp(), get_sv(), get_hdop());
+		snprintf(commentBuffer + len, bufferSize-len, "~t9%d~b9%d~s%s~h%s", sensors_getBoardTemp(), sensors_getBatt(), get_sv(), get_hdop());
 		// Find slave sensors to include in this log
 		for(int i=0; i<MAX_NUM_SLAVES; i++)
+		{
 			// Board temperature sensors (all slaves)
 			uint32_t val = sensordata_get(i, SENSOR_BOARDTEMP);
@@ @@ -97,13 +97,13 @@ char* slavesensors_getAPRScomment(char* @@
+			}
 			// Battery voltages (all slaves)
 			val = sensordata_get(i, SENSOR_BATTERYLEVEL);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
-				snprintf(commentBuffer + len, bufferSize-len, "~l%u%li",i,val);
+				snprintf(commentBuffer + len, bufferSize-len, "~b%u%li",i,val);
+			}
 			// Pressure
 			val = sensordata_get(i, SENSOR_PRESSURE);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);

0 comments (0 inline, 0 general)