Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorTom Marble <tmarble@info9.net>
Wed, 12 Sep 2012 03:50:18 +0000 (22:50 -0500)
committerTom Marble <tmarble@info9.net>
Wed, 12 Sep 2012 03:50:18 +0000 (22:50 -0500)
altoslib/AltosSpeed.java
altosui/AltosGraphUI.java
doc/Makefile
doc/altusmetrum.xsl
doc/release-notes-1.1.xsl [new file with mode: 0644]

index 4e2daf5ad05f9e4553641a4c117c3c31c7b648d4..af63ed17ebbefb79cbaf81f6c3ca51c2da98dabb 100644 (file)
@@ -21,19 +21,19 @@ public class AltosSpeed extends AltosUnits {
 
        public double value(double v) {
                if (AltosConvert.imperial_units)
-                       return AltosConvert.meters_to_mph(v);
+                       return AltosConvert.meters_to_feet(v);
                return v;
        }
 
        public String show_units() {
                if (AltosConvert.imperial_units)
-                       return "mph";
+                       return "ft/s";
                return "m/s";
        }
 
        public String say_units() {
                if (AltosConvert.imperial_units)
-                       return "miles per hour";
+                       return "feet per second";
                return "meters per second";
        }
 
index 527a7d280b138b4718b149c7b4b7800bf930e205..edde1307e17d60dc6bae8b1baa8ca3980987f4ae 100644 (file)
@@ -35,16 +35,16 @@ public class AltosGraphUI extends AltosFrame
 
     static private class OverallGraphs {
         AltosGraphTime.Element height = 
-            new AltosGraphTime.TimeSeries("Height (m)", "Height (AGL)", red) {
+               new AltosGraphTime.TimeSeries(String.format("Height (%s)", AltosConvert.height.show_units()), "Height (AGL)", red) {
                 public void gotTimeData(double time, AltosDataPoint d) {
                        double  height = d.height();
                        if (height != AltosRecord.MISSING)
-                               series.add(time, d.height()); 
+                               series.add(time, AltosConvert.height.value(height));
                 } 
             };
     
         AltosGraphTime.Element speed =
-            new AltosGraphTime.TimeSeries("Speed (m/s)", "Vertical Speed", green) { 
+               new AltosGraphTime.TimeSeries(String.format("Speed (%s)", AltosConvert.speed.show_units()), "Vertical Speed", green) { 
                 public void gotTimeData(double time, AltosDataPoint d) {
                    double      speed;
                    if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
@@ -53,18 +53,19 @@ public class AltosGraphUI extends AltosFrame
                        speed = d.baro_speed();
                     }
                    if (speed != AltosRecord.MISSING)
-                       series.add(time, speed);
+                           series.add(time, AltosConvert.speed.value(speed));
                 }
             };
     
         AltosGraphTime.Element acceleration =
-            new AltosGraphTime.TimeSeries("Acceleration (m/s\u00B2)", 
-                    "Axial Acceleration", blue) 
+               new AltosGraphTime.TimeSeries(String.format("Acceleration (%s)",
+                                                           AltosConvert.accel.show_units()),
+                                             "Axial Acceleration", blue)
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
                    double acceleration = d.acceleration();
                    if (acceleration != AltosRecord.MISSING)
-                       series.add(time, acceleration);
+                           series.add(time, AltosConvert.accel.value(acceleration));
                 }
             };
     
index 6c77f0ee101e0239554e9dd9ea15aaaa1a054a8f..fbe8bc11c8056f1ceaacd06a132c3e4454836f10 100644 (file)
@@ -7,7 +7,8 @@ RELNOTES=\
        release-notes-0.8.html \
        release-notes-0.9.html \
        release-notes-0.9.2.html \
-       release-notes-1.0.1.html
+       release-notes-1.0.1.html \
+       release-notes-1.1.html
 
 RELNOTES_XSL=$(RELNOTES:.html=.xsl)
 HTML=altusmetrum.html altos.html telemetry.html companion.html $(RELNOTES)
index ad08aecc518f763461dae2966efff893532a5c57..8339ca432c61dcb38d9f052e91df412e972ef36c 100644 (file)
@@ -2482,6 +2482,7 @@ NAR #88757, TRA #12200
   <appendix
       xmlns:xi="http://www.w3.org/2001/XInclude">
     <title>Release Notes</title>
+    <xi:include        href="release-notes-1.1.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include        href="release-notes-1.0.1.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include        href="release-notes-0.9.2.xsl"  xpointer="xpointer(/article/*)"/>
     <xi:include        href="release-notes-0.9.xsl"  xpointer="xpointer(/article/*)"/>
diff --git a/doc/release-notes-1.1.xsl b/doc/release-notes-1.1.xsl
new file mode 100644 (file)
index 0000000..79ea39e
--- /dev/null
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"/usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
+
+<article>
+  <para>
+    Version 1.1 is a minor release. It provides a few new features in AltosUI
+    and the AltOS firmware and fixes bugs.
+  </para>
+  <para>
+    AltOS Firmware Changes
+    <itemizedlist>
+      <listitem>
+       Add apogee-lockout value. Overrides the apogee detection logic to
+       prevent incorrect apogee charge firing.
+      </listitem>
+      <listitem>
+       Fix a bug where the data reported in telemetry packets was
+       from 320ms ago.
+      </listitem>
+      <listitem>
+       Force the radio frequency to 434.550MHz when the debug clock
+       pin is connected to ground at boot time. This provides a way
+       to talk to a TeleMini which is configured to some unknown frequency.
+      </listitem>
+      <listitem>
+       Provide RSSI values for Monitor Idle mode. This makes it easy to check radio
+       range without needing to go to flight mode.
+      </listitem>
+      <listitem>
+       Fix a bug which caused the old received telemetry packets to
+       be retransmitted over the USB link when the radio was turned
+       off and back on.
+      </listitem>
+    </itemizedlist>
+  </para>
+  <para>
+    AltosUI Changes
+    <itemizedlist>
+      <listitem>
+       Fix a bug that caused GPS ready to happen too quickly. The
+       software was using every telemetry packet to signal new GPS
+       data, which caused GPS ready to be signalled after 10 packets
+       instead of 10 GPS updates.
+      </listitem>
+      <listitem>
+       Fix Google Earth data export to work with recent versions. The
+       google earth file loading code got a lot pickier, requiring
+       some minor white space changes in the export code.
+      </listitem>
+      <listitem>
+       Make the look-n-feel configurable, providing a choice from
+       the available options.
+      </listitem>
+      <listitem>
+       Add an 'Age' element to mark how long since a telemetry packet
+       has been received. Useful to quickly gauge whether
+       communications with the rocket are still active.
+      </listitem>
+      <listitem>
+       Add 'Configure Ground Station' dialog to set the radio
+       frequency used by a particular TeleDongle without having to go
+       through the flight monitor UI.
+      </listitem>
+      <listitem>
+       Add configuration for the new apogee-lockout value. A menu provides a list of
+       reasonable values, or the value can be set by hand.
+      </listitem>
+      <listitem>
+       Re-compute time spent in each state for the flight graph; this
+       figures out the actual boost and landing times instead of
+       using the conservative values provide by the flight
+       electronics. This improves the accuracy of the boost
+       acceleration and main descent rate computations.
+      </listitem>
+      <listitem>
+       Make AltosUI run on Mac OS Lion. The default Java heap space
+       was dramatically reduced for this release causing much of the
+       UI to fail randomly. This most often affected the satellite
+       mapping download and displays.
+      </listitem>
+      <listitem>
+       Change how data are displayed in the 'table' tab of the flight
+       monitoring window. This eliminates entries duplicated from the
+       header and adds both current altitude and pad altitude, which
+       are useful in 'Monitor Idle' mode.
+      </listitem>
+      <listitem>
+       Add Imperial units mode to present data in feet instead of
+       meters.
+      </listitem>
+    </itemizedlist>
+  </para>
+</article>