seniordesign-firmware Changeset - 887fa9c3d968

Changeset - 887fa9c3d968

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

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

More timeout fixes

2 files changed with 5 insertions and 7 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

@@ @@ -115,25 +115,25 @@ void slavesensors_network_scan() @@
 	if(atOK == 0)
+	{
 		led_on(LED_CYCLE);
 		serial0_sendString("ATND");
 		serial0_sendChar(0x0D);
 		// Scan data end when newline by itself ("")
 		int lineCount = 0;
 		while(1)
+		{
 			// Wait for scan to complete. If we timeout, return.
 			if(waitTimeout())
+			if(waitTimeout(7000))
+			{
 				return;
+			}
 			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;
+			}
@@ @@ -303,40 +303,39 @@ void slavesensors_selectlogger() @@
+{
 	if(loggerIndex != 255)
+	{
 		slavesensors_selectnode(loggerIndex);
+	}
+}
 void slavesensors_exitAT()
+{
 	// Exit AT
 	serial0_sendString("ATCN");
 	serial0_sendChar(0x0D);
 	_delay_ms(2);
 	if(waitTimeout())
+	if(waitTimeout(2000))
+	{
 		return;
+	}
 	xbeeIsOk();
+}
 bool waitTimeout() {
+bool waitTimeout(uint32_t timeout) {
 	uint32_t scanStart = time_millis();
 	uint32_t lastBlink = 0;
 	while(!serial0_hasChar())
+	{
-		if(time_millis() - scanStart > 7000)
+		if(time_millis() - scanStart > timeout)
+		{
 			led_errorcode(ERROR_XBEETIMEOUT);
 			return true;
+		}
 		if(time_millis() - lastBlink > 50)
+		{
 			led_spin();
 			lastBlink = time_millis();
+		}
 		wdt_reset();
+	}
@@ @@ -346,25 +345,24 @@ bool waitTimeout() { @@
 // 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);
 	return xbeeIsOk();
+}
 int xbeeIsOk()
+{
 	uint32_t scanStart = time_millis();
 	uint32_t lastBlink = 0;
 	while(!serial0_hasChar())
+	{
 		if(time_millis() - scanStart > 7000)
+		{

master/master/lib/slavesensors.h

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ @@
 enum sensorTypes // CMD ID#
+{
 	NONE = 0,
 	BOARDTEMP,
 	PRESSURE,
 	GEIGER,
 	TEMPERATURE,
 	HUMIDITY,
 	AMBIENTLIGHT,
 	CAMERA,
 };
 bool waitTimeout();
+bool waitTimeout(uint32_t timeout);
 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();

0 comments (0 inline, 0 general)