diff options
| author | Keith Packard <keithp@keithp.com> | 2013-10-14 22:41:43 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-10-14 22:41:43 -0700 |
| commit | 039446f54ef6968a3f0b37ce32ca6bdcdbe62546 (patch) | |
| tree | d66195ea4d80894af1b4ab771a6878abb770848a /src/test | |
| parent | 5c4b3658a96f1a64ccebf7bddda06b15b4ac4a6f (diff) | |
altos: Merge GPS logging into a single function
Create a new global, ao_gps_new, which indicates new GPS position and
satellite data.
Use ao_gps_new as the new sleep/wakeup address.
Merge the separate gps position/satellite logging tasks into a single
function which waits for new data and writes out the changed values.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ao_gps_test.c | 13 | ||||
| -rw-r--r-- | src/test/ao_gps_test_skytraq.c | 2 | ||||
| -rw-r--r-- | src/test/ao_gps_test_ublox.c | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/test/ao_gps_test.c b/src/test/ao_gps_test.c index 3844a326..b6cc9ba7 100644 --- a/src/test/ao_gps_test.c +++ b/src/test/ao_gps_test.c @@ -427,11 +427,18 @@ void ao_dump_state(void *wchan) { int i; - if (wchan == &ao_gps_data) + + if (wchan != &ao_gps_new) + return; + + if (ao_gps_new & AO_GPS_NEW_DATA) { ao_gps_print(&ao_gps_data); - else + putchar('\n'); + } + if (ao_gps_new & AO_GPS_NEW_TRACKING) { ao_gps_tracking_print(&ao_gps_tracking_data); - putchar('\n'); + putchar('\n'); + } return; printf ("%02d:%02d:%02d", ao_gps_data.hour, ao_gps_data.minute, diff --git a/src/test/ao_gps_test_skytraq.c b/src/test/ao_gps_test_skytraq.c index 89cbd767..bf2ab5b8 100644 --- a/src/test/ao_gps_test_skytraq.c +++ b/src/test/ao_gps_test_skytraq.c @@ -443,7 +443,7 @@ uint8_t ao_task_minimize_latency; void ao_dump_state(void *wchan) { - if (wchan == &ao_gps_data) + if (wchan == &ao_gps_new) ao_gps_show(); } diff --git a/src/test/ao_gps_test_ublox.c b/src/test/ao_gps_test_ublox.c index a0e04cb6..31c7af60 100644 --- a/src/test/ao_gps_test_ublox.c +++ b/src/test/ao_gps_test_ublox.c @@ -347,7 +347,7 @@ check_ublox_message(char *which, uint8_t *msg) void ao_dump_state(void *wchan) { - if (wchan == &ao_gps_data) + if (wchan == &ao_gps_new) ao_gps_show(); return; } |