Changeset - 8bafd525c511
Parent rev.
Child rev.
[Not reviewed]
default
0 8 0
ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-05 15:49:46
ethanzonca@CL-ENS241-08.cedarville.edu
Add support for 32-bit slave data storage, required significant changes to entire data path.
Increased serial buffer size to 128 to accomodate larger streams of data
8 files changed with 38 insertions and 43 deletions:
master/master/config.h
1
1
master/master/lib/logger.c
2
11
master/master/lib/sensordata.c
19
16
master/master/lib/sensordata.h
2
4
master/master/lib/serparser.c
1
1
master/master/lib/serparser.h
1
1
master/master/lib/slavesensors.c
12
3
master/master/master.c
6
0 comments (0 inline, 0 general)
master/master/config.h
➞
Show inline comments
 
@@ -62,7 +62,7 @@
 
#define MAX_PAYLOAD_LEN 16
 
 
// Circular serial buffer size. Must be at least MAX_CMD_LEN + 5
 
#define BUFFER_SIZE 32
 
#define BUFFER_SIZE 128
 
 
// Public broadcast address
 
#define BROADCAST_ADDR 0
master/master/lib/logger.c
➞
Show inline comments
 
@@ -38,11 +38,6 @@ void logger_setup()
 
 
	if(!sd_raw_init())
 
	{
 
		// Initializing SD card failed!
 
		#ifdef DEBUG_OUTPUT
 
		serial0_sendString("SD> Error initializing.\r\n");
 
		#endif
 
 
		led_errorcode(ERROR_SD_INIT);
 
		return;
 
	}
 
@@ -56,10 +51,6 @@ void logger_setup()
 
	// Check that partition was created correctly
 
	if(!partition)
 
	{
 
		#ifdef DEBUG_OUTPUT
 
		serial0_sendString("SD> Error opening partition.\r\n");
 
		#endif
 
 
		// Error opening partition. MBR might be screwed up.
 
		led_errorcode(ERROR_SD_PARTITION);
 
		return;
 
@@ -90,10 +81,10 @@ void logger_setup()
 
 
	// Create new log file
 
	uint8_t logid = eeprom_read_byte(LOGGER_ID_EEPROM_ADDR);
 
	char filename[48];
 
	char filename[16];
 
 
	// we pre-increment logid here because it starts at 255, then wraps to 0
 
	sprintf(filename, "data%d.csv",++logid);
 
	snprintf(filename, 16, "data%d.csv",++logid);
 
 
	// TODO: Catch errors here
 
	if(fat_create_file(dd, filename, &directory) == 0) {
master/master/lib/sensordata.c
➞
Show inline comments
 
@@ -13,31 +13,33 @@
 
#include "../config.h"
 
#include <stdio.h>
 
#include <stdbool.h>
 
#include <string.h>
 
#include "sensordata.h"
 
#include "slavesensors.h"
 
#include "boardtemp.h"
 
#include "looptime.h"
 
#include "gps.h"
 
#include "logger.h"
 

			




	
	
	
		
 
int16_t slaves[MAX_NUM_SLAVES][MAX_NUM_SENSORS];

			




	
	
	
		
 
int32_t slaves[MAX_NUM_SLAVES][MAX_NUM_SENSORS];

			




	
	
	
		
 

			




	
	
	
		
 
void sensordata_setup() 

			




	
	
	
		
 
{

			




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

			




	
	
	
		
 
		for(int j=0; j<MAX_NUM_SENSORS; j++) {

			




	
	
	
		
 
			slaves[i][j] = -32768; // minimum value of 16 bit integer

			




	
	
	
		
 
			slaves[i][j] = -2111111111; // minimum value of 16 bit integer

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void sensordata_set(uint8_t nodeID, uint8_t type, uint16_t value)

			




	
	
	
		
 
void sensordata_set(uint8_t nodeID, uint8_t type, int32_t value)

			




	
	
	
		
 
{

			




	
	
	
		
 
	if(nodeID < MAX_NUM_SLAVES) {

			




	
	
	
		
 
		slaves[nodeID][type] = value;

			




	
	
	
		
 
	}	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
int16_t sensordata_get(uint8_t nodeID, uint8_t type) 

			




	
	
	
		
 
int32_t sensordata_get(uint8_t nodeID, uint8_t type) 

			




	
	
	
		
 
{

			




	
	
	
		
 
	// Avoid reading out of bad places!

			




	
	
	
		
 
	if(nodeID < MAX_NUM_SLAVES) {

			




	
	
		
 
@@ -59,7 +61,7 @@ char* slavesensors_getAPRScomment() {

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
char logbuf[128];

			




	
	
	
		
 
char logbuf[256];

			




	
	
	
		
 
bool dataWasReady = false;

			




	
	
	
		
 

			




	
	
	
		
 
void sensordata_logvalues() {

			




	
	
		
 
@@ -68,42 +70,43 @@ void sensordata_logvalues() {

			




	
	
	
		
 
	

			




	
	
	
		
 
		// Only generate/write header the first time data is ready

			




	
	
	
		
 
		if(!dataWasReady) {

			




	
	
	
		
 
			char csvHeader[128];

			




	
	
	
		
 
			#define CSV_HEADER_SIZE 512

			




	
	
	
		
 
			char csvHeader[CSV_HEADER_SIZE];

			




	
	
	
		
 
			csvHeader[0] = 0x00;

			




	
	
	
		
 
		

			




	
	
	
		
 
			// Add master data headers

			




	
	
	
		
 
			snprintf(csvHeader, 128, "Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV");

			




	
	
	
		
 
			snprintf(csvHeader, CSV_HEADER_SIZE, "Time,BoardTemp,GPSTime,GPSLat,GPSLon,GPSSpeed,GPSHDOP,GPSCourse,GPSSV,");

			




	
	
	
		
 
		

			




	
	
	
		
 
			// Add slave data headers

			




	
	
	
		
 
			for(uint8_t i=0; i<MAX_NUM_SLAVES; i++) {

			




	
	
	
		
 
				for(uint8_t j=0; j<MAX_NUM_SENSORS; j++) {

			




	
	
	
		
 
					int16_t tmp = sensordata_get(i, j);

			




	
	
	
		
 
					if(tmp != -32768) {

			




	
	
	
		
 
					int32_t tmp = sensordata_get(i, j);

			




	
	
	
		
 
					if(tmp != -2111111111) {

			




	
	
	
		
 
						// FIXME: will the 128 here really provide safety? might want to subtract the strlen

			




	
	
	
		
 
						snprintf(csvHeader + strlen(csvHeader), 128,"%s-%s,", slavesensors_slavename(i), slavesensors_getLabel(j));

			




	
	
	
		
 
						snprintf(csvHeader + strlen(csvHeader), CSV_HEADER_SIZE-strlen(csvHeader),"%s-%s,", slavesensors_slavename(i), slavesensors_getLabel(j));

			




	
	
	
		
 
					}

			




	
	
	
		
 
				}

			




	
	
	
		
 
			}

			




	
	
	
		
 
		

			




	
	
	
		
 
			// Terminate header string and write to SD card

			




	
	
	
		
 
			snprintf(csvHeader + strlen(csvHeader), 128,"\r\n");

			




	
	
	
		
 
			snprintf(csvHeader + strlen(csvHeader), CSV_HEADER_SIZE-strlen(csvHeader),"\r\n");

			




	
	
	
		
 
			logger_log(csvHeader);

			




	
	
	
		
 
			dataWasReady = true;

			




	
	
	
		
 
		}

			




	
	
	
		
 
	

			




	
	
	
		
 
		// Write CSV sensor values to SD card

			




	
	
	
		
 
		logbuf[0] = 0x00;

			




	
	
	
		
 
		snprintf(logbuf, 128, "%lu,%d,%u,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course(), get_sv());

			




	
	
	
		
 
		snprintf(logbuf, 256, "%lu,%d,%s,%s,%s,%s,%s,%s,%s,", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course(), get_sv());

			




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

			




	
	
	
		
 
			for(int j=0; j<MAX_NUM_SENSORS; j++) {

			




	
	
	
		
 
				int16_t tmp = sensordata_get(i, j);

			




	
	
	
		
 
				if(tmp != -32768) {

			




	
	
	
		
 
					snprintf(logbuf + strlen(logbuf),128," %d,", tmp);

			




	
	
	
		
 
				int32_t tmp = sensordata_get(i, j);

			




	
	
	
		
 
				if(tmp != -2111111111) {

			




	
	
	
		
 
					snprintf(logbuf + strlen(logbuf),256-strlen(logbuf)," %ld,", tmp);

			




	
	
	
		
 
				}

			




	
	
	
		
 
			

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}

			




	
	
	
		
 
		snprintf(logbuf + strlen(logbuf),128,"\r\n");

			




	
	
	
		
 
		snprintf(logbuf + strlen(logbuf),256-strlen(logbuf),"\r\n");

			




	
	
	
		
 
		logger_log(logbuf);

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    master/master/lib/sensordata.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -17,10 +17,8 @@

			




	
	
	
		
 
#include "slavesensors.h"

			




	
	
	
		
 

			




	
	
	
		
 
void sensordata_setup();

			




	
	
	
		
 
void sensordata_set(uint8_t nodeID, uint8_t type, uint16_t value);

			




	
	
	
		
 
int16_t sensordata_get(uint8_t nodeID, uint8_t type);

			




	
	
	
		
 
void sensordata_setBoardTemp(uint8_t slaveID, int16_t value);

			




	
	
	
		
 
int16_t sensordata_getBoardTemp(uint8_t slaveID);

			




	
	
	
		
 
void sensordata_set(uint8_t nodeID, uint8_t type, int32_t value);

			




	
	
	
		
 
int32_t sensordata_get(uint8_t nodeID, uint8_t type);

			




	
	
	
		
 
char* slavesensors_getAPRScomment();

			




	
	
	
		
 
void sensordata_logvalues();

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    master/master/lib/serparser.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -48,7 +48,7 @@ uint8_t getPayloadLength()

			




	
	
	
		
 
{

			




	
	
	
		
 
	return payloadLength;

			




	
	
	
		
 
}

			




	
	
	
		
 
uint8_t* getPayload() 

			




	
	
	
		
 
char* getPayload() 

			




	
	
	
		
 
{

			




	
	
	
		
 
	return receivedPayload;

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    master/master/lib/serparser.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -34,7 +34,7 @@ enum parseStates

			




	
	
	
		
 

			




	
	
	
		
 
// Accessors

			




	
	
	
		
 
uint8_t getPayloadLength();

			




	
	
	
		
 
uint8_t* getPayload();

			




	
	
	
		
 
char* getPayload();

			




	
	
	
		
 
uint8_t getPayloadType();

			




	
	
	
		
 

			




	
	
	
		
 
// Prototypes

			




        

    


    
    

    

        

                

                    master/master/lib/slavesensors.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -52,9 +52,18 @@ const char *const labelLookup[] PROGMEM 

			




	
	
	
		
 

			




	
	
	
		
 
char labelBuffer[25]; // Size to length of label

			




	
	
	
		
 
char* slavesensors_getLabel(uint8_t sensorID) {

			




	
	
	
		
 
	//snprintf(labelBuffer, 25, "[%u]", sensorID);

			




	
	
	
		
 
	//return labelBuffer;

			




	
	
	
		
 
	if(sensorID < 9)

			




	
	
	
		
 
	{

			




	
	
	
		
 
	strncpy_P(labelBuffer,(char*)pgm_read_word(&(labelLookup[sensorID])),25);

			




	
	
	
		
 
		

			




	
	
	
		
 
	return labelBuffer;

			




	
	
	
		
 
}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		return NULL;

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
uint8_t currentSlave = 0;

			




	
	
	
		
 
uint8_t currentSlaveSensor = 0;

			




	
	
		
 
@@ -67,7 +76,7 @@ void slavesensors_setup()

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
//#define DEBUG_NETWORKSCAN

			




	
	
	
		
 
#define DEBUG_GETSLAVEDATA

			




	
	
	
		
 
//#define DEBUG_GETSLAVEDATA

			




	
	
	
		
 

			




	
	
	
		
 
char* bufPtr = 0x00;

			




	
	
	
		
 

			




	
	
		
 
@@ -397,9 +406,9 @@ void slavesensors_process(uint8_t parseR

			




	
	
	
		
 
		// We got some data, let's handle it

			




	
	
	
		
 
		// ASCII payload

			




	
	
	
		
 
		uint8_t len = getPayloadLength();

			




	
	
	
		
 
		uint8_t* load = getPayload();

			




	
	
	
		
 
		char* load = getPayload();

			




	
	
	
		
 
		uint8_t type = getPayloadType();

			




	
	
	
		
 
		uint16_t parsedVal = atoi(load);

			




	
	
	
		
 
		int32_t parsedVal = strtol(load, NULL, 10);//atoi(load);

			




	
	
	
		
 

			




	
	
	
		
 
		// Special case for slave telling us how many things we're about to get		

			




	
	
	
		
 
		if(type + 0x30 == '@') {

			




        

    


    
    

    

        

                

                    master/master/master.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -51,12 +51,6 @@ int main(void)

			




	
	
	
		
 
	logger_setup();

			




	
	
	
		
 
	afsk_setup();

			




	
	
	
		
 
	

			




	
	
	
		
 
	#ifdef DEBUG_OUTPUT

			




	
	
	
		
 
		serial0_sendString("\r\n---------------------------------\r\n");

			




	
	
	
		
 
		serial0_sendString("HAB Controller 1.0 - Initialized!\r\n");

			




	
	
	
		
 
		serial0_sendString("---------------------------------\r\n");

			




	
	
	
		
 
	#endif

			




	
	
	
		
 
	

			




	
	
	
		
 
	serial0_sendString("\r\nHello.\r\n\r\n");

			




	
	
	
		
 
	

			




	
	
	
		
 
	// Blocking ZigBee node discovery

			




        

    



    


    



    



      

      





    
    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