altoslib: Compute 'vertical acceleration' for eeprom files

[fw/altos] / altosuilib / AltosGraphNew.java

diff --git a/altosuilib/AltosGraphNew.java b/altosuilib/AltosGraphNew.java
index c0afd652a7bd36ea22f08a4fadcbdbc9ca64dfe6..2505a02c2474091cd9fa9c83a810023fa16efe6b 100644 (file)
--- a/altosuilib/AltosGraphNew.java
+++ b/altosuilib/AltosGraphNew.java
@@ -47,6 +47,7 @@ public class AltosGraphNew extends AltosUIGraphNew {
        static final private Color kalman_speed_color = new Color(0,255,0);
        static final private Color thrust_color = new Color(31,194,31);
        static final private Color accel_color = new Color(31,31,194);
+       static final private Color vert_accel_color = new Color(64,164,164);
        static final private Color kalman_accel_color = new Color(0,0,255);
        static final private Color voltage_color = new Color(194, 194, 31);
        static final private Color battery_voltage_color = new Color(194, 194, 31);
@@ -90,6 +91,9 @@ public class AltosGraphNew extends AltosUIGraphNew {
                AltosUIAxis     gyro_axis, orient_axis, mag_axis;
                AltosUIAxis     course_axis, dop_axis;
 
+               if (stats.serial != AltosLib.MISSING && stats.product != null && stats.flight != AltosLib.MISSING)
+                       setName(String.format("%s %d flight %d\n", stats.product, stats.serial, stats.flight));
+
                height_axis = newAxis("Height", AltosConvert.height, height_color);
                pressure_axis = newAxis("Pressure", AltosConvert.pressure, pressure_color, 0);
                speed_axis = newAxis("Speed", AltosConvert.speed, speed_color);
@@ -130,6 +134,11 @@ public class AltosGraphNew extends AltosUIGraphNew {
                                            true,
                                            accel_axis);
 
+               flight_series.register_axis(AltosUIFlightSeries.vert_accel_name,
+                                           vert_accel_color,
+                                           true,
+                                           accel_axis);
+
                flight_series.register_axis(AltosUIFlightSeries.kalman_accel_name,
                                            kalman_accel_color,
                                            false,