seniordesign-firmware Changeset - 262ac187c5ac

Changeset - 262ac187c5ac

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-29 17:24:11
ethanzonca@CL-ENS241-08.cedarville.edu

Addd time profiling to selectnode

1 file changed with 5 insertions and 1 deletions:

master/master/lib/slavesensors.c

0 comments (0 inline, 0 general)

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -151,87 +151,91 @@ void slavesensors_network_scan() { @@
 	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;
+		}
+	}
 	_delay_ms(100);
 	slavesensors_selectlogger();
 	serial0_ion();
+}
 // #define DEBUG_SELECTNODE
 void slavesensors_selectnode(uint8_t nodeIndex)
+{
 	serial0_ioff();
+	uint32_t startTime = time_millis();
 	#ifdef DEBUG_SELECTNODE
 	serial0_sendString("Switch to node ");
 	serial0_sendChar(nodeIndex + 0x30);
 	serial0_sendString("\r\n");
 	#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;
+		}
 		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
 	uint32_t switchTime = time_millis() - startTime;
 	char tmpB[32];
 	snprintf(tmpB, 32, "CTXSW: %lu ms\r\n", switchTime);
 	serial0_sendString(tmpB);
 	serial0_ion();
 	return;
+}
 void slavesensors_selectlogger()
+{
 	if(loggerIndex != 255) {
 		slavesensors_selectnode(loggerIndex);
+	}
+}
 void slavesensors_exitAT()
+{
 	// Exit AT
 	serial0_sendString("ATCN");
 	serial0_sendChar(0x0D);
 	_delay_ms(2);
 	//// Wait until we get "OK"
 	//int atStart = time_millis();
 	//while(!serial0_hasChar()) {
 		//if(time_millis() - atStart > 500) {
 			//led_errorcode(ERROR_EXITAT);
 			//wdt_reset();
 			//return 1;

0 comments (0 inline, 0 general)