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
3
master/master/lib/slavesensors.c
40
13
0 comments (0 inline, 0 general)
master/master/config.h
➞
Show inline comments
 
@@ -18,48 +18,51 @@
 
// --------------------------------------------------------------------------
 
 
#define DEBUG_OUTPUT
 
 
#define F_CPU 11059200
 
#define MODULE_ID '1'
 
#define BOARDTEMP_ADDR 0x90
 
 
#define HEATER_THRESHOLD 70
 
 
// --------------------------------------------------------------------------
 
// Error Codes config (led.c, used throughout code)
 
// --------------------------------------------------------------------------
 
 
// 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)
 
// --------------------------------------------------------------------------
 
 
// Maximum payload size of command
 
#define MAX_PAYLOAD_LEN 16
 
 
// Circular serial buffer size. Must be at least MAX_CMD_LEN + 5
 
#define BUFFER_SIZE 32
 
 
// Public broadcast address
 
#define BROADCAST_ADDR 0
 
 
master/master/lib/slavesensors.c
➞
Show inline comments
 
@@ -15,49 +15,49 @@
 
#include <stdbool.h>
 
#include <stdlib.h>
 
#include <stdio.h>
 
#include <string.h>
 
#include <util/delay.h>
 
#include <avr/wdt.h>
 
#include "serial.h"
 
#include "serparser.h"
 
#include "slavesensors.h"
 
#include "sensordata.h"
 
#include "led.h"
 
#include "looptime.h"
 

			




	
	
	
		
 
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) {

			




	
	
	
		
 
	return slaveNames[id];

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void slavesensors_network_scan() {

			




	
	
	
		
 
	serial0_ioff();

			




	
	
	
		
 
	

			




	
	
	
		
 
	int atOK;

			




	
	
	
		
 
	

			




	
	
	
		
 
	#ifdef DEBUG_OUTPUT

			




	
	
	
		
 
	serial0_sendString("Beginning network scan...\r\n\r\n");

			




	
	
	
		
 
	#endif

			




	
	
	
		
 
	

			




	
	
		
 
@@ -141,154 +141,181 @@ void slavesensors_network_scan() {

			




	
	
	
		
 

			




	
	
	
		
 
	#ifdef DEBUG_OUTPUT

			




	
	
	
		
 
	

			




	
	
	
		
 
	char debugBuf[64];

			




	
	
	
		
 
	serial0_sendString("Discovered: \r\n");

			




	
	
	
		
 
	for(int i=0; i<nodeCount; i++) {

			




	
	
	
		
 
		snprintf(debugBuf, 64, "  %s - %s%s (%u)\r\n", slaveNames[i],slaveAddressHigh,slaveAddressLow[i], i);

			




	
	
	
		
 
		serial0_sendString(debugBuf);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	serial0_sendString("\r\n");

			




	
	
	
		
 
	if(atOK != 0) {

			




	
	
	
		
 
		serial0_sendString("AT mode failed \r\n");

			




	
	
	
		
 
	}

			




	
	
	
		
 
	

			




	
	
	
		
 
	#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;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else

			




	
	
	
		
 
	{

			




	
	
	
		
 
		led_errorcode(ERROR_NOXBEE);

			




	
	
	
		
 
		return 1;

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool slavesensors_dataReady() {

			




	
	
	
		
 
	return dataReady;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
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.

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	

			




	
	
	
		
 
	// TODO: timeout. If we're at NODATA for a long time and we are requesting, that's an issue.

			




	
	
	
		
 
	else if(parseResult == PARSERESULT_NODATA) {

			




	
	
	
		
 
		// Wait for data

			




	
	
	
		
 
	}

			




	
	
	
		
 
	

			




	
	
	
		
 
	// Finished reception of a message (one sensor data value). If not finished, send out command to get the next one

			




	
	
	
		
 
	else if(parseResult == PARSERESULT_PARSEOK)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-26437
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support