seniordesign-firmware Changeset - a7b5f3ac92ad

Changeset - a7b5f3ac92ad

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

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

Complete XBee timeout checking implemented

2 files changed with 47 insertions and 36 deletions:

master/master/lib/slavesensors.c

master/master/lib/slavesensors.h

0 comments (0 inline, 0 general)

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -73,120 +73,106 @@ bool requesting = false; @@
 void slavesensors_setup()
+{
+}
 //#define DEBUG_NETWORKSCAN
 //#define DEBUG_GETSLAVEDATA
 char* bufPtr = 0x00;
 static char slaveAddressLow[MAX_NUM_SLAVES][9];
 static char slaveAddressHigh[MAX_NUM_SLAVES][9];
 static char slaveNames[MAX_NUM_SLAVES][15];
 uint8_t loggerIndex = 255;
 uint8_t nodeCount = 0;
 bool dataReady = false;
 char* slavesensors_slavename(uint8_t id)
+{
 	return slaveNames[id];
+}
 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
 		uint32_t scanStart = time_millis();
 		uint32_t lastBlink = 0;
 		// Scan data end when newline by itself ("")
 		int lineCount = 0;
 		while(1)
+		{
 			while(!serial0_hasChar())
 			// Wait for scan to complete. If we timeout, return.
 			if(waitTimeout())
+			{
 				if(time_millis() - scanStart > 7000)
+				{
 					led_errorcode(ERROR_XBEETIMEOUT);
 					return;
+				}
 				if(time_millis() - lastBlink > 50)
+				{
 					led_spin();
 					lastBlink = time_millis();
+				}
 				wdt_reset();
+			}
 			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)
@@ @@ -282,139 +268,163 @@ void slavesensors_selectnode(uint8_t nod @@
 			return;
+		}
 		snprintf(tmpBuf, 23, "ATDL %s%c",slaveAddressLow[nodeIndex], 0x0D);
 		serial0_sendString(tmpBuf);
 		if(xbeeIsOk() != 0)
+		{
 			led_errorcode(ERROR_NOXBEE);
 			return;
+		}
 		slavesensors_exitAT();
 		selectedNode = nodeIndex;
+	}
 	_delay_ms(2);
 	#ifdef DEBUG_SELECTNODE
 	serial0_sendString("Selected ");
 	serial0_sendChar(nodeIndex + 0x30);
 	serial0_sendString("\r\n");
 	#endif
 	#ifdef DEBUG_CONTEXTSWITCH
 	uint32_t switchTime = time_millis() - startTime;
 	char tmpB[32];
 	snprintf(tmpB, 32, "CTXSW: %lu ms\r\n", switchTime);
 	serial0_sendString(tmpB);
 	#endif
 	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;
 		//}
 	//};
 	if(waitTimeout())
+	{
 		return;
+	}
 	xbeeIsOk();
+}
 bool waitTimeout() {
 	uint32_t scanStart = time_millis();
 	uint32_t lastBlink = 0;
 	while(!serial0_hasChar())
+	{
 		if(time_millis() - scanStart > 7000)
+		{
 			led_errorcode(ERROR_XBEETIMEOUT);
 			return true;
+		}
 		if(time_millis() - lastBlink > 50)
+		{
 			led_spin();
 			lastBlink = time_millis();
+		}
 		wdt_reset();
+	}
 	return false;
+}
 // Enter AT mode. Leaves "OK" on the buffer.
 int slavesensors_enterAT()
+{
 	// Delay guard time
 	_delay_ms(2);
 	serial0_ioff(); // interrupts MUST be off
 	// Enter AT mode
 	serial0_sendChar('+'); // Enter AT mode
 	serial0_sendChar('+');
 	serial0_sendChar('+');
 	_delay_ms(2);
 	// Wait 1ms until we get "OK"
 	//int atStart = time_millis();
 	//while(!serial0_hasChar()) {
 		//if(time_millis() - atStart > 500) {
 			//led_errorcode(ERROR_ATFAIL);
 			//wdt_reset();
 			//return 1;
 		//}
 	//};
 	return xbeeIsOk();
+}
 int xbeeIsOk()
+{
 	uint32_t scanStart = time_millis();
 	uint32_t lastBlink = 0;
 	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();
+	}
 	char* tmppntr = serial0_readLine();
 	if(strcmp(tmppntr, "OK") == 0)
+	{
 		return 0;
+	}
 	else
+	{
 		led_errorcode(ERROR_NOXBEE);
 		return 1;
+	}
+}
 bool slavesensors_dataReady()
+{
 	return dataReady;
+}
 bool slavesensors_isrequesting()
+{
 	return requesting;
+}
 void slavesensors_startprocess()
+{
 	requesting = true;
 	slavesensors_request();
+}
 // TODO: inline. static.
 void slavesensors_request()
+{
 	if(currentSlave == loggerIndex)
+	{
 		currentSlave++;
 		if(currentSlave >= (nodeCount))
+		{
 			slavesensors_selectlogger();
 			return;
+		}
+	}
 	slavesensors_selectnode(currentSlave);
 	serial_sendCommand("@"); // Request data!
+}
 uint8_t numReadingsToExpect = 0; // number of values that the slave is about to send (testing)

master/master/lib/slavesensors.h

➞

Show inline comments

 /*
  * Master Firmware: Slave Sensor Data Aquisition
+ *
  * Wireless Observational Modular Aerial Network
+ *
  * Ethan Zonca
  * Matthew Kanning
  * Kyle Ripperger
  * Matthew Kroening
+ *
  */
 #ifndef SLAVESENSORS_H_
 #define SLAVESENSORS_H_
 #include <stdbool.h>
 #include <inttypes.h>
 // Serial Commands
 enum sensorTypes // CMD ID#
+{
 	NONE = 0,
 	BOARDTEMP,
 	PRESSURE,
 	GEIGER,
 	TEMPERATURE,
 	HUMIDITY,
 	AMBIENTLIGHT,
 	CAMERA,
 };
 bool waitTimeout();
 char* slavesensors_getLabel(uint8_t sensorID);
 char* slavesensors_slavename(uint8_t id);
 bool slavesensors_dataReady();
 bool slavesensors_isrequesting();
 void slavesensors_setup();
 void slavesensors_network_scan();
 uint8_t slavesensors_getselectednode();
 void slavesensors_selectnode(uint8_t nodeIndex);
 void slavesensors_startprocess();
 void slavesensors_request();
 void slavesensors_process(uint8_t parseResult);
 int xbeeIsOk();
 void slavesensors_selectlogger();
 void slavesensors_exitAT();
 int slavesensors_enterAT();
 #endif /* SLAVESENSORS_H_ */
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)