projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add 'g' command to ublox GPS code.
[fw/altos]
/
src
/
test
/
ao_gps_test_ublox.c
diff --git
a/src/test/ao_gps_test_ublox.c
b/src/test/ao_gps_test_ublox.c
index 806717354e301c9d2d79ddd7d8ee38893b0bb125..afd4dba414f45b14a3012db4adcfaa0744ad9bee 100644
(file)
--- 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
#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)
{
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"
#define ao_usb_getchar() 0
#include "ao_gps_print.c"
+#include "ao_gps_show.c"
#include "ao_gps_ublox.c"
static void
#include "ao_gps_ublox.c"
static void
@@
-342,10
+348,7
@@
void
ao_dump_state(void *wchan)
{
if (wchan == &ao_gps_data)
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;
}
return;
}