X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fnmea_test.c;h=f95125d051c997f3cb71551bac24a3d0a94e1b05;hb=9ebefafde06a6a7001e8fa631aedc91cf1dc5af3;hp=4f611ff87c133914368e23fd9525a13830890c66;hpb=b7b925c33aeb1536d65d9f5a2c6b66c3b191e4e4;p=bertos.git

diff --git a/bertos/net/nmea_test.c b/bertos/net/nmea_test.c
index 4f611ff8..f95125d0 100644
--- a/bertos/net/nmea_test.c
+++ b/bertos/net/nmea_test.c
@@ -33,6 +33,8 @@
  * \brief NMEA parser test.
  *
  * \author Daniele Basile <asterix@develer.com>
+ *
+ * notest:avr
  */
 
 #include "nmea.h"
@@ -54,10 +56,10 @@ static KFileMem mem;
 
 static char nmea_test_vector[] =
 {
-"$GPGGA,123519,3929.946667,N,11946.086667,E,1,08,0.9,545.4,M,46.9,M,,*4A\r\n" /* good */
+"$GPGGA,123519.021,3929.946667,N,11946.086667,E,1,08,0.9,545.4,M,46.9,M,,*4A\r\n" /* good */
 "$xyz,1234,asdfadfasdfasdfljsadfkjasdfk\r\n"                                  /* junk */
-"$GPRMC,225446,A,4916.45,N,12311.12,W,000.5,054.7,191194,020.3,E*68\r\n"      /* good */
-"$GPRMC,225446,A,4916.45,N,12311.12,W,000.5,054.7,191194,020.3,E*48\r\n"      /* checksum error */
+"$GPRMC,225446,A,4916.45,N,12311.120,W,000.5,054.7,191194,020.3,E*68\r\n"      /* good */
+"$GPRMC,225446,A,4916.45,N,12311.120,W,000.5,054.7,191194,020.3,E*48\r\n"      /* checksum error */
 "$GPGGA,091144.698,0000.0000,S,00000.0000,W,0,00,00.0,0.0,M,0.0,M,,*5C\r\n"   /* acquired */
 "$GPRMC,091144.698,V,0000.0000,S,00000.0000,W,0.00,0.00,051009,,,A*75\r\n"    /* acquired */
 "$GPVTG,0.00,T,,,0.00,N,0.00,K,A*70\r\n"                                      /* acquired */
@@ -65,6 +67,11 @@ static char nmea_test_vector[] =
 "$GPGSV,1,1,02,1,,,41,12,,,35,,,,,,,,*4A\r\n"                                 /* acquired */
 "$GPRMC,091145.698,V,0000.0000,S,00000.0000,W,0.00,0.00,051009,,,A*74\r\n"    /* acquired */
 "$GPVTG,0.00,T,,,0.00,N,0.00,K,A*70\r\n"                                      /* acquired */
+"$GPGGA,170529.948,4351.0841,N,01108.8685,E,1,05,02.6,57.4,M,45.2,M,,*50\r\n"
+"$GPRMC,170525.949,A,4351.0843,N,01108.8687,E,0.00,237.67,051009,,,A*61\r\n"
+"$GPVTG,237.67,T,,,0.00,N,0.00,K,A*77\r\n"
+"$GPGSV,3,1,09,3,78,302,37,6,87,031,,7,05,292,37,14,05,135,*48\r\n"
+"$GPGGA,170527.949,4351.0842,N,01108.8685,E,1,05,02.6,57.4,M,45.2,M,,*5C\r\n"
 };
 
 
@@ -77,7 +84,7 @@ static void gpgga_callout(nmeap_context_t *context, void *data, void *user_data)
 	(void)user_data;
 	NmeaGga *gga = (NmeaGga *)data;
 
-    kprintf("found GPGGA message %d %d %d %d %d %d %d %d\n",
+    kprintf("found GPGGA message %ld %ld %d %lu %d %d %d %d\n",
             gga->latitude,
             gga->longitude,
             gga->altitude,
@@ -98,14 +105,13 @@ static void gprmc_callout(nmeap_context_t *context, void *data, void *user_data)
 	(void)user_data;
     NmeaRmc *rmc = (NmeaRmc *)data;
 
-	kprintf("found GPRMC Message %d %c %d %d %d %d %d %d\n",
+	kprintf("found GPRMC Message %lu %c %d %ld %ld %d %d\n",
             rmc->time,
             rmc->warn,
             rmc->latitude,
             rmc->longitude,
             rmc->speed,
             rmc->course,
-            rmc->date,
             rmc->mag_var
             );
 }