# HG changeset patch # User ethanzonca@CL-ENS241-08.cedarville.edu # Date 2013-01-17 21:59:23 # Node ID e68fbe17cd36dfb5e922e85a95e91339de439bce # Parent fe1ae61c1293b606b81068df712034c05bf1f54f Added XBEE log destination recognized by node identifier diff --git a/master/master/config.h b/master/master/config.h --- a/master/master/config.h +++ b/master/master/config.h @@ -54,6 +54,9 @@ #define MAX_SLAVES 8 #define MAX_SLAVE_SENSORS 8 +// Node identifier of log destination xbee +#define XBEE_LOGDEST_NAME "HAB-LOGGER" + // -------------------------------------------------------------------------- // Command Parser config (serparser.c) // -------------------------------------------------------------------------- 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 @@ -67,6 +67,7 @@ char* bufPtr = 0x00; char debugBuf[64]; char slaveAddressLow[6][9]; char slaveAddressHigh[6][9]; +uint8_t loggerIndex = 255; void slavesensors_network_scan() { serial0_ioff(); @@ -164,11 +165,26 @@ void slavesensors_network_scan() { // followed by another signifies end of scan data - slavesensors_selectnode(1); + for(int i=0; i