# HG changeset patch
# User ethanzonca@CL-ENS241-08.cedarville.edu
# Date 2013-01-29 16:58:59
# Node ID 7a9d49d72a5a2712a1de2b85bfe6b45de6bcef22
# Parent  38ae355005d894c95a6b73b3185dcb0b193c30e9

Implemented logger skipping and removed debug output. Experienced one AT failure, but couldn't reproduce subsequent tests.

diff --git a/master/master/lib/slavesensors.c b/master/master/lib/slavesensors.c
--- a/master/master/lib/slavesensors.c
+++ b/master/master/lib/slavesensors.c
@@ -36,7 +36,7 @@ void slavesensors_setup()
 }
 
 //#define DEBUG_NETWORKSCAN
-#define DEBUG_GETSLAVEDATA
+//#define DEBUG_GETSLAVEDATA
 
 char* bufPtr = 0x00;
 
@@ -301,6 +301,9 @@ void slavesensors_startprocess()
 // TODO: inline. static.
 void slavesensors_request() 
 {
+	if(currentSlave == loggerIndex) {
+		currentSlave++;
+	}
 	slavesensors_selectnode(currentSlave);
 	serial_sendCommand("@"); // Request data!
 	slavesensors_selectlogger();
@@ -319,6 +322,7 @@ void slavesensors_process(uint8_t parseR
 	}
 	
 	// TODO: timeout. If we're at NODATA for a long time and we are requesting, that's an issue.
+	// TODO: If we time out, WE NEED TO RESET THE PARSER. It could be in a bad state.
 	else if(parseResult == PARSERESULT_NODATA) {
 		// Wait for data
 	}