Changeset - 920a71bf7d87
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-02-12 16:02:54
ethanzonca@CL-ENS241-08.cedarville.edu
GPS latitude is now handled in a more robust manner, least 3 significant digits of current position are included in the comment field.
5 files changed with 34 insertions and 14 deletions:
master/master/lib/aprs.c
2
2
master/master/lib/gps.c
25
7
master/master/lib/gps.h
4
2
master/master/lib/sensordata.c
2
2
master/master/lib/slavesensors.c
1
1
0 comments (0 inline, 0 general)
master/master/lib/aprs.c
➞
Show inline comments
 
@@ -40,16 +40,16 @@ void aprs_send()
 
  ax25_send_header(addresses, sizeof(addresses)/sizeof(addresses[0]));
 
  ax25_send_byte('/');                // Report w/ timestamp, no APRS messaging. $ = NMEA raw data
 
  // ax25_send_string("021709z");     // 021709z = 2nd day of the month, 17:09 zulu (UTC/GMT)
 
  ax25_send_string(get_dayofmonth()); ///! Needs to be day hour minute        // 170915 = 17h:09m:15s zulu (not allowed in Status Reports)
 
  ax25_send_string(get_timestamp());
 
  ax25_send_byte('z'); // zulu time. h for nonzulu
 
  ax25_send_string(get_latitude());     // Lat: 38deg and 22.20 min (.20 are NOT seconds, but 1/100th of minutes)
 
  ax25_send_string(get_latitudeTrimmed());     // Lat: 38deg and 22.20 min (.20 are NOT seconds, but 1/100th of minutes)
 
  ax25_send_byte('N');
 
  ax25_send_byte('/');                // Symbol table
 
  ax25_send_string(get_longitude());     // Lon: 000deg and 25.80 min
 
  ax25_send_string(get_longitudeTrimmed());     // Lon: 000deg and 25.80 min
 
  ax25_send_byte('W');
 
  ax25_send_byte('O');                // Symbol: O=balloon, -=QTH
 
 
  //snprintf(temp, 4, "%03d", (int)(get_course() + 0.5));
 
  // !!!TODO: ENSURE THAT THE COURSE IS FORMATTED CORRECTLY!
 
  ax25_send_string(get_course());             // Course (degrees)
master/master/lib/gps.c
➞
Show inline comments
 
@@ -49,23 +49,41 @@ char timestamp[12];	//hhmmss.ss
 
char* get_timestamp()
 
{
 
	return timestamp;
 
}
 
 
char latitude[14];	//lllll.lla
 
char* get_latitude()
 
char latitudeTmp[8];
 
char* get_latitudeTrimmed()
 
{
 
	return latitude;
 
	strncpy(latitudeTmp, &latitude[0], 7);
 
	latitudeTmp[7] = 0x00;
 
	return latitudeTmp;
 
}
 
char* get_latitudeLSBs()
 
{
 
	strncpy(latitudeTmp, &latitude[7], 3);
 
	latitudeTmp[3] = 0x00;
 
	return latitudeTmp;
 
}
 

			




	
	
	
		
 
char longitude[14];	//yyyyy.yyb

			




	
	
	
		
 
char* get_longitude() 

			




	
	
	
		
 
char longitudeTmp[9];

			




	
	
	
		
 

			




	
	
	
		
 
char* get_longitudeTrimmed() 

			




	
	
	
		
 
{

			




	
	
	
		
 
	return longitude;

			




	
	
	
		
 
	strncpy(longitudeTmp, &longitude[0], 8);

			




	
	
	
		
 
	longitudeTmp[8] = 0x00;

			




	
	
	
		
 
	return longitudeTmp;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
char* get_longitudeLSBs()

			




	
	
	
		
 
{

			




	
	
	
		
 
	strncpy(longitudeTmp, &longitude[8], 3);

			




	
	
	
		
 
	longitudeTmp[3] = 0x00;

			




	
	
	
		
 
	return longitudeTmp;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
char quality;		//quality for GGA and validity for RMC

			




	
	
	
		
 
char numSatellites[4];

			




	
	
	
		
 
char* get_sv() 

			




	
	
	
		
 
{

			




	
	
	
		
 
	return numSatellites;

			




	
	
		
 
@@ -287,13 +305,13 @@ void parse_gps_transmission(void){

			




	
	
	
		
 
				skipBytes = 1;

			




	
	
	
		
 
				setParserState(GGA_LATITUDE);

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else if (byte == ',') //end of this data type

			




	
	
	
		
 
			{

			




	
	
	
		
 
				

			




	
	
	
		
 
				latitude[7] = 0x00; // null terminate

			




	
	
	
		
 
				latitude[numBytes] = 0x00; // null terminate

			




	
	
	
		
 
				

			




	
	
	
		
 
				setParserState(GGA_LONGITUDE);

			




	
	
	
		
 
				skipBytes = 0; //prep for next phase of parse

			




	
	
	
		
 
				numBytes = 0;

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else //store data

			




	
	
		
 
@@ -319,13 +337,13 @@ void parse_gps_transmission(void){

			




	
	
	
		
 
				

			




	
	
	
		
 
				skipBytes = 1;

			




	
	
	
		
 
				setParserState(GGA_LONGITUDE);

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else if (byte == ',') //end of this data type

			




	
	
	
		
 
			{

			




	
	
	
		
 
				longitude[8] = 0x00;

			




	
	
	
		
 
				longitude[numBytes] = 0x00;

			




	
	
	
		
 
				setParserState(GGA_QUALITY);

			




	
	
	
		
 
				numBytes = 0; //prep for next phase of parse

			




	
	
	
		
 
				skipBytes = 0;

			




	
	
	
		
 
			}

			




	
	
	
		
 
			else //store data

			




	
	
	
		
 
			{

			




        

    


    
    

    

        

                

                    master/master/lib/gps.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,14 +18,16 @@

			




	
	
	
		
 

			




	
	
	
		
 
#define GGA_MESSAGE

			




	
	
	
		
 
#define RMC_MESSAGE

			




	
	
	
		
 
#define UKN_MESSAGE

			




	
	
	
		
 

			




	
	
	
		
 
void gps_setup();

			




	
	
	
		
 
char* get_longitude();

			




	
	
	
		
 
char* get_latitude();

			




	
	
	
		
 
char* get_longitudeTrimmed();

			




	
	
	
		
 
char* get_longitudeLSBs();

			




	
	
	
		
 
char* get_latitudeTrimmed();

			




	
	
	
		
 
char* get_latitudeLSBs();

			




	
	
	
		
 
char* get_timestamp();

			




	
	
	
		
 
char* get_speedKnots();

			




	
	
	
		
 
char* get_course();

			




	
	
	
		
 
char* get_hdop();

			




	
	
	
		
 
char* get_sv();

			




	
	
	
		
 
char* get_dayofmonth();

			




        

    


    
    

    

        

                

                    master/master/lib/sensordata.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -61,13 +61,13 @@ int32_t sensordata_get(uint8_t nodeID, u

			




	
	
	
		
 

			




	
	
	
		
 
// Generate APRS comment

			




	
	
	
		
 
// TODO: Can we move this buffer to a local scope of this function?

			




	
	
	
		
 
char commentBuffer[128];

			




	
	
	
		
 
char* slavesensors_getAPRScomment() 

			




	
	
	
		
 
{

			




	
	
	
		
 
	snprintf(commentBuffer,128, "T%d S%s V%s H%s", sensors_getBoardTemp(), get_sv(), get_speedKnots(), get_hdop());

			




	
	
	
		
 
	snprintf(commentBuffer,128, "T%d S%s V%s H%s _%s |%s", sensors_getBoardTemp(), get_sv(), get_speedKnots(), get_hdop(), get_latitudeLSBs(), get_longitudeLSBs());

			




	
	
	
		
 
	return commentBuffer;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
// Generates CSV headers on first run and logs values to the SD card (if data available)

			




	
	
	
		
 
bool dataWasReady = false;

			




	
	
		
 
@@ -110,13 +110,13 @@ void sensordata_logvalues()

			




	
	
	
		
 
	

			




	
	
	
		
 
		// Write CSV sensor values to SD card

			




	
	
	
		
 
		char logbuf[256];

			




	
	
	
		
 
		logbuf[0] = 0x00;

			




	
	
	
		
 
		

			




	
	
	
		
 
		// Write master sensor values

			




	
	
	
		
 
		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());

			




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

			




	
	
	
		
 
		

			




	
	
	
		
 
		// Write slave sensor values

			




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

			




	
	
	
		
 
		{

			




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

			




	
	
	
		
 
			{

			




        

    


    
    

    

        

                

                    master/master/lib/slavesensors.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -485,19 +485,19 @@ void slavesensors_process(uint8_t parseR

			




	
	
	
		
 
	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.

			




	
	
	
		
 
	// TODO: If we time out, WE NEED TO RESET THE PARSER. It could be in a bad state.

			




	
	
	
		
 
	else if(parseResult == PARSERESULT_NODATA) 

			




	
	
	
		
 
	{

			




	
	
	
		
 
		// Wait for data

			




	
	
	
		
 
		if(requesting && time_millis() - beginRequest > 1000) {

			




	
	
	
		
 
			// if we're requesting, we have no data, and we're over the timeout, this is bad!

			




	
	
	
		
 
			// setParserState(STATE_RESET); - meh, can't do this because it freaking increments the cirbufptr

			




	
	
	
		
 
			gotoNextSlaveOrSensor(true);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
	

			




	
	
	
		
 
	// 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