seniordesign-firmware Changeset - 2fee3928a8ff

Changeset - 2fee3928a8ff

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-29 16:41:25
ethanzonca@CL-ENS241-08.cedarville.edu

Removed timeouts which somehow were causing destination node switching to break

2 files changed with 43 insertions and 13 deletions:

master/master/config.h

master/master/lib/slavesensors.c

0 comments (0 inline, 0 general)

master/master/config.h

➞

Show inline comments

@@ @@ -30,24 +30,27 @@ @@
 // --------------------------------------------------------------------------
 // SD Card
 #define ERROR_SD_INIT 2
 #define ERROR_SD_PARTITION 3
 #define ERROR_SD_FILE 4
 #define ERROR_XBEETIMEOUT 5
 #define ERROR_NOXBEE 6
 #define ERROR_CRAP 15
 #define ERROR_ATFAIL 3
 #define ERROR_EXITAT 8
 // --------------------------------------------------------------------------
 // Slave Sensors config (slavesensors.c)
 // --------------------------------------------------------------------------
 #define MAX_NUM_SLAVES 5  // Maximum number of nodes in the system
 #define MAX_NUM_SENSORS 20 // Maximum number of unique types of sensors in the system
 // Node identifier of log destination xbee
 #define XBEE_LOGDEST_NAME "HAB-LOGGER"
 // --------------------------------------------------------------------------
 // Command Parser config (serparser.c)

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -27,25 +27,25 @@ @@
 uint8_t currentSlave = 0;
 uint8_t currentSlaveSensor = 0;
 bool requesting = false;
 void slavesensors_setup()
+{
+}
 //#define DEBUG_NETWORKSCAN
-//#define DEBUG_GETSLAVEDATA
 #define DEBUG_GETSLAVEDATA
 char* bufPtr = 0x00;
 static char slaveAddressLow[MAX_NUM_SLAVES][9];
 static char slaveAddressHigh[MAX_NUM_SLAVES][9];
 static char slaveNames[MAX_NUM_SLAVES][20];
 uint8_t loggerIndex = 255;
 uint8_t nodeCount = 0;
 bool dataReady = false;
 char* slavesensors_slavename(uint8_t id) {
@@ @@ -153,92 +153,119 @@ void slavesensors_network_scan() { @@
+	}
 	#endif
 	for(int i=0; i<nodeCount; i++)
+	{
 		if(strcmp(slaveNames[i], XBEE_LOGDEST_NAME) == 0)
+		{
 			loggerIndex = i;
+		}
+	}
 	_delay_ms(100);
 	slavesensors_selectlogger();
 	serial0_ion();
+}
 void slavesensors_selectnode(uint8_t nodeIndex)
+{
 	serial0_ioff();
 	serial0_sendString("Switch to node ");
 	serial0_sendChar(nodeIndex + 0x30);
 	serial0_sendString("\r\n");
 	_delay_ms(30);
 	char tmpBuf[23];
 	// If we can get into AT mode
 	if(slavesensors_enterAT() == 0) {
 		snprintf(tmpBuf, 23, "ATDH %s%c",slaveAddressHigh[nodeIndex], 0x0D);
 		serial0_sendString(tmpBuf);
 		if(xbeeIsOk() != 0) {
 			led_errorcode(ERROR_NOXBEE);
 			return;
+		}
 		snprintf(tmpBuf, 23, "ATDL %s%c",slaveAddressLow[nodeIndex], 0x0D);
 		serial0_sendString(tmpBuf);
 		if(xbeeIsOk() != 0) {
 			led_errorcode(ERROR_NOXBEE);
 			return;
+		}
 		slavesensors_exitAT();
+	}
 	_delay_ms(2);
 	serial0_sendString("Selected ");
 	serial0_sendChar(nodeIndex + 0x30);
 	serial0_sendString("\r\n");
 	serial0_ion();
 	return;
+}
 void slavesensors_selectlogger()
+{
 	if(loggerIndex != 255) {
 		slavesensors_selectnode(loggerIndex);
+	}
+}
 void slavesensors_exitAT()
+{
 	// Exit AT
 	serial0_sendString("ATCN");
 	serial0_sendChar(0x0D);
 	xbeeIsOk(); // wait for OK
 	_delay_ms(2);
 	//// Wait until we get "OK"
 	//int atStart = time_millis();
 	//while(!serial0_hasChar()) {
 		//if(time_millis() - atStart > 500) {
 			//led_errorcode(ERROR_EXITAT);
 			//wdt_reset();
 			//return 1;
 		//}
 	//};
 	xbeeIsOk();
+}
 // Enter AT mode. Leaves "OK" on the buffer.
 int slavesensors_enterAT()
+{
 	// Delay guard time
 	_delay_ms(1);
 	_delay_ms(2);
 	serial0_ioff(); // interrupts MUST be off
 	// Enter AT mode
 	serial0_sendChar('+'); // Enter AT mode
 	serial0_sendChar('+');
 	serial0_sendChar('+');
+	>
+	_delay_ms(2);
 	// Wait 1ms until we get "OK"
 	int atStart = time_millis();
 	while(!serial0_hasChar()) {
 		if(time_millis() - atStart > 500) {
 			led_errorcode(ERROR_XBEETIMEOUT);
 			wdt_reset();
 			return 1;
+		}
 	};
 	//int atStart = time_millis();
 	//while(!serial0_hasChar()) {
 		//if(time_millis() - atStart > 500) {
 			//led_errorcode(ERROR_ATFAIL);
 			//wdt_reset();
 			//return 1;
 		//}
 	//};
 	return xbeeIsOk();
+}
 int xbeeIsOk()
+{
 	char* tmppntr = serial0_readLine();
 	if(strcmp(tmppntr, "OK") == 0)
+	{
 		return 0;
+	}
@@ @@ -258,25 +285,25 @@ bool slavesensors_isrequesting() @@
 	return requesting;
+}
 void slavesensors_startprocess()
+{
 	requesting = true;
 	slavesensors_request();
+}
 // TODO: inline. static.
 void slavesensors_request()
+{
-	//slavesensors_selectnode(currentSlave);
 	slavesensors_selectnode(currentSlave);
 	serial_sendCommand("@"); // Request data!
+}
 uint8_t numReadingsToExpect = 0; // number of values that the slave is about to send (testing)
 // TODO: needs to skip logger!
 void slavesensors_process(uint8_t parseResult)
+{
 	if(!requesting) {
 		// we got a command when we didn't request anything. probably skip it.

0 comments (0 inline, 0 general)