From: Keith Packard <keithp@keithp.com>
Date: Fri, 20 Nov 2009 20:16:37 +0000 (-0800)
Subject: Eliminate SiRF state values from ao-view.
X-Git-Tag: debian/0.6+32+g87e6f3e~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=87e6f3e5c1688503ab8595912d8d6eb7139830b7;hp=8065b8146a31438e66f83c13b99281ec47439a73

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 21cea99a..838899a7 100644
--- 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 bdeeaaf5..46b16a8e 100644
--- 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;
 };