altosuilib: Add GPS DOP values to graph

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

diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 292437de9879f52076742f0ff42cc77d1de9bb66..522eea1ef65ed1d463a9d84a303e213ef65f1c96 100644 (file)
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@ -172,6 +172,29 @@ class AltosMagUnits extends AltosUnits {
        }
 }
 
+class AltosDopUnits extends AltosUnits {
+
+       public double value(double p, boolean imperial_units) {
+               return p;
+       }
+
+       public double inverse(double p, boolean imperial_units) {
+               return p;
+       }
+
+       public String show_units(boolean imperial_units) {
+               return null;
+       }
+
+       public String say_units(boolean imperial_units) {
+               return null;
+       }
+
+       public int show_fraction(int width, boolean imperial_units) {
+               return 1;
+       }
+}
+
 public class AltosGraph extends AltosUIGraph {
 
        static final private Color height_color = new Color(194,31,31);
@@ -191,6 +214,9 @@ public class AltosGraph extends AltosUIGraph {
        static final private Color gps_course_color = new Color (100, 31, 112);
        static final private Color gps_ground_speed_color = new Color (31, 112, 100);
        static final private Color gps_climb_rate_color = new Color (31, 31, 112);
+       static final private Color gps_pdop_color = new Color(50, 194, 0);
+       static final private Color gps_hdop_color = new Color(50, 0, 194);
+       static final private Color gps_vdop_color = new Color(194, 0, 50);
        static final private Color temperature_color = new Color (31, 194, 194);
        static final private Color dbm_color = new Color(31, 100, 100);
        static final private Color state_color = new Color(0,0,0);
@@ -212,11 +238,12 @@ public class AltosGraph extends AltosUIGraph {
        static AltosGyroUnits gyro_units = new AltosGyroUnits();
        static AltosOrient orient_units = new AltosOrient();
        static AltosMagUnits mag_units = new AltosMagUnits();
+       static AltosDopUnits dop_units = new AltosDopUnits();
 
        AltosUIAxis     height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
        AltosUIAxis     distance_axis, pressure_axis;
        AltosUIAxis     gyro_axis, orient_axis, mag_axis;
-       AltosUIAxis     course_axis;
+       AltosUIAxis     course_axis, dop_axis;
 
        public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosGraphDataSet dataSet) {
                super(enable);
@@ -236,6 +263,7 @@ public class AltosGraph extends AltosUIGraph {
                orient_axis = newAxis("Tilt Angle", orient_units, orient_color, 0);
                mag_axis = newAxis("Magnetic Field", mag_units, mag_x_color, 0);
                course_axis = newAxis("Course", orient_units, gps_course_color, 0);
+               dop_axis = newAxis("Dilution of Precision", dop_units, gps_pdop_color, 0);
 
                addMarker("State", AltosGraphDataPoint.data_state, state_color);
 
@@ -325,6 +353,24 @@ public class AltosGraph extends AltosUIGraph {
                                  gps_climb_rate_color,
                                  enable_gps,
                                  speed_axis);
+                       addSeries("GPS Position DOP",
+                                 AltosGraphDataPoint.data_gps_pdop,
+                                 dop_units,
+                                 gps_pdop_color,
+                                 false,
+                                 dop_axis);
+                       addSeries("GPS Horizontal DOP",
+                                 AltosGraphDataPoint.data_gps_hdop,
+                                 dop_units,
+                                 gps_hdop_color,
+                                 false,
+                                 dop_axis);
+                       addSeries("GPS Vertical DOP",
+                                 AltosGraphDataPoint.data_gps_vdop,
+                                 dop_units,
+                                 gps_vdop_color,
+                                 false,
+                                 dop_axis);
                }
                if (stats.has_rssi)
                        addSeries("Received Signal Strength",

diff --git a/altosuilib/AltosGraphDataPoint.java b/altosuilib/AltosGraphDataPoint.java
index 14486abfa7b1d76f5027bd61a50db61dc59df650..56dadb8b49170389975d6063c77ce4cccd2e3539 100644 (file)
--- a/altosuilib/AltosGraphDataPoint.java
+++ b/altosuilib/AltosGraphDataPoint.java
@@ -53,7 +53,10 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
        public static final int data_gps_course = 27;
        public static final int data_gps_ground_speed = 28;
        public static final int data_gps_climb_rate = 29;
-       public static final int data_ignitor_0 = 30;
+       public static final int data_gps_pdop = 30;
+       public static final int data_gps_hdop = 31;
+       public static final int data_gps_vdop = 32;
+       public static final int data_ignitor_0 = 33;
        public static final int data_ignitor_num = 32;
        public static final int data_ignitor_max = data_ignitor_0 + data_ignitor_num - 1;
        public static final int data_ignitor_fired_0 = data_ignitor_0 + data_ignitor_num;
@@ -194,6 +197,24 @@ public class AltosGraphDataPoint implements AltosUIDataPoint {
                        else
                                y = AltosLib.MISSING;
                        break;
+               case data_gps_pdop:
+                       if (state.gps != null)
+                               y = state.gps.pdop;
+                       else
+                               y = AltosLib.MISSING;
+                       break;
+               case data_gps_hdop:
+                       if (state.gps != null)
+                               y = state.gps.hdop;
+                       else
+                               y = AltosLib.MISSING;
+                       break;
+               case data_gps_vdop:
+                       if (state.gps != null)
+                               y = state.gps.vdop;
+                       else
+                               y = AltosLib.MISSING;
+                       break;
                default:
                        if (data_ignitor_0 <= index && index <= data_ignitor_max) {
                                int ignitor = index - data_ignitor_0;