diff --git a/master/master/lib/gps.c b/master/master/lib/gps.c --- a/master/master/lib/gps.c +++ b/master/master/lib/gps.c @@ -1,11 +1,18 @@ -/* -* gpsMKa.c -* -* Created: 11/15/2012 12:02:38 PM -* Author: mkanning -*/ +/* + * Master Firmware: NMEA Parser + * + * Wireless Observational Modular Aerial Network + * + * Ethan Zonca + * Matthew Kanning + * Kyle Ripperger + * Matthew Kroening + * + */ #include +#include +#include #include #include #include "gps.h" @@ -128,14 +135,14 @@ ISR(USART1_RX_vect) void gps_setup() { - sprintf(timestamp, "0"); - sprintf(latitude, "0"); - sprintf(longitude, "0"); - sprintf(numSatellites, "0"); - sprintf(hdop, "0"); - sprintf(knots, "0"); - sprintf(course, "0"); - sprintf(dayofmonth, "0"); + snprintf(timestamp,2, "0"); + snprintf(latitude,2, "0"); + snprintf(longitude,2, "0"); + snprintf(numSatellites,2, "0"); + snprintf(hdop,2, "0"); + snprintf(knots,2, "0"); + snprintf(course,2, "0"); + snprintf(dayofmonth,2, "0"); } @@ -674,7 +681,8 @@ void parse_gps_transmission(void){ } /// MKa GPS transmission parser END -void XORbyteWithChecksum(uint8_t byte){ +void XORbyteWithChecksum(uint8_t byte) +{ calculatedChecksum ^= (int)byte; //this may need to be re-coded }