seniordesign-firmware Changeset - 38ae355005d8

Changeset - 38ae355005d8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-29 16:52:00
ethanzonca@CL-ENS241-08.cedarville.edu

Reduced delays, debug output now optional

2 files changed with 11 insertions and 4 deletions:

master/master/lib/slavesensors.c

master/master/master.c

0 comments (0 inline, 0 general)

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -159,32 +159,36 @@ void slavesensors_network_scan() { @@
 		if(strcmp(slaveNames[i], XBEE_LOGDEST_NAME) == 0)
+		{
 			loggerIndex = i;
+		}
+	}
 	_delay_ms(100);
 	slavesensors_selectlogger();
 	serial0_ion();
+}
 // #define DEBUG_SELECTNODE
 void slavesensors_selectnode(uint8_t nodeIndex)
+{
 	serial0_ioff();
-	serial0_ioff();
+	#ifdef DEBUG_SELECTNODE
 	serial0_sendString("Switch to node ");
 	serial0_sendChar(nodeIndex + 0x30);
 	serial0_sendString("\r\n");
 	_delay_ms(30);
 	#endif
 	_delay_ms(20);
 	char tmpBuf[23];
 	// If we can get into AT mode
 	if(slavesensors_enterAT() == 0) {
 		snprintf(tmpBuf, 23, "ATDH %s%c",slaveAddressHigh[nodeIndex], 0x0D);
 		serial0_sendString(tmpBuf);
 		if(xbeeIsOk() != 0) {
 			led_errorcode(ERROR_NOXBEE);
 			return;
+		}
@@ @@ -192,27 +196,30 @@ void slavesensors_selectnode(uint8_t nod @@
 		snprintf(tmpBuf, 23, "ATDL %s%c",slaveAddressLow[nodeIndex], 0x0D);
 		serial0_sendString(tmpBuf);
 		if(xbeeIsOk() != 0) {
 			led_errorcode(ERROR_NOXBEE);
 			return;
+		}
 		slavesensors_exitAT();
+	}
 	_delay_ms(2);
 	#ifdef DEBUG_SELECTNODE
 	serial0_sendString("Selected ");
 	serial0_sendChar(nodeIndex + 0x30);
 	serial0_sendString("\r\n");
 	#endif
 	serial0_ion();
 	return;
+}
 void slavesensors_selectlogger()
+{
 	if(loggerIndex != 255) {
 		slavesensors_selectnode(loggerIndex);
+	}
+}
 void slavesensors_exitAT()
@@ @@ -287,24 +294,25 @@ bool slavesensors_isrequesting() @@
 void slavesensors_startprocess()
+{
 	requesting = true;
 	slavesensors_request();
+}
 // TODO: inline. static.
 void slavesensors_request()
+{
 	slavesensors_selectnode(currentSlave);
 	serial_sendCommand("@"); // Request data!
 	slavesensors_selectlogger();
+}
 uint8_t numReadingsToExpect = 0; // number of values that the slave is about to send (testing)
 // TODO: needs to skip logger!
 void slavesensors_process(uint8_t parseResult)
+{
 	if(!requesting) {
 		// we got a command when we didn't request anything. probably skip it.
 		return;

master/master/master.c

➞

Show inline comments

@@ @@ -134,26 +134,25 @@ int main(void) @@
 								// FIXME: will the 128 here really provide safety? might want to subtract the strlen
 								snprintf(csvHeader + strlen(csvHeader), 128,"%s-Sensor%u,", slavesensors_slavename(i), j);
+							}
+						}
+					}
 					snprintf(csvHeader + strlen(csvHeader), 128,"\r\n");
 					serial0_sendString(csvHeader);
 					logger_log(csvHeader);
 					dataWasReady = true;
+				}
 				logbuf[0] = 0x00;
 				snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s\r\n", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 				serial0_sendString(logbuf);
 				snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 				for(int i=0; i<MAX_NUM_SLAVES; i++) {
 					for(int j=0; j<MAX_NUM_SENSORS; j++) {
 						int16_t tmp = sensordata_get(i, j);
 						if(tmp != -32768) {
 							snprintf(logbuf + strlen(logbuf),128," %d,", tmp);
+						}
+					}
+				}
 				snprintf(logbuf + strlen(logbuf),128,"\r\n");
 				serial0_sendString(logbuf);
 				logger_log(logbuf);

0 comments (0 inline, 0 general)