# HG changeset patch
# User ethanzonca@CL-ENS241-08.cedarville.edu
# Date 2013-01-29 17:08:39
# Node ID ecf8bc28f289dbd715b7b3b6a64fd49b5bc59b92
# Parent  7a9d49d72a5a2712a1de2b85bfe6b45de6bcef22

Fixed issue from previous commit where logger skipping was improprerly handled, freezing the microcontroller if the logger was the last discovered node.

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
@@ -389,6 +389,21 @@ void slavesensors_process(uint8_t parseR
 				currentSlave++;
 				currentSlaveSensor = 0;
 				requesting = true;
+				
+				if(currentSlave == loggerIndex) {
+					if(currentSlave >= (nodeCount-1)) {
+						// We hit the last one, we're done.
+						dataReady = true;
+						currentSlave = 0;
+						currentSlaveSensor = 0;
+						requesting = false;
+						return;
+					}
+					else {
+						currentSlave++; // increment to the next slave after the logger
+					}
+				}
+				
 				slavesensors_request();
 			}
 			// If we haven't finished a slave (or all of them), just get the next sensor of the current slave