seniordesign-firmware Changeset - d62f0f469869

Changeset - d62f0f469869

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-01-15 18:53:48
ethanzonca@CL-ENS241-08.cedarville.edu

APRS tracking functional

7 files changed with 35 insertions and 7 deletions:

master/master/config.h

master/master/lib/aprs.c

master/master/lib/serial.c

master/master/lib/serial.h

master/master/lib/trackuinoGPS/gpsMKa.c

master/master/lib/trackuinoGPS/gpsMKa.h

master/master/master.c

0 comments (0 inline, 0 general)

master/master/config.h

➞

Show inline comments

@@ @@ -78,13 +78,13 @@ @@
 // --------------------------------------------------------------------------
 // AX.25 config (ax25.c)
 // --------------------------------------------------------------------------
 // TX delay in milliseconds
-#define TX_DELAY      300
+#define TX_DELAY      500
 // Maximum packet delay
 #define MAX_PACKET_LEN 512  // bytes
 // --------------------------------------------------------------------------
@@ @@ -115,13 +115,13 @@ @@
 // APRS comment: this goes in the comment portion of the APRS message. You
 // might want to keep this short. The longer the packet, the more vulnerable
 // it is to noise.
 #define APRS_COMMENT    "CU HAB TEST"
 // Transmit the APRS sentence every X milliseconds
-#define APRS_TRANSMIT_PERIOD 10000
+#define APRS_TRANSMIT_PERIOD 30000
 // --------------------------------------------------------------------------
 // Logger config (logger.c)
 // --------------------------------------------------------------------------

master/master/lib/aprs.c

➞

Show inline comments

@@ @@ -44,13 +44,14 @@ void aprs_send() @@
   };
 	// emz: modified this to get the size of the first address rather than the size of the struct itself, which fails
   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_timestamp());         // 170915 = 17h:09m:15s zulu (not allowed in Status Reports)
   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_byte('N');
   ax25_send_byte('/');                // Symbol table
   ax25_send_string(get_longitude());     // Lon: 000deg and 25.80 min
   ax25_send_byte('W');

master/master/lib/serial.c

➞

Show inline comments

@@ @@ -36,12 +36,14 @@ void serial0_setup() { @@
 	//UCSR0A |= (1<<RXC0);
+}
 void serial1_setup() {
 //PROVEN in test project
 	/* Enable receiver and transmitter */
 	UCSR1B |= (1<<RXEN1)|(1<<TXEN1); // Enable rx/tx
 	/* Set frame format: 8data, 1stop bit */
@@ @@ -51,12 +53,21 @@ void serial1_setup() { @@
 	UBRR1H = (unsigned char)(USART1_BAUD_PRESCALE>>8);
 	UBRR1L = (unsigned char)USART1_BAUD_PRESCALE;
 	UCSR1B |= (1 << RXCIE1); // Enable interrupt
+}
 void serial1_ion() {
 	UCSR1B |= (1<<RXEN1); // Enable rx
 	UCSR1B |= (1 << RXCIE1); // Enable interrupt
+}
 void serial1_ioff() {
 	UCSR1B &= ~(1<<RXEN1); // Disable rx
 	UCSR1B &= ~(1 << RXCIE1); // Disable interrupt
+}
 void serial0_sendChar( unsigned char byte )
+{
 	while (!(UCSR0A & (1<<UDRE0)));
 	UDR0 = byte;
+}

master/master/lib/serial.h

➞

Show inline comments

@@ @@ -28,8 +28,10 @@ void serial1_setup(); @@
 void serial0_sendString(const char* stringPtr);
 void serial1_sendString(const char* stringPtr);
 void serial_sendCommand( char moduleID, char sensorID, char* data );
 void serial_sendResponseData();
 void serial1_ion();
 void serial1_ioff();
 #endif /* SERIAL_H_ */
@@ \ No newline at end of file @@

master/master/lib/trackuinoGPS/gpsMKa.c

➞

Show inline comments

@@ @@ -89,13 +89,17 @@ char* get_speedKnots() { @@
 char course[8];		//xxx.x
 char* get_course() {
 	return course;
+}
 char datestamp[9];	//ddmmyy
 char dayofmonth[9];	//ddmmyy
 char* get_dayofmonth() {
 	return dayofmonth;
+}
 char variation[9];	//xxx.xb
 int calculatedChecksum;
 int receivedChecksum;
 char convertBuf1[15];
 char convertBuf2[15];
@@ @@ -238,13 +242,13 @@ void parse_gps_transmission(void){ @@
 		/// $--GGA,hhmmss.ss,llll.ll,a,yyyyy.yy,a,x,xx,x.x,x.x,M,x.x,M,x.x,xxxx*xx
 		//timestamp
 		else if (decodeState == GGA_TIME)
+		{
 			if (byte == ',') //end of this data type
+			{
-				timestamp[6] = 0x00; // Cut off at 6 for APRS
+				timestamp[4] = 0x00; // Cut off at 4 (no seconds) for APRS
 				setParserState(GGA_LATITUDE);
 				skipBytes = 0; //prep for next phase of parse
 				numBytes = 0;
+			}
 			else //store data
+			{
@@ @@ -607,21 +611,22 @@ void parse_gps_transmission(void){ @@
 		//date
 		else if(decodeState == RMC_DATE)
+		{
 			if (byte == ',') //end of this data type
+			{
 				datestamp[numBytes] = 0x00;
 				// Cut it off at day of month. Also has month and year if we ever need it.
 				dayofmonth[2] = 0x00;
 				setParserState(RMC_MAG_VARIATION);
 				skipBytes = 0; //prep for next phase of parse
 				numBytes = 0;
+			}
 			else //store data
+			{
 				setParserState(RMC_DATE);
-				datestamp[numBytes] = byte; //adjust number of bytes to fit array
+				dayofmonth[numBytes] = byte; //adjust number of bytes to fit array
 				numBytes++;
+			}
+		}
 		//magnetic variation
 		else if(decodeState == RMC_MAG_VARIATION)

master/master/lib/trackuinoGPS/gpsMKa.h

➞

Show inline comments

@@ @@ -16,8 +16,9 @@ char* get_longitude(); @@
 char* get_latitude();
 char* get_timestamp();
 char* get_speedKnots();
 char* get_course();
 char* get_hdop();
 char* getNumSatelites();
 char* get_dayofmonth();
 #endif /* GPSMKA_H_ */
@@ \ No newline at end of file @@

master/master/master.c

➞

Show inline comments

@@ @@ -75,12 +75,13 @@ int main(void) @@
 	// Write CSV header to SD card
 	//logger_log("ProgramTime,LastAprsBroadcast,LastLog\n");
 	uint8_t ctr = 0;
 	void spin() {
 		if(ctr == 0) {
 			led_on(LED_ACT0);
 			led_off(LED_ACT1);
 			led_off(LED_ACT2);
 			led_off(LED_ACT3);
+		}
@@ @@ -102,26 +103,32 @@ int main(void) @@
 			led_off(LED_ACT2);
 			led_off(LED_ACT0);
+		}
 		ctr = (ctr + 1) % 4;
+	}
 	serial1_ioff();
 	while(1)
+    {
 		// Periodic: LED execution indicator
 		if(time_millis() - lastLedCycle > LEDCYCLE_RATE) {
 			spin();
 			if(!afsk_busy())
 				serial1_ion();
 			lastLedCycle = time_millis();
+		}
 		// Periodic: Logging
 		if(time_millis() - lastLog > LOGGER_RATE)
+		{
 			led_on(LED_CYCLE);
 			// Print out GPS debug
 			snprintf(debugBuf, 128, "GPS> time: %s lat: %s lon: %s speed: %s hdop: %s course: %s\r\n",
 			get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 			serial0_sendString(debugBuf);
@@ @@ -139,12 +146,13 @@ int main(void) @@
 		// Periodic: APRS transmission
 		if(time_millis() - lastAprsBroadcast > APRS_TRANSMIT_PERIOD)
+		{
 			while(afsk_busy());
 			serial1_ioff();
 			aprs_send(); // non-blocking
 			//serial0_sendString("Initiating APRS transmission...\r\n");
 			// Start getting values for next transmission
 			if(slavesensors_isrequesting())

0 comments (0 inline, 0 general)