seniordesign-firmware Changeset - f1ded7817da7

Changeset - f1ded7817da7

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-11 16:01:07
ethanzonca@CL-ENS241-08.cedarville.edu

Integrated XBEE communication timeout into node scan, added activity indicator when detecting.

1 file changed with 22 insertions and 7 deletions:

master/master/lib/slavesensors.c

0 comments (0 inline, 0 general)

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -98,120 +98,135 @@ void slavesensors_network_scan() @@
+{
 	serial0_ioff();
 	int atOK;
 	#ifdef DEBUG_OUTPUT
 	serial0_sendString("Beginning network scan...\r\n\r\n");
 	#endif
 	_delay_ms(500); // xbee warmup
 	_delay_ms(200); // xbee warmup
 	wdt_reset();
 	led_on(LED_ACTIVITY);
 	atOK = slavesensors_enterAT();
 	// wait for OK
 	if(atOK == 0)
+	{
 		led_on(LED_CYCLE);
 		serial0_sendString("ATND");
 		serial0_sendChar(0x0D);
 		// wait for scan to complete
 		uint16_t scanStart = time_millis();
 		uint32_t scanStart = time_millis();
 		uint32_t lastBlink = 0;
 		// Scan data end when newline by itself ("")
 		int lineCount = 0;
 		while(1)
+		{
 		while(!serial0_hasChar())
+		{
 			if(time_millis() - scanStart > 7000)
+			{
 				led_errorcode(ERROR_XBEETIMEOUT);
 				return;
+			}
 				if(time_millis() - lastBlink > 50)
+				{
 					led_spin();
 					lastBlink = time_millis();
+				}
 			wdt_reset();
+		}
 		// Scan data end when newline by itself ("")
 		int lineCount = 0;
 		while(1)
+		{
 			bufPtr = serial0_readLine();
 			// If we're starting a new block but got a newline instead, we're done!
 			if(lineCount == 0 && strcmp(bufPtr, "") == 0)
+			{
 				break;
+			}
 			if(lineCount == 1)
+			{
 				strncpy(slaveAddressHigh[nodeCount],bufPtr, 9);
+			}
 			else if(lineCount == 2)
+			{
 				strncpy(slaveAddressLow[nodeCount],bufPtr, 9);
+			}
 			else if(lineCount == 3)
+			{
 				strncpy(slaveNames[nodeCount], bufPtr, 15);
+			}
 			// If we've finished one chunk (including the newline after it). Can't be else if because it controls increment.
 			if(lineCount == 9)
+			{
 				// bufPtr should be null at this point, because we read in a newline after one chunk
 				nodeCount++;
 				lineCount = 0;
+			}
 			else
+			{
 				lineCount++;
+			}
+		}
 		slavesensors_exitAT();
+	}
 	// Display number of found nodes on spinning indicator
 	led_off(LED_ACT0);
 	led_off(LED_ACT1);
 	led_off(LED_ACT2);
 	led_off(LED_ACT3);
 	switch(nodeCount)
+	{
 		case 0:
 			break;
 		case 3:
 			led_on(LED_ACT2);
 			_delay_ms(100);
 		case 2:
 			led_on(LED_ACT1);
 			_delay_ms(100);
 		case 1:
 			led_on(LED_ACT0);
 			_delay_ms(100);
+	}
+	>
+	_delay_ms(500);
 	led_on(LED_SIDEBOARD);
-	_delay_ms(200);
+	_delay_ms(500);
 	led_off(LED_SIDEBOARD);
 	#ifdef DEBUG_OUTPUT
 	char debugBuf[64];
 	serial0_sendString("Discovered: \r\n");
 	for(int i=0; i<nodeCount; i++)
+	{
 		snprintf(debugBuf, 64, "  %s - %s%s (%u)\r\n", slaveNames[i],slaveAddressHigh,slaveAddressLow[i], i);
 		serial0_sendString(debugBuf);
+	}
 	serial0_sendString("\r\n");
 	if(atOK != 0)
+	{
 		serial0_sendString("AT mode failed \r\n");
+	}
 	#endif
 	for(int i=0; i<nodeCount; i++)
+	{
 		if(strcmp(slaveNames[i], XBEE_LOGDEST_NAME) == 0)
+		{
 			loggerIndex = i;

0 comments (0 inline, 0 general)