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

@@ @@ -72,25 +72,25 @@ @@
 // USART config (serial.c)
 // --------------------------------------------------------------------------
 #define USART0_BAUDRATE 115200
 #define USART1_BAUDRATE 115200
 // --------------------------------------------------------------------------
 // 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
 // --------------------------------------------------------------------------
 // APRS config (aprs.c)
 // --------------------------------------------------------------------------
 // Set your callsign and SSID here. Common values for the SSID are
 // (from http://zlhams.wikidot.com/aprs-ssidguide):
 //
@@ @@ -109,25 +109,25 @@ @@
 // (read more about digipeating paths here: http://wa8lmf.net/DigiPaths/ )
 // The recommended digi path for a balloon is WIDE2-1 or pathless. The default
 // is pathless. Uncomment the following two lines for WIDE2-1 path:
 #define DIGI_PATH1      "WIDE2"
 #define DIGI_PATH1_TTL  1
 // 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)
 // --------------------------------------------------------------------------
 #define LOGGER_ID_EEPROM_ADDR 0x10
 // Written to the beginning of every log file
 #define LOGGER_HEADERTEXT "HAB Control Master - 1.0\n"
 // Log to SD card every X milliseconds

master/master/lib/aprs.c

➞

Show inline comments

@@ @@ -38,25 +38,26 @@ void aprs_send() @@
 #ifdef DIGI_PATH1
     {DIGI_PATH1, DIGI_PATH1_TTL}, // Digi1 (first digi in the chain)
 #endif
 #ifdef DIGI_PATH2
     {DIGI_PATH2, DIGI_PATH2_TTL}, // Digi2 (second digi in the chain)
 #endif
   };
 	// 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');
   ax25_send_byte('O');                // Symbol: O=balloon, -=QTH
   snprintf(temp, 4, "%03d", (int)(gps_course + 0.5));
   ax25_send_string(temp);             // Course (degrees)
   ax25_send_byte('/');                // and
   //snprintf(temp, 4, "%03d", (int)(gps_speed + 0.5));
   ax25_send_string(get_speedKnots());             // speed (knots)

master/master/lib/serial.c

➞

Show inline comments

@@ @@ -30,39 +30,50 @@ void serial0_setup() { @@
 	/* Set baud rate */
 	UBRR0H = (unsigned char)(USART0_BAUD_PRESCALE>>8);
 	UBRR0L = (unsigned char)USART0_BAUD_PRESCALE;
 	UCSR0B |= (1 << RXCIE0); // Enable interrupt
 	//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 */
 	UCSR1C |= (1 << UCSZ10) | (1 << UCSZ11); // - 1 stop bit
 	/* Set baud rate */
 	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;
+}
 void serial1_sendChar( unsigned char byte )
+{
 	while (!(UCSR1A & (1<<UDRE1)));
 	UDR1 = byte;
+}

master/master/lib/serial.h

➞

Show inline comments

@@ @@ -22,14 +22,16 @@ @@
 void serial0_sendChar( unsigned char byte );
 void serial1_sendChar( unsigned char byte );
 void serial0_setup();
 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

@@ @@ -83,25 +83,29 @@ char stationID[8]; //blank - included fo @@
 char checksum[3];	//xx
 char knots[8];		//xxx.xx
 char* get_speedKnots() {
 	return knots;
+}
 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];
 // transmission state machine
 enum decodeState {
 	//shared fields
 	INITIALIZE=0,
 	GET_TYPE,
@@ @@ -232,25 +236,25 @@ void parse_gps_transmission(void){ @@
 				setParserState(GET_TYPE);
+			}
+		}
 		///parses GGA transmissions START
 		/// $--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
+			{
 				#ifdef DEBUG_NMEA
 				serial0_sendString("found GGA time byte\r\n");
 				#endif
 				setParserState(GGA_TIME);
 				timestamp[numBytes] = byte; //byte; //adjust number of bytes to fit array
@@ @@ -601,33 +605,34 @@ void parse_gps_transmission(void){ @@
+			{
 				setParserState(RMC_COURSE);
 				course[numBytes] = byte; //adjust number of bytes to fit array
 				numBytes++;
+			}
+		}
 		//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)
+		{
 			if (byte == '*') //end of this data type
+			{
 				variation[numBytes] = 0x00;
 				setParserState(GPS_CHECKSUM);
 				numBytes = 0; //prep for next phase of parse

master/master/lib/trackuinoGPS/gpsMKa.h

➞

Show inline comments

@@ @@ -10,14 +10,15 @@ @@
 #define GPSMKA_H_
 #define GGA_MESSAGE
 #define RMC_MESSAGE
 #define UKN_MESSAGE
 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

@@ @@ -69,24 +69,25 @@ int main(void) @@
 	uint32_t lastAprsBroadcast = 0;
 	uint32_t lastLog = 0;
 	uint32_t lastLedCycle = 0;
 	// Result of last parser run
 	int parseResult = PARSERESULT_NODATA;
 	// 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);
+		}
 		else if (ctr == 1) {
 			led_on(LED_ACT1);
 			led_off(LED_ACT0);
 			led_off(LED_ACT2);
 			led_off(LED_ACT3);
+		}
@@ @@ -96,61 +97,68 @@ int main(void) @@
 			led_off(LED_ACT0);
 			led_off(LED_ACT3);
+		}
 		else if (ctr == 3) {
 			led_on(LED_ACT3);
 			led_off(LED_ACT1);
 			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);
 			sensors_readBoardTemp(); // i2c read, 400k
 			snprintf(logbuf, 128, "%lu,%d,%uF,%s,%s,%s,%s,%s\r\n", time_millis(), sensors_getBoardTemp(),get_timestamp(),get_latitude(),get_longitude(),get_speedKnots(),get_hdop(), get_course());
 			logger_log(logbuf);
 			// Print out logger debug
 			serial0_sendString("LOG> ");
 			serial0_sendString(logbuf);
 			led_off(LED_CYCLE);
 			lastLog = time_millis();
+		}
 		// 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())
+			{
 				// TODO: something is terribly wrong
+			}
 			else
+			{
 				slavesensors_startprocess();

0 comments (0 inline, 0 general)