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

@@ @@ -39,113 +39,113 @@ int32_t slaves[MAX_NUM_SLAVES][MAX_NUM_S @@
 void sensordata_setup()
+{
 	for(int i=0; i<MAX_NUM_SLAVES; i++)
+	{
 		for(int j=0; j<MAX_NUM_SENSORS; j++)
+		{
 			slaves[i][j] = -2111111111; // minimum value of 16 bit integer
+		}
+	}
+}
 // Store a sensor value in memory
 void sensordata_set(uint8_t nodeID, uint8_t type, int32_t value)
+{
 	if(nodeID < MAX_NUM_SLAVES)
+	{
 		slaves[nodeID][type] = value;
+	}
+}
 // Retrieve a sensor value from memory
 int32_t sensordata_get(uint8_t nodeID, uint8_t type)
+{
 	// Avoid reading out of bad places!
 	if(nodeID < MAX_NUM_SLAVES)
+	{
 		return slaves[nodeID][type];
+	}
 	else
+	{
 		return 0;
+	}
+}
 bool isEven = true;
 // Generate APRS comment
 // TODO: Can we move this buffer to a local scope of this function?
 char* slavesensors_getAPRScomment(char* commentBuffer, uint16_t bufferSize)
+{
 	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);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~t%u%li",i,val);
+			}
 			// 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);
 				snprintf(commentBuffer + len, bufferSize-len, "~P%li",val);
+			}
 			// Air Temperature
 			val = sensordata_get(i, SENSOR_AIRTEMP);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~C%li",val);
+			}
 			// Humidity
 			val = sensordata_get(i, SENSOR_HUMIDITY);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~H%li",val);
+			}
 			// Altitude
 			val = sensordata_get(i, SENSOR_ALTITUDE);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~A%li",val);
+			}
 			// Radiation
 			val = sensordata_get(i, SENSOR_CPM_RADIATION);
 			if(val != -2111111111) {
 				uint16_t len = strlen(commentBuffer);
 				snprintf(commentBuffer + len, bufferSize-len, "~R%li",val);
+			}
+		}
 		if(logger_aprsInfoTextAvailable())
+		{
 			uint16_t len = strlen(commentBuffer);
 			snprintf(commentBuffer + len, bufferSize-len, "~%s",logger_getAprsInfoText());
 			logger_aprsInfoTextConsumed();
+		}
 		isEven = false;
+	}

0 comments (0 inline, 0 general)