Merge branch 'bdale-ui' into telestatic-v4

diff --cc Makefile.am
Simple merge

diff --cc altoslib/AltosCSV.java
index 16c57ec187104e5f8449f3ba030d496f734bd894,4a21f2bcdceb1f1edb2595d3a2aba67a553ed6b1..1aba130f95c113a6e2ab2fe6f428b15e0213ffb7
--- 1/altoslib/AltosCSV.java
--- 2/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@@ -183,40 -173,16 +183,46 @@@ public class AltosCSV implements AltosW
        }
  
        void write_basic_header() {
-               if (has_accel)
-                       out.printf("acceleration,");
-               if (has_baro)
-                       out.printf("pressure,altitude,");
-               out.printf("height,speed");
-               if (has_baro)
-                       out.printf(",temperature");
-               if (has_pyro)
-                       out.printf(",drogue_voltage,main_voltage");
-       }
- 
-       double acceleration() { return series.value(AltosFlightSeries.accel_name, indices); }
 -              out.printf("pressure,thrust");
++              /* presence of thrust data means this is a test stand */
++              if (has_thrust)
++                      out.printf("pressure,thrust");
++              else {
++                      if (has_accel)
++                              out.printf("acceleration,");
++                      if (has_baro)
++                              out.printf("pressure,altitude,");
++                      out.printf("height,speed");
++                      if (has_baro)
++                              out.printf(",temperature");
++                      if (has_pyro)
++                              out.printf(",drogue_voltage,main_voltage");
++              }
+       }
+ 
        double pressure() { return series.value(AltosFlightSeries.pressure_name, indices); }
-       double altitude() { return series.value(AltosFlightSeries.altitude_name, indices); }
-       double height() { return series.value(AltosFlightSeries.height_name, indices); }
-       double speed() { return series.value(AltosFlightSeries.speed_name, indices); }
-       double temperature() { return series.value(AltosFlightSeries.temperature_name, indices); }
-       double apogee_voltage() { return series.value(AltosFlightSeries.apogee_voltage_name, indices); }
-       double main_voltage() { return series.value(AltosFlightSeries.main_voltage_name, indices); }
+       double thrust() { return series.value(AltosFlightSeries.thrust_name, indices); }
  
        void write_basic() {
-               if (has_accel)
-                       out.printf("%8.2f,", acceleration());
-               if (has_baro)
-                       out.printf("%10.2f,%8.2f,",
-                                  pressure(), altitude());
-               out.printf("%8.2f,%8.2f",
-                          height(), speed());
-               if (has_baro)
-                       out.printf(",%5.1f", temperature());
-               if (has_pyro)
-                       out.printf(",%5.2f,%5.2f",
-                                  apogee_voltage(),
-                                  main_voltage());
 -              out.printf("%10.2f,%10.2f",
 -                         pressure(),
 -                         thrust());
++              /* presence of thrust data means this is a test stand */
++              if (has_thrust)
++                      out.printf("%10.2f,%10.2f", 
++                              pressure(), 
++                              thrust());
++              else {
++                      if (has_accel)
++                              out.printf("%8.2f,", acceleration());
++                      if (has_baro)
++                              out.printf("%10.2f,%8.2f,",
++                                      pressure(), altitude());
++                      out.printf("%8.2f,%8.2f",
++                              height(), speed());
++                      if (has_baro)
++                              out.printf(",%5.1f", temperature());
++                      if (has_pyro)
++                              out.printf(",%5.2f,%5.2f",
++                                      apogee_voltage(),
++                                      main_voltage());
++              }
        }
  
        void write_battery_header() {
@@@ -524,24 -451,12 +530,28 @@@
                        has_radio = true;
                if (series.has_series(AltosFlightSeries.state_name))
                        has_flight_state = true;
 -              if (series.has_series(AltosFlightSeries.accel_name) || series.has_series(AltosFlightSeries.pressure_name))
 +              if (series.has_series(AltosFlightSeries.accel_name)) {
 +                      has_basic = true;
 +                      has_accel = true;
 +              }
++
++              if (series.has_series(AltosFlightSeries.thrust_name)) 
++                      has_thrust = true;
++
 +              if (series.has_series(AltosFlightSeries.pressure_name)) {
                        has_basic = true;
 +                      has_baro = true;
 +              }
 +              if (series.has_series(AltosFlightSeries.apogee_voltage_name))
 +                      has_pyro = true;
                if (series.has_series(AltosFlightSeries.battery_voltage_name))
                        has_battery = true;
 +              if (series.has_series(AltosFlightSeries.motor_pressure_name))
 +                      has_motor_pressure = true;
                if (series.has_series(AltosFlightSeries.accel_across_name))
 -                      has_advanced = true;
 +                      has_3d_accel = true;
 +              if (series.has_series(AltosFlightSeries.gyro_roll_name))
 +                      has_imu = true;
                if (series.has_series(AltosFlightSeries.pyro_voltage_name))
                        has_igniter = true;
  

diff --cc altosuilib/AltosGraph.java
index 1ccde1d6c2e341a2930dc636b603e4f565ff47d7,7dc336e9398dd6403186da65988518c7487ee450..d77e8e4403706a632c15a50ddeaaf7385a8cf071
--- 1/altosuilib/AltosGraph.java
--- 2/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@@ -102,18 -100,17 +102,18 @@@ public class AltosGraph extends AltosUI
                AltosUIAxis     pressure_axis, thrust_axis;
                AltosUIAxis     gyro_axis, orient_axis, mag_axis;
                AltosUIAxis     course_axis, dop_axis, tick_axis;
 +              AltosUIAxis     motor_pressure_axis;
  
                if (stats != null && 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));
+                       setName(String.format("%s %d test %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);
+               height_axis = newAxis("Height", AltosConvert.height, height_color,0);
+               pressure_axis = newAxis("Pressure", AltosConvert.pressure, pressure_color);
+               speed_axis = newAxis("Speed", AltosConvert.speed, speed_color,0);
                thrust_axis = newAxis("Thrust", AltosConvert.force, accel_color);
                tick_axis = newAxis("Tick", tick_units, accel_color, 0);
-               accel_axis = newAxis("Acceleration", AltosConvert.accel, accel_color);
-               voltage_axis = newAxis("Voltage", AltosConvert.voltage, battery_voltage_color);
+               accel_axis = newAxis("Acceleration", AltosConvert.accel, accel_color,0);
+               voltage_axis = newAxis("Voltage", AltosConvert.voltage, battery_voltage_color,0);
                temperature_axis = newAxis("Temperature", AltosConvert.temperature, temperature_color, 0);
                nsat_axis = newAxis("Satellites", null, gps_nsat_color,
                                    AltosUIAxis.axis_include_zero | AltosUIAxis.axis_integer);

diff --cc configure.ac
Simple merge