Timer 3 working with slower clock and all 16 bits.

[fw/altos] / src / drivers / ao_gps_skytraq.c

diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c
index 39e36cc8e32a1ffe86497ca3a30703af8b01613e..d80da97ca6ea44a2cd2828380afa55eda19f0a0b 100644 (file)
--- a/src/drivers/ao_gps_skytraq.c
+++ b/src/drivers/ao_gps_skytraq.c
@@ -20,15 +20,15 @@
 #endif
 
 #ifndef ao_gps_getchar
-#define ao_gps_getchar ao_serial_getchar
+#define ao_gps_getchar ao_serial1_getchar
 #endif
 
 #ifndef ao_gps_putchar
-#define ao_gps_putchar ao_serial_putchar
+#define ao_gps_putchar ao_serial1_putchar
 #endif
 
 #ifndef ao_gps_set_speed
-#define ao_gps_set_speed       ao_serial_set_speed
+#define ao_gps_set_speed       ao_serial1_set_speed
 #endif
 
 __xdata uint8_t ao_gps_mutex;
@@ -480,7 +480,7 @@ gps_dump(void) __reentrant
        ao_mutex_get(&ao_gps_mutex);
        printf ("Date: %02d/%02d/%02d\n", ao_gps_data.year, ao_gps_data.month, ao_gps_data.day);
        printf ("Time: %02d:%02d:%02d\n", ao_gps_data.hour, ao_gps_data.minute, ao_gps_data.second);
-       printf ("Lat/Lon: %ld %ld\n", ao_gps_data.latitude, ao_gps_data.longitude);
+       printf ("Lat/Lon: %ld %ld\n", (long) ao_gps_data.latitude, (long) ao_gps_data.longitude);
        printf ("Alt: %d\n", ao_gps_data.altitude);
        printf ("Flags: 0x%x\n", ao_gps_data.flags);
        printf ("Sats: %d", ao_gps_tracking_data.channels);