Eliminate SiRF state values from ao-view.

With Skytraq not having any visible GPS state information, just
remove this from the display.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-tools/ao-view/aoview_state.c b/ao-tools/ao-view/aoview_state.c
index 21cea99add4451dfb462ac3ea48f23c3568b9a00..838899a7c64cdc4e08ed70267f105a9fdd8729a7 100644 (file)
--- a/ao-tools/ao-view/aoview_state.c
+++ b/ao-tools/ao-view/aoview_state.c
@@ -342,23 +342,14 @@ aoview_state_notify(struct cc_telem *data)
        }
        if (state->gps.gps_connected) {
                int     nsat_vis = 0;
-               int     nsat_locked = 0;
                int     c;
 
-               for (c = 0; c < state->gps_tracking.channels; c++) {
-                       if ((state->gps_tracking.sats[c].state & 0xff) == 0xbf)
-                               nsat_locked++;
-               }
                aoview_table_add_row(2, "Satellites Visible", "%d", state->gps_tracking.channels);
-               aoview_table_add_row(2, "Satellites Locked", "%d", nsat_locked);
                for (c = 0; c < state->gps_tracking.channels; c++) {
-                       aoview_table_add_row(2, "Satellite id,state,C/N0",
-                                            "%3d,%02x,%2d%s",
+                       aoview_table_add_row(2, "Satellite id,C/N0",
+                                            "%3d,%2d",
                                             state->gps_tracking.sats[c].svid,
-                                            state->gps_tracking.sats[c].state,
-                                            state->gps_tracking.sats[c].c_n0,
-                                            (state->gps_tracking.sats[c].state & 0xff) == 0xbf ?
-                                            " LOCKED" : "");
+                                            state->gps_tracking.sats[c].c_n0);
                }
        }
        aoview_table_finish();

diff --git a/ao-tools/lib/cc.h b/ao-tools/lib/cc.h
index bdeeaaf5e6ad2000b953aa798615052d9124161e..46b16a8e90d45c81b45938c13870f0324e33e6b8 100644 (file)
--- a/ao-tools/lib/cc.h
+++ b/ao-tools/lib/cc.h
@@ -233,7 +233,6 @@ struct cc_gps {
 
 struct cc_gps_sat {
        int     svid;
-       int     state;
        int     c_n0;
 };