From: Tom Marble Date: Wed, 12 Sep 2012 03:50:18 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos X-Git-Tag: 1.1~5^2~2 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=4563624638884b7b2f16cd4d396c00690e045999;hp=11fbcf5e30e0cd09f2d6b448911d2ef62b7f29c7 Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos --- diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java index 4e2daf5a..af63ed17 100644 --- a/altoslib/AltosSpeed.java +++ b/altoslib/AltosSpeed.java @@ -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"; } diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 527a7d28..edde1307 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -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)); } }; diff --git a/doc/Makefile b/doc/Makefile index 6c77f0ee..fbe8bc11 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -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) diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl index ad08aecc..8339ca43 100644 --- a/doc/altusmetrum.xsl +++ b/doc/altusmetrum.xsl @@ -2482,6 +2482,7 @@ NAR #88757, TRA #12200 Release Notes + diff --git a/doc/release-notes-1.1.xsl b/doc/release-notes-1.1.xsl new file mode 100644 index 00000000..79ea39ee --- /dev/null +++ b/doc/release-notes-1.1.xsl @@ -0,0 +1,94 @@ + + + +
+ + Version 1.1 is a minor release. It provides a few new features in AltosUI + and the AltOS firmware and fixes bugs. + + + AltOS Firmware Changes + + + Add apogee-lockout value. Overrides the apogee detection logic to + prevent incorrect apogee charge firing. + + + Fix a bug where the data reported in telemetry packets was + from 320ms ago. + + + 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. + + + Provide RSSI values for Monitor Idle mode. This makes it easy to check radio + range without needing to go to flight mode. + + + 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. + + + + + AltosUI Changes + + + 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. + + + 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. + + + Make the look-n-feel configurable, providing a choice from + the available options. + + + 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. + + + Add 'Configure Ground Station' dialog to set the radio + frequency used by a particular TeleDongle without having to go + through the flight monitor UI. + + + Add configuration for the new apogee-lockout value. A menu provides a list of + reasonable values, or the value can be set by hand. + + + 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. + + + 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. + + + 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. + + + Add Imperial units mode to present data in feet instead of + meters. + + + +