summaryrefslogtreecommitdiff
path: root/src/test/ao_gps_test_ublox.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-05-14 09:12:29 -0700
committerKeith Packard <keithp@keithp.com>2013-05-15 22:11:21 -0700
commit5e9193f6375be27e5f7a0321fd34b6acfe81247f (patch)
treea7222f619868ec65d99bfd1046bb07b368849e37 /src/test/ao_gps_test_ublox.c
parentcdad289a0803babecd30cbc0a95be99c5caadeb5 (diff)
altos: Add 'g' command to ublox GPS code.
Take the gps_dump function from ao_gps_skytraq.c and move it to a new file so it can be shared with the u-blox driver. That affects every skytraq and u-blox user as they need to include the new file. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/test/ao_gps_test_ublox.c')
-rw-r--r--src/test/ao_gps_test_ublox.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/test/ao_gps_test_ublox.c b/src/test/ao_gps_test_ublox.c
index 80671735..afd4dba4 100644
--- a/src/test/ao_gps_test_ublox.c
+++ b/src/test/ao_gps_test_ublox.c
@@ -77,6 +77,11 @@ struct ao_telemetry_satellite {
#define ao_gps_tracking_orig ao_telemetry_satellite
#define ao_gps_sat_orig ao_telemetry_satellite_info
+extern __xdata struct ao_telemetry_location ao_gps_data;
+extern __xdata struct ao_telemetry_satellite ao_gps_tracking_data;
+
+uint8_t ao_gps_mutex;
+
void
ao_mutex_get(uint8_t *mutex)
{
@@ -224,6 +229,7 @@ uint8_t ao_task_minimize_latency;
#define ao_usb_getchar() 0
#include "ao_gps_print.c"
+#include "ao_gps_show.c"
#include "ao_gps_ublox.c"
static void
@@ -342,10 +348,7 @@ void
ao_dump_state(void *wchan)
{
if (wchan == &ao_gps_data)
- ao_gps_print(&ao_gps_data);
- else
- ao_gps_tracking_print(&ao_gps_tracking_data);
- putchar('\n');
+ ao_gps_show();
return;
}