From: Keith Packard <keithp@keithp.com>
Date: Sat, 7 Feb 2015 04:40:05 +0000 (-0800)
Subject: altosuilib: Don't show 'Sats in view' for TeleGPS eeprom graphing
X-Git-Tag: 1.6~21
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=58f06706383418ebfa56d88ba51411e6185e09df;hp=35ad1833b10595564de84c88f44a214b1c134ccf

altosuilib: Don't show 'Sats in view' for TeleGPS eeprom graphing

We don't log the visible sats from TeleGPS, only the basic GPS
info. Have AltosFlightStats track whether sat info is present, then
use that to elide the Sats In View graph entry as needed.

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

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 1b88cb9f..677230e1 100644
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -37,6 +37,7 @@ public class AltosFlightStats {
 	public double		pad_lat, pad_lon;
 	public boolean		has_flight_data;
 	public boolean		has_gps;
+	public boolean		has_gps_sats;
 	public boolean		has_flight_adc;
 	public boolean		has_battery;
 	public boolean		has_rssi;
@@ -113,6 +114,7 @@ public class AltosFlightStats {
 		lat = lon = AltosLib.MISSING;
 		has_flight_data = false;
 		has_gps = false;
+		has_gps_sats = false;
 		has_flight_adc = false;
 		has_battery = false;
 		has_rssi = false;
@@ -174,6 +176,8 @@ public class AltosFlightStats {
 				lat = state.gps.lat;
 				lon = state.gps.lon;
 				has_gps = true;
+				if (state.gps.cc_gps_sat != null)
+					has_gps_sats = true;
 			}
 			if (state.imu != null)
 				has_imu = true;
diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 2e6d428d..854c869c 100644
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@ -329,12 +329,14 @@ public class AltosGraph extends AltosUIGraph {
 				  gps_nsat_solution_color,
 				  false,
 				  nsat_axis);
-			addSeries("GPS Satellites in View",
-				  AltosGraphDataPoint.data_gps_nsat_view,
-				  nsat_units,
-				  gps_nsat_view_color,
-				  false,
-				  nsat_axis);
+			if (stats.has_gps_sats) {
+				addSeries("GPS Satellites in View",
+					  AltosGraphDataPoint.data_gps_nsat_view,
+					  nsat_units,
+					  gps_nsat_view_color,
+					  false,
+					  nsat_axis);
+			}
 			addSeries("GPS Course",
 				  AltosGraphDataPoint.data_gps_course,
 				  orient_units,