# HG changeset patch
# User ethanzonca@CL-ENS241-08.cedarville.edu
# Date 2013-04-22 08:57:44
# Node ID 0c7d961b3ebc7d7772f6a6cb0f794fcab37a6aca
# Parent  48235b240e560da617bf282856a7dd6cabc77a2f

Last fixes for final launch of the year

diff --git a/master/master/config.h b/master/master/config.h
--- a/master/master/config.h
+++ b/master/master/config.h
@@ -83,7 +83,7 @@
 // --------------------------------------------------------------------------
 
 // Slave data structure size
-#define MAX_NUM_SLAVES 5	// Maximum number of nodes in the system
+#define MAX_NUM_SLAVES 4	// Maximum number of nodes in the system
 #define MAX_NUM_SENSORS 10	// Maximum number of unique types of sensors in the system
 
 // Node identifier of log destination xbee
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
@@ -46,14 +46,14 @@
 // Label lookup table
 // Make sure there are never more labels than there are MAX_NUM_SENSORS! 
 const char label_0[] PROGMEM = "BoardTemp";
-const char label_1[] PROGMEM = "HeaterStatus";
-const char label_2[] PROGMEM = "BatteryLevel";
+const char label_1[] PROGMEM = "Heater";
+const char label_2[] PROGMEM = "VBatt";
 const char label_3[] PROGMEM = "AirTemp";
-const char label_4[] PROGMEM = "AmbientLight";
+const char label_4[] PROGMEM = "Light";
 const char label_5[] PROGMEM = "Humidity";
 const char label_6[] PROGMEM = "Pressure";
 const char label_7[] PROGMEM = "Altitude";
-const char label_8[] PROGMEM = "CPM-Radiation";
+const char label_8[] PROGMEM = "Radiation";
 
 const char *const labelLookup[] PROGMEM =
 {
@@ -65,10 +65,10 @@ const char *const labelLookup[] PROGMEM 
 	label_5,
 	label_6,
 	label_7,
-	label_8,
+	label_8
 };
 
-char labelBuffer[32]; // Size to length of label
+char labelBuffer[15]; // Size to length of label
 char* slavesensors_getLabel(uint8_t sensorID) 
 {
 	if(sensorID < 9)