summaryrefslogtreecommitdiff
path: root/micropeak
diff options
context:
space:
mode:
Diffstat (limited to 'micropeak')
-rw-r--r--micropeak/Makefile.am4
-rw-r--r--micropeak/MicroData.java2
-rw-r--r--micropeak/MicroDownload.java2
-rw-r--r--micropeak/MicroExport.java2
-rw-r--r--micropeak/MicroFile.java2
-rw-r--r--micropeak/MicroFileChooser.java2
-rw-r--r--micropeak/MicroGraph.java2
-rw-r--r--micropeak/MicroPeak.java6
-rw-r--r--micropeak/MicroRaw.java2
-rw-r--r--micropeak/MicroSave.java2
-rw-r--r--micropeak/MicroStats.java2
-rw-r--r--micropeak/MicroStatsTable.java2
-rw-r--r--micropeak/micropeak.143
13 files changed, 61 insertions, 12 deletions
diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 098a00fb..33b1420a 100644
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -1,5 +1,7 @@
JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
+AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
+
+man_MANS=micropeak.1
altoslibdir=$(libdir)/altos
diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index 4c0ed4c3..07806fa4 100644
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
import java.lang.*;
import java.io.*;
import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
class MicroIterator implements Iterator<MicroDataPoint> {
diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index bd6795f8..a9095f9c 100644
--- a/micropeak/MicroDownload.java
+++ b/micropeak/MicroDownload.java
@@ -23,7 +23,7 @@ import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener {
diff --git a/micropeak/MicroExport.java b/micropeak/MicroExport.java
index 20a6f79a..5af767c6 100644
--- a/micropeak/MicroExport.java
+++ b/micropeak/MicroExport.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroExport extends JFileChooser {
diff --git a/micropeak/MicroFile.java b/micropeak/MicroFile.java
index cdd42e66..2b02e20a 100644
--- a/micropeak/MicroFile.java
+++ b/micropeak/MicroFile.java
@@ -19,7 +19,7 @@ package org.altusmetrum.micropeak;
import java.io.*;
import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroFile {
diff --git a/micropeak/MicroFileChooser.java b/micropeak/MicroFileChooser.java
index d52eab2c..3ca128ee 100644
--- a/micropeak/MicroFileChooser.java
+++ b/micropeak/MicroFileChooser.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroFileChooser extends JFileChooser {
diff --git a/micropeak/MicroGraph.java b/micropeak/MicroGraph.java
index 50508a61..fba62907 100644
--- a/micropeak/MicroGraph.java
+++ b/micropeak/MicroGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
import org.jfree.ui.*;
diff --git a/micropeak/MicroPeak.java b/micropeak/MicroPeak.java
index 79223176..27a8db02 100644
--- a/micropeak/MicroPeak.java
+++ b/micropeak/MicroPeak.java
@@ -23,7 +23,7 @@ import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroPeak extends MicroFrame implements ActionListener, ItemListener {
@@ -231,6 +231,10 @@ public class MicroPeak extends MicroFrame implements ActionListener, ItemListene
fileMenu.add(exitAction);
exitAction.addActionListener(this);
+ JButton downloadButton = new JButton ("Download");
+ downloadButton.addActionListener(this);
+ menuBar.add(downloadButton);
+
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {
@Override
diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index 7337a1de..0520fa71 100644
--- a/micropeak/MicroRaw.java
+++ b/micropeak/MicroRaw.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
import java.awt.*;
import java.io.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroRaw extends JTextArea {
diff --git a/micropeak/MicroSave.java b/micropeak/MicroSave.java
index 99f621ce..1f1ef3cb 100644
--- a/micropeak/MicroSave.java
+++ b/micropeak/MicroSave.java
@@ -24,7 +24,7 @@ import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroSave extends JFileChooser {
diff --git a/micropeak/MicroStats.java b/micropeak/MicroStats.java
index 99479cb4..32d94432 100644
--- a/micropeak/MicroStats.java
+++ b/micropeak/MicroStats.java
@@ -18,7 +18,7 @@
package org.altusmetrum.micropeak;
import java.io.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroStats {
diff --git a/micropeak/MicroStatsTable.java b/micropeak/MicroStatsTable.java
index 145bb70e..4400a317 100644
--- a/micropeak/MicroStatsTable.java
+++ b/micropeak/MicroStatsTable.java
@@ -19,7 +19,7 @@ package org.altusmetrum.micropeak;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class MicroStatsTable extends JComponent implements AltosFontListener {
diff --git a/micropeak/micropeak.1 b/micropeak/micropeak.1
new file mode 100644
index 00000000..ed2c77eb
--- /dev/null
+++ b/micropeak/micropeak.1
@@ -0,0 +1,43 @@
+.\"
+.\" Copyright © 2013 Keith Packard <keithp@keithp.com>
+.\"
+.\" This program is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+.\" General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with this program; if not, write to the Free Software Foundation, Inc.,
+.\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+.\"
+.\"
+.TH MICROPEAK 1 "micropeak" ""
+.SH NAME
+micropeak \- MicroPeak logging altimeter download and analysis
+.SH SYNOPSIS
+.B "micropeak"
+.SH DESCRIPTION
+.I micropeak
+connects to a MicroPeak USB adapter for MicroPeak data download.
+It provides a menu-oriented
+user interface to download and analyze data logged on a MicroPeak
+altimeter.
+.SH USAGE
+When connected to a MicroPeak USB adapter,
+.I micropeak
+can download data from a MicroPeak device, save it to a file and graph
+data from saved files.
+.P
+A number of other menu options exist, including the ability to export flight
+data in different formats.
+.SH FILES
+All data log files are recorded into a user-specified directory
+(default ~/AltusMetrum). Files are named using the current date and a
+unique flight number with a '.mpd' extension.
+.SH AUTHOR
+Keith Packard