Anthony Towns [Thu, 11 Nov 2010 16:08:58 +0000 (02:08 +1000)]
tabs -> spaces
Anthony Towns [Thu, 11 Nov 2010 16:07:41 +0000 (02:07 +1000)]
add site map tab, at least for QRS launches
Keith Packard [Thu, 11 Nov 2010 06:11:21 +0000 (22:11 -0800)]
Merge remote branch 'aj/buttonbox' into buttonbox
Anthony Towns [Thu, 11 Nov 2010 06:06:32 +0000 (16:06 +1000)]
add compass bearing during descent
Anthony Towns [Thu, 11 Nov 2010 05:57:52 +0000 (15:57 +1000)]
add compass bearing to voice output
Anthony Towns [Thu, 11 Nov 2010 05:52:01 +0000 (15:52 +1000)]
use grayled.png for off
Anthony Towns [Thu, 11 Nov 2010 05:45:43 +0000 (15:45 +1000)]
reduce font size for FlightInfoTable
Anthony Towns [Thu, 11 Nov 2010 05:43:05 +0000 (15:43 +1000)]
read preferences for --replay
Anthony Towns [Thu, 11 Nov 2010 05:40:37 +0000 (15:40 +1000)]
add --replay command line argument
Anthony Towns [Thu, 11 Nov 2010 05:38:27 +0000 (15:38 +1000)]
use value_font for values
Keith Packard [Thu, 11 Nov 2010 00:28:19 +0000 (16:28 -0800)]
altos: Use grey leds when unlit - easier to see
Keith Packard [Wed, 10 Nov 2010 07:34:32 +0000 (23:34 -0800)]
altosui: Add ascent, descent and landed tabs
This completes the set of tabs for in-flight status information.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 9 Nov 2010 22:40:58 +0000 (14:40 -0800)]
altosui: Add tab UI with 'pad' mode.
This creates a multi-tab interface for flight monitoring
and includes a special tab for 'pad' mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 9 Nov 2010 18:21:34 +0000 (10:21 -0800)]
altosui: Create abstract interface for flight data display
This allows the implementation of the flight data display to occur in
the flight UI instead of the display thread.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 9 Nov 2010 06:17:26 +0000 (22:17 -0800)]
altosui: Fix more calls to AltosPreferences.channel()
Oops. Two more.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 9 Nov 2010 06:10:46 +0000 (22:10 -0800)]
altosui: Fix channel setting at serial open time
Was using the previous non-device-specific preferences API.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 9 Nov 2010 06:07:04 +0000 (22:07 -0800)]
altosui: Create buttons for main actions
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sat, 6 Nov 2010 06:44:47 +0000 (23:44 -0700)]
altosui: Split out flight monitoring to separate window
This creates a per-TD (or replay) window to contain the flight
monitoring information, allowing multiple monitors.
This also adds per-TD preferences for monitoring channel.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Wed, 6 Oct 2010 23:42:27 +0000 (16:42 -0700)]
altosui: Separate out jfreechart and jcommon directories
This allows these packages to be referenced separately
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Wed, 6 Oct 2010 23:25:49 +0000 (16:25 -0700)]
altosui: Remove ability to graph data in .csv files
There's no reason to support these files when the raw .eeprom or
.telem files which generate them should be used instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Wed, 6 Oct 2010 23:14:35 +0000 (17:14 -0600)]
remove the csv build dep, as that code will be abandoned
Bdale Garbee [Wed, 6 Oct 2010 22:27:57 +0000 (16:27 -0600)]
update changelogs for Debian build
Bdale Garbee [Wed, 6 Oct 2010 22:26:33 +0000 (16:26 -0600)]
update changelogs for Debian build
Bdale Garbee [Wed, 6 Oct 2010 22:26:19 +0000 (16:26 -0600)]
update changelogs for Debian build
Bdale Garbee [Wed, 6 Oct 2010 22:25:22 +0000 (16:25 -0600)]
add build-dep on libcsv-java
Bdale Garbee [Wed, 6 Oct 2010 22:19:35 +0000 (16:19 -0600)]
update changelogs for Debian build
Bdale Garbee [Wed, 6 Oct 2010 22:18:45 +0000 (16:18 -0600)]
add build dep on jfreechart lib
Keith Packard [Wed, 29 Sep 2010 00:56:49 +0000 (17:56 -0700)]
altosui: Add KML file export.
Command line has switches now, --kml and --csv
Export save dialog has combo box to select kml or csv result.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 28 Sep 2010 05:28:07 +0000 (22:28 -0700)]
Merge remote branch 'aj/master'
Anthony Towns [Tue, 28 Sep 2010 05:27:07 +0000 (15:27 +1000)]
Add callsign/serial/flight to graph title
Keith Packard [Tue, 28 Sep 2010 05:26:56 +0000 (22:26 -0700)]
altosui: use Altos constants in graphing code
The Altos class nicely defines constants for all of the flight states.
Signed-off-by: Keith Packard <keithp@keithp.com>
Anthony Towns [Tue, 28 Sep 2010 04:45:01 +0000 (14:45 +1000)]
Hax0r graphing to support telem/eeprom files
Anthony Towns [Tue, 28 Sep 2010 02:55:47 +0000 (12:55 +1000)]
Merge branch 'master' of git://git.gag.com/fw/altos
Keith Packard [Tue, 28 Sep 2010 01:52:30 +0000 (18:52 -0700)]
altosui: Deal with eeprom dates going backwards across wrap
eeprom timestamps can go backwards as the GPS time stamps are
recorded when the first GPS character is received, but not placed into
the eeprom log until the last GPS packet is complete. If this happens
at the same time the tick count is wrapping, then the tick count will
wrap backwards across the 0 boundary causing time to jump forwards.
Fix this by letting time go backwards across the tick boundary, which
requires that we know when the first 'real' tick is read from the
eeprom file.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 28 Sep 2010 01:51:05 +0000 (18:51 -0700)]
altosui: .CSV output: add link quality, gps hdop and sat C/N0 numbers
This makes the CSV files contain all of the available information.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Tue, 28 Sep 2010 00:11:48 +0000 (17:11 -0700)]
altosui: Create iterables for log file scanning. Split out display threads
Convert from log file reading paradigm to using iterators which is
more idiomatic for java. Split more code out of AltosUI.java,
including the display update threads for telemetry monitoring and
logfile replay.x
Signed-off-by: Keith Packard <keithp@keithp.com>
Anthony Towns [Fri, 24 Sep 2010 00:28:06 +0000 (10:28 +1000)]
Merge branch 'master' of git://git.gag.com/fw/altos
Keith Packard [Thu, 23 Sep 2010 23:52:51 +0000 (16:52 -0700)]
altosui: Require 4 sats for 'good' GPS data
Wait for 10 consecutive GPS reports with at least 4 sats before
reporting "GPS ready" state.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 20 Sep 2010 13:30:49 +0000 (06:30 -0700)]
altosui: remove unused ReplayThread wrapper classes
These aren't used now that the replay opener dialog knows how to build
a reader from a filename.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 30 Aug 2010 21:00:04 +0000 (14:00 -0700)]
altosui: Factor some UI elements into separate classes
Clean up AltosUI by moving the two main tables to separate class files.
Signed-off-by: Keith Packard <keithp@keithp.com>
Anthony Towns [Mon, 20 Sep 2010 12:05:26 +0000 (22:05 +1000)]
Merge branch 'master' of git://git.gag.com/fw/altos
Keith Packard [Sun, 19 Sep 2010 09:52:29 +0000 (02:52 -0700)]
altosui: Write raw sensor data to .csv files
For data export, provide the raw sensor samples instead of the
filtered values.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 19 Sep 2010 09:50:43 +0000 (02:50 -0700)]
altosui: Use recorded ground acceleration when reading eeprom files
The flight software records 1000 accelerometer samples and records
that in the flight log. Use that value instead of using the very few
samples recorded in the eeprom before boost is detected. This
generates far more accurate accerometer data in the .csv files.
Signed-off-by: Keith Packard <keithp@keithp.com>
Anthony Towns [Tue, 14 Sep 2010 21:24:04 +0000 (07:24 +1000)]
Add JFreeChart to Makefile.am
Anthony Towns [Tue, 14 Sep 2010 20:51:05 +0000 (06:51 +1000)]
Add graphing.
Anthony Towns [Sat, 11 Sep 2010 05:15:14 +0000 (15:15 +1000)]
Merge branch 'master' of git://git.gag.com/fw/altos
Keith Packard [Sat, 11 Sep 2010 04:07:14 +0000 (21:07 -0700)]
altosui: Remember directory containing firmware files
Instead of forcing the user to navigate to the firmware directory each
time, this remembers the previous directory and starts there.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sat, 11 Sep 2010 03:55:05 +0000 (20:55 -0700)]
altosui: set default .csv file name in file save dialog
This uses setSelectedFile to specify which output filename to make the
default in the save dialog.
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Fri, 10 Sep 2010 16:42:35 +0000 (10:42 -0600)]
make the column headers comma separated, too, so they align with the data
Anthony Towns [Fri, 10 Sep 2010 06:11:34 +0000 (16:11 +1000)]
Merge branch 'master' of git://git.gag.com/fw/altos
Bdale Garbee [Fri, 10 Sep 2010 06:09:25 +0000 (00:09 -0600)]
update changelogs for Debian build
Keith Packard [Fri, 10 Sep 2010 06:04:59 +0000 (23:04 -0700)]
altosui: Stop parsing eeprom file after hitting 'landed' state
Sometimes there are additional records found in the eeprom file; the
reader is mostly worried about not losing anything, so it reads as
much as it can. However, the last record written for any flight is the
'landed' record, so we can stop looking at the file after hitting that.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 10 Sep 2010 06:04:14 +0000 (23:04 -0700)]
altosui: Fill in time value of last Eeprom record read from file
The last record is handled separately, and was missing the code to
compute the time. Sigh.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 10 Sep 2010 05:55:47 +0000 (22:55 -0700)]
altosui: Remove debug printfs from AltosTelemetryReader
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Fri, 10 Sep 2010 05:57:34 +0000 (23:57 -0600)]
rewind packaging changelog, again
Bdale Garbee [Fri, 10 Sep 2010 05:52:20 +0000 (23:52 -0600)]
update changelogs for Debian build
Bdale Garbee [Fri, 10 Sep 2010 05:51:23 +0000 (23:51 -0600)]
rewind packaging changelog
Anthony Towns [Fri, 10 Sep 2010 05:50:01 +0000 (15:50 +1000)]
Merge branch 'master' of git://git.gag.com/fw/altos
Keith Packard [Fri, 10 Sep 2010 05:30:48 +0000 (22:30 -0700)]
altosui: Fix telemetry file reader to handle tick count wrapping
The telemetry reader was ignoring tick count wrapping, so you'd see
time go backwards in jumps. Not useful.
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Fri, 10 Sep 2010 04:50:03 +0000 (22:50 -0600)]
update changelogs for Debian build
Keith Packard [Fri, 10 Sep 2010 04:28:10 +0000 (21:28 -0700)]
Add --with-fat-dir configure option to publish finished stand-alone bits
--with-fat-dir specifies a directory to copy the finished
linux/macosx/windows stand-alone ("fat") packages to. A sub-directory
will be created under the specified directory based on the product
version number and the files copied there.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 10 Sep 2010 03:59:29 +0000 (20:59 -0700)]
altosui: libaltos.so is built with libtool -- it's in ../libaltos/.libs
It used to be in ../libaltos
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 10 Sep 2010 03:39:41 +0000 (20:39 -0700)]
altosui: Remove some debug printfs.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 10 Sep 2010 03:36:12 +0000 (20:36 -0700)]
Add firmware and libaltos to 'fat' target at top-level
This ensures that all of the necessary bits are available to construct
the distribution images.
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Fri, 10 Sep 2010 03:29:20 +0000 (21:29 -0600)]
update changelogs for Debian build
Keith Packard [Fri, 10 Sep 2010 03:24:42 +0000 (20:24 -0700)]
altosui: conflating USB product and vendor IDs is a bad idea
We've now got a USB vendor ID called 'altusmetrum' for generic
altusmetrum devices (old USB ID 0x000A) while the general vendor name
for all devices is 'altusmetrum' as well.
This patch splits vendors and products into separate name spaces,
products are prefixed with product_ and vendor with (oddly) vendor_.
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Fri, 10 Sep 2010 02:34:43 +0000 (20:34 -0600)]
update changelogs for Debian build
Bdale Garbee [Fri, 10 Sep 2010 02:34:22 +0000 (20:34 -0600)]
initial cut at an altosui man page
Bdale Garbee [Fri, 10 Sep 2010 02:06:09 +0000 (20:06 -0600)]
update changelogs for Debian build
Bdale Garbee [Fri, 10 Sep 2010 02:05:27 +0000 (20:05 -0600)]
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Keith Packard [Fri, 10 Sep 2010 00:54:41 +0000 (17:54 -0700)]
altosui: Display error dialog when AltOS JNI library can't be loaded
Having an error dialog appear at application startup seems better than
simply failing to present the device dialog later on.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 10 Sep 2010 00:52:46 +0000 (17:52 -0700)]
altosui: Store libaltos.so in $(libdir)/altos
It's not a public library, so hide it away in a subdirectory.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 10 Sep 2010 00:49:37 +0000 (17:49 -0700)]
altosui: Need to have JVM include path substituted into libaltos Makefile
The libaltos Makefile needs to find the relevant jni.h file, which is
found in the JVM_INCLUDE path, all nicely located by the configure.ac script.
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Thu, 9 Sep 2010 23:27:07 +0000 (17:27 -0600)]
handle versioning of ihx files (poorly) by just wildcarding the file name,
which assumes there's only one matching .. probably ok on Debian?
Bdale Garbee [Thu, 9 Sep 2010 22:27:40 +0000 (16:27 -0600)]
update changelogs for Debian build
Keith Packard [Thu, 9 Sep 2010 22:25:18 +0000 (15:25 -0700)]
altosui: remove FATJAR from all-local to avoid building fat .jar file
the fat .jar file is used in non-native builds to run from a directory
containing all of the freetts jar files along with the altosui jar
file. We don't want this on a real install where freetts is installed separately.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Thu, 9 Sep 2010 22:22:14 +0000 (15:22 -0700)]
altosui: hack to make JAVAROOT directory get created before javac runs
This ensures that the JAVAROOT directory gets created by adding it to
the variable used to set the CLASSPATH environment value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Thu, 9 Sep 2010 22:11:41 +0000 (15:11 -0700)]
altosui: fix telemetrum.inf FFFE:000A product names on AMD64 and ia64
This appears to matter to Vista. Dunno why.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Thu, 9 Sep 2010 22:10:25 +0000 (15:10 -0700)]
altosui: Add explicit requirement to create classes directory
The implicit ordering doesn't appear reliable.
Signed-off-by: Keith Packard <keithp@keithp.com>
Bdale Garbee [Thu, 9 Sep 2010 21:51:50 +0000 (15:51 -0600)]
update changelogs for Debian build
Bdale Garbee [Thu, 9 Sep 2010 21:51:02 +0000 (15:51 -0600)]
add libtool to build deps
Bdale Garbee [Thu, 9 Sep 2010 21:43:47 +0000 (15:43 -0600)]
update changelogs for Debian build
Anthony Towns [Sun, 5 Sep 2010 10:49:34 +0000 (20:49 +1000)]
Merge branch 'master' of git://git.gag.com/fw/altos
Keith Packard [Sun, 5 Sep 2010 09:05:06 +0000 (02:05 -0700)]
altosui: ensure that 'altosui' script is installed. Pass arguments along.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:55:56 +0000 (01:55 -0700)]
altosui: eeprom files place 'boost' time in the flight number record.
Instead of looking for the first state change record, use the Flight
record to get the boost tick.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:52:36 +0000 (01:52 -0700)]
altosui: Record flight number when scanning file, not when running
The very first record in the eeprom is the flight number, but it is
time-stamped with the 'boost' time, and so it gets sorted until much
later, delaying the return of data until the rocket enters boost
mode. This drops all of the nice pad GPS and state date on the floor.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:23:53 +0000 (01:23 -0700)]
altosui: Use local .class files in the classpath
This ensures that compiling only a few changed files will
locate the old .class files instead of using a stale .jar file.
Keith Packard [Sun, 5 Sep 2010 08:21:14 +0000 (01:21 -0700)]
altosui: Prevent voice altitude data from queueing up
When flight status changes rapidly, the queue of voice data can get
quite long. This change does two things -- first, it remembers when
the altitude reporting happens due to flight events and delays the
periodic reporting until a suitable time after that, second it ensures
that the voice data has all been delivered before generating a new
altitude report.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:19:11 +0000 (01:19 -0700)]
altosui: Add AltosVoice.drain() to wait for queued speech to finish
drain() blocks until all pending phrases have been processed, allowing
the UI code to avoid pending data that will end up stale by the time
it is emitted.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:13:01 +0000 (01:13 -0700)]
altosui: Start idle thread after the rocket leaves the pad
This makes the first altitude report time consistently 10 seconds
after launch, instead of some random time depending on when the rocket
launched relative to the time the device connection was made.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:08:50 +0000 (01:08 -0700)]
altosui: When replay thread is interrupted, don't make final report
Normally, the replay process makes one final report after the file has
been parsed. However, if the reading process is interrupted to display
something else, this report is just annoying, so don't make it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:03:18 +0000 (01:03 -0700)]
altosui: Add elevation and range data to main display
Reported by voice, it's useful to see these on the display as well.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 08:01:10 +0000 (01:01 -0700)]
altosui: Eeprom files contain only one date; save it.
While reading eeprom files, the GPS record is reconstructed each time
the system sees the first GPS log item (the time field), but as the
date isn't repeated, we need to copy it from the old GPS data record.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 07:59:54 +0000 (00:59 -0700)]
altosui: Remove debugging printf from AltosEepromReader
These were in place while validing the GPS data reconstruction code
that handles eeprom files missing the first GPS date line due to the
record overwriting bug in old firmware versions.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 07:57:38 +0000 (00:57 -0700)]
altosui: Return AO_LOG_INVALID instead of exception for eeprom files
When an eeprom file contains an invalid line, just return
AO_LOG_INVALID instead of throwing an exception. This allows us to
replay and parse files with extraneous serial communication.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 01:49:22 +0000 (18:49 -0700)]
altosui: Fix linux fat distribution
Again, use 'cp -p' instead of 'cp -a' to get files into the archive
instead of links. Also, make the shell script 'altosui' instead of
'altosui-fat'.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 01:39:58 +0000 (18:39 -0700)]
altosui: Fix up Mac OSX .zip file
Must contain 'altosui.jar' instead of altosui-fat.jar.
Also, was using 'cp -a' instead of 'cp -p' which made files
represented by symlinks not end up in the archive.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 01:20:45 +0000 (18:20 -0700)]
altosui: Fix windows installer to ship correct files
Was shipping altosui.jar instead of altosui-fat.jar
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 01:04:04 +0000 (18:04 -0700)]
Add top-level 'fat' target to aid building distribution files
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 5 Sep 2010 00:59:11 +0000 (17:59 -0700)]
Add version numbers to released files. Set version to 0.7.1
Instead of using git revision counts for version numbers, use explicit
versions numbers configured in the configure.ac file. Expose published
files with version numbers.
Signed-off-by: Keith Packard <keithp@keithp.com>