Merge branch 'master' of git://git.gag.com/fw/altos
[fw/altos] / ao-tools / altosui / AltosUI.java
index 4994f093dcbfed6eb80e7c9534a2715fea65843a..e130de58d703470f61845d3852ccc9b89389370b 100644 (file)
@@ -28,115 +28,35 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import altosui.Altos;
 import altosui.AltosSerial;
 import altosui.AltosSerialMonitor;
+import altosui.AltosRecord;
 import altosui.AltosTelemetry;
 import altosui.AltosState;
 import altosui.AltosDeviceDialog;
 import altosui.AltosPreferences;
 import altosui.AltosLog;
 import altosui.AltosVoice;
+import altosui.AltosFlightInfoTableModel;
+import altosui.AltosChannelMenu;
+import altosui.AltosFlashUI;
+import altosui.AltosLogfileChooser;
+import altosui.AltosCSVUI;
+import altosui.AltosLine;
+import altosui.AltosStatusTable;
+import altosui.AltosInfoTable;
 
 import libaltosJNI.*;
 
-class AltosFlightStatusTableModel extends AbstractTableModel {
-       private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
-       private Object[] data = { 0, "idle", 0, 0 };
-
-       public int getColumnCount() { return columnNames.length; }
-       public int getRowCount() { return 2; }
-       public Object getValueAt(int row, int col) {
-               if (row == 0)
-                       return columnNames[col];
-               return data[col];
-       }
-
-       public void setValueAt(Object value, int col) {
-               data[col] = value;
-               fireTableCellUpdated(1, col);
-       }
-
-       public void setValueAt(Object value, int row, int col) {
-               setValueAt(value, col);
-       }
-
-       public void set(AltosState state) {
-               setValueAt(String.format("%1.0f", state.height), 0);
-               setValueAt(state.data.state, 1);
-               setValueAt(state.data.rssi, 2);
-               double speed = state.baro_speed;
-               if (state.ascent)
-                       speed = state.speed;
-               setValueAt(String.format("%1.0f", speed), 3);
-       }
-}
-
-class AltosFlightInfoTableModel extends AbstractTableModel {
-       private String[] columnNames = {"Field", "Value"};
-
-       class InfoLine {
-               String  name;
-               String  value;
-
-               public InfoLine(String n, String v) {
-                       name = n;
-                       value = v;
-               }
-       }
-
-       private ArrayList<InfoLine> rows = new ArrayList<InfoLine>();
-
-       public int getColumnCount() { return columnNames.length; }
-       public String getColumnName(int col) { return columnNames[col]; }
-
-       public int getRowCount() { return 20; }
-
-       public Object getValueAt(int row, int col) {
-               if (row >= rows.size())
-                       return "";
-               if (col == 0)
-                       return rows.get(row).name;
-               else
-                       return rows.get(row).value;
-       }
-
-       int     current_row = 0;
-       int     prev_num_rows = 0;
-
-       public void resetRow() {
-               current_row = 0;
-       }
-       public void addRow(String name, String value) {
-               if (current_row >= rows.size())
-                       rows.add(current_row, new InfoLine(name, value));
-               else
-                       rows.set(current_row, new InfoLine(name, value));
-               current_row++;
-       }
-       public void finish() {
-               if (current_row > prev_num_rows) {
-                       fireTableRowsInserted(prev_num_rows, current_row - 1);
-                       prev_num_rows = current_row;
-               }
-               fireTableDataChanged();
-       }
-}
-
 public class AltosUI extends JFrame {
        private int channel = -1;
 
-       private AltosFlightStatusTableModel flightStatusModel;
-       private JTable flightStatus;
-
-       static final int info_columns = 3;
-
-       private AltosFlightInfoTableModel[] flightInfoModel;
-       private JTable[] flightInfo;
+       private AltosStatusTable flightStatus;
+       private AltosInfoTable flightInfo;
        private AltosSerial serial_line;
        private AltosLog altos_log;
-       private Box[] ibox;
        private Box vbox;
-       private Box hbox;
 
        private Font statusFont = new Font("SansSerif", Font.BOLD, 24);
        private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
@@ -144,54 +64,40 @@ public class AltosUI extends JFrame {
 
        public AltosVoice voice = new AltosVoice();
 
+       public static boolean load_library(Frame frame) {
+               if (!AltosDevice.load_library()) {
+                       JOptionPane.showMessageDialog(frame,
+                                                     String.format("No AltOS library in \"%s\"",
+                                                                   System.getProperty("java.library.path","<undefined>")),
+                                                     "Cannot load device access library",
+                                                     JOptionPane.ERROR_MESSAGE);
+                       return false;
+               }
+               return true;
+       }
+
        public AltosUI() {
 
+               load_library(null);
+
                String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
                Object[][] statusData = { { "0", "pad", "-50", "0" } };
 
+               java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
+               if (imgURL != null)
+                       setIconImage(new ImageIcon(imgURL).getImage());
+
                AltosPreferences.init(this);
 
                vbox = Box.createVerticalBox();
                this.add(vbox);
 
-               flightStatusModel = new AltosFlightStatusTableModel();
-               flightStatus = new JTable(flightStatusModel);
-               flightStatus.setFont(statusFont);
-               TableColumnModel tcm = flightStatus.getColumnModel();
-               for (int i = 0; i < flightStatusModel.getColumnCount(); i++) {
-                       DefaultTableCellRenderer       r = new DefaultTableCellRenderer();
-                       r.setFont(statusFont);
-                       r.setHorizontalAlignment(SwingConstants.CENTER);
-                       tcm.getColumn(i).setCellRenderer(r);
-               }
-
-               FontMetrics     statusMetrics = flightStatus.getFontMetrics(statusFont);
-               int statusHeight = (statusMetrics.getHeight() + statusMetrics.getLeading()) * 15 / 10;
-               flightStatus.setRowHeight(statusHeight);
-               flightStatus.setShowGrid(false);
+               flightStatus = new AltosStatusTable(this);
 
                vbox.add(flightStatus);
 
-               hbox = Box.createHorizontalBox();
-               vbox.add(hbox);
-
-               flightInfo = new JTable[3];
-               flightInfoModel = new AltosFlightInfoTableModel[3];
-               ibox = new Box[3];
-               FontMetrics     infoValueMetrics = flightStatus.getFontMetrics(infoValueFont);
-               int infoHeight = (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 20 / 10;
-
-               for (int i = 0; i < info_columns; i++) {
-                       ibox[i] = Box.createVerticalBox();
-                       flightInfoModel[i] = new AltosFlightInfoTableModel();
-                       flightInfo[i] = new JTable(flightInfoModel[i]);
-                       flightInfo[i].setFont(infoValueFont);
-                       flightInfo[i].setRowHeight(infoHeight);
-                       flightInfo[i].setShowGrid(true);
-                       ibox[i].add(flightInfo[i].getTableHeader());
-                       ibox[i].add(flightInfo[i]);
-                       hbox.add(ibox[i]);
-               }
+               flightInfo = new AltosInfoTable();
+               vbox.add(flightInfo.box());
 
                setTitle("AltOS");
 
@@ -200,8 +106,8 @@ public class AltosUI extends JFrame {
                serial_line = new AltosSerial();
                altos_log = new AltosLog(serial_line);
                int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-               this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 20,
-                                           statusHeight * 4 + infoHeight * 17));
+               this.setSize(new Dimension (flightInfo.width(),
+                                           flightStatus.height() + flightInfo.height()));
                this.validate();
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
                addWindowListener(new WindowAdapter() {
@@ -213,138 +119,27 @@ public class AltosUI extends JFrame {
                voice.speak("Rocket flight monitor ready.");
        }
 
-       public void info_reset() {
-               for (int i = 0; i < info_columns; i++)
-                       flightInfoModel[i].resetRow();
-       }
-
-       public void info_add_row(int col, String name, String value) {
-               flightInfoModel[col].addRow(name, value);
-       }
-
-       public void info_add_row(int col, String name, String format, Object... parameters) {
-               flightInfoModel[col].addRow(name, String.format(format, parameters));
-       }
-
-       public void info_add_deg(int col, String name, double v, int pos, int neg) {
-               int     c = pos;
-               if (v < 0) {
-                       c = neg;
-                       v = -v;
+       void show(AltosState state, int crc_errors) {
+               if (state != null) {
+                       flightStatus.set(state);
+                       flightInfo.show(state, crc_errors);
                }
-               double  deg = Math.floor(v);
-               double  min = (v - deg) * 60;
-
-               flightInfoModel[col].addRow(name, String.format("%3.0f°%08.5f'", deg, min));
-       }
-
-       public void info_finish() {
-               for (int i = 0; i < info_columns; i++)
-                       flightInfoModel[i].finish();
-       }
-
-       public void show(AltosState state) {
-               flightStatusModel.set(state);
-
-               info_reset();
-               if (state.gps_ready)
-                       info_add_row(0, "Ground state", "%s", "ready");
-               else
-                       info_add_row(0, "Ground state", "wait (%d)",
-                                    state.gps_waiting);
-               info_add_row(0, "Rocket state", "%s", state.data.state);
-               info_add_row(0, "Callsign", "%s", state.data.callsign);
-               info_add_row(0, "Rocket serial", "%6d", state.data.serial);
-               info_add_row(0, "Rocket flight", "%6d", state.data.flight);
-
-               info_add_row(0, "RSSI", "%6d    dBm", state.data.rssi);
-               info_add_row(0, "Height", "%6.0f    m", state.height);
-               info_add_row(0, "Max height", "%6.0f    m", state.max_height);
-               info_add_row(0, "Acceleration", "%8.1f  m/s²", state.acceleration);
-               info_add_row(0, "Max acceleration", "%8.1f  m/s²", state.max_acceleration);
-               info_add_row(0, "Speed", "%8.1f  m/s", state.ascent ? state.speed : state.baro_speed);
-               info_add_row(0, "Max Speed", "%8.1f  m/s", state.max_speed);
-               info_add_row(0, "Temperature", "%9.2f °C", state.temperature);
-               info_add_row(0, "Battery", "%9.2f V", state.battery);
-               info_add_row(0, "Drogue", "%9.2f V", state.drogue_sense);
-               info_add_row(0, "Main", "%9.2f V", state.main_sense);
-               info_add_row(0, "Pad altitude", "%6.0f    m", state.ground_altitude);
-               if (state.gps == null) {
-                       info_add_row(1, "GPS", "not available");
-               } else {
-                       if (state.data.gps.gps_locked)
-                               info_add_row(1, "GPS", "   locked");
-                       else if (state.data.gps.gps_connected)
-                               info_add_row(1, "GPS", " unlocked");
-                       else
-                               info_add_row(1, "GPS", "  missing");
-                       info_add_row(1, "Satellites", "%6d", state.data.gps.nsat);
-                       info_add_deg(1, "Latitude", state.gps.lat, 'N', 'S');
-                       info_add_deg(1, "Longitude", state.gps.lon, 'E', 'W');
-                       info_add_row(1, "GPS altitude", "%6d", state.gps.alt);
-                       info_add_row(1, "GPS height", "%6.0f", state.gps_height);
-
-                       /* The SkyTraq GPS doesn't report these values */
-                       if (false) {
-                               info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
-                                            state.gps.ground_speed,
-                                            state.gps.course);
-                               info_add_row(1, "GPS climb rate", "%8.1f m/s",
-                                            state.gps.climb_rate);
-                               info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
-                                            state.gps.h_error, state.gps.v_error);
-                       }
-                       info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
-
-                       if (state.npad > 0) {
-                               if (state.from_pad != null) {
-                                       info_add_row(1, "Distance from pad", "%6.0f m", state.from_pad.distance);
-                                       info_add_row(1, "Direction from pad", "%6.0f°", state.from_pad.bearing);
-                               } else {
-                                       info_add_row(1, "Distance from pad", "unknown");
-                                       info_add_row(1, "Direction from pad", "unknown");
-                               }
-                               info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
-                               info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
-                               info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
-                       }
-                       info_add_row(1, "GPS date", "%04d-%02d-%02d",
-                                      state.gps.gps_time.year,
-                                      state.gps.gps_time.month,
-                                      state.gps.gps_time.day);
-                       info_add_row(1, "GPS time", "  %02d:%02d:%02d",
-                                      state.gps.gps_time.hour,
-                                      state.gps.gps_time.minute,
-                                      state.gps.gps_time.second);
-                       int     nsat_vis = 0;
-                       int     c;
-
-                       if (state.gps.cc_gps_sat == null)
-                               info_add_row(2, "Satellites Visible", "%4d", 0);
-                       else {
-                               info_add_row(2, "Satellites Visible", "%4d", state.gps.cc_gps_sat.length);
-                               for (c = 0; c < state.gps.cc_gps_sat.length; c++) {
-                                       info_add_row(2, "Satellite id,C/N0",
-                                                    "%4d, %4d",
-                                                    state.gps.cc_gps_sat[c].svid,
-                                                    state.gps.cc_gps_sat[c].c_n0);
-                               }
-                       }
-               }
-               info_finish();
        }
 
        class IdleThread extends Thread {
 
+               boolean started;
                private AltosState state;
                int     reported_landing;
+               int     report_interval;
+               long    report_time;
 
-               public void report(boolean last) {
+               public synchronized void report(boolean last) {
                        if (state == null)
                                return;
 
                        /* reset the landing count once we hear about a new flight */
-                       if (state.state < AltosTelemetry.ao_flight_drogue)
+                       if (state.state < Altos.ao_flight_drogue)
                                reported_landing = 0;
 
                        /* Shut up once the rocket is on the ground */
@@ -353,7 +148,16 @@ public class AltosUI extends JFrame {
                        }
 
                        /* If the rocket isn't on the pad, then report height */
-                       if (state.state > AltosTelemetry.ao_flight_pad) {
+                       if (Altos.ao_flight_drogue <= state.state &&
+                           state.state < Altos.ao_flight_landed &&
+                           state.range >= 0)
+                       {
+                               voice.speak("Height %d, bearing %d, elevation %d, range %d.\n",
+                                           (int) (state.height + 0.5),
+                                           (int) (state.from_pad.bearing + 0.5),
+                                           (int) (state.elevation + 0.5),
+                                           (int) (state.range + 0.5));
+                       } else if (state.state > Altos.ao_flight_pad) {
                                voice.speak("%d meters", (int) (state.height + 0.5));
                        } else {
                                reported_landing = 0;
@@ -363,101 +167,164 @@ public class AltosUI extends JFrame {
                         * either we've got a landed report or we haven't heard from it in
                         * a long time
                         */
-                       if (!state.ascent &&
+                       if (state.state >= Altos.ao_flight_drogue &&
                            (last ||
                             System.currentTimeMillis() - state.report_time >= 15000 ||
-                            state.state == AltosTelemetry.ao_flight_landed))
+                            state.state == Altos.ao_flight_landed))
                        {
                                if (Math.abs(state.baro_speed) < 20 && state.height < 100)
                                        voice.speak("rocket landed safely");
                                else
                                        voice.speak("rocket may have crashed");
                                if (state.from_pad != null)
-                                       voice.speak("bearing %d degrees, range %d meters",
+                                       voice.speak("Bearing %d degrees, range %d meters.",
                                                    (int) (state.from_pad.bearing + 0.5),
                                                    (int) (state.from_pad.distance + 0.5));
                                ++reported_landing;
                        }
                }
 
+               long now () {
+                       return System.currentTimeMillis();
+               }
+
+               void set_report_time() {
+                       report_time = now() + report_interval;
+               }
+
                public void run () {
 
                        reported_landing = 0;
                        state = null;
+                       report_interval = 10000;
                        try {
                                for (;;) {
-                                       Thread.sleep(10000);
+                                       set_report_time();
+                                       for (;;) {
+                                               voice.drain();
+                                               synchronized (this) {
+                                                       long    sleep_time = report_time - now();
+                                                       if (sleep_time <= 0)
+                                                               break;
+                                                       wait(sleep_time);
+                                               }
+                                       }
                                        report(false);
                                }
                        } catch (InterruptedException ie) {
+                               try {
+                                       voice.drain();
+                               } catch (InterruptedException iie) { }
                        }
                }
 
-               public void notice(AltosState new_state) {
+               public synchronized void notice(AltosState new_state, boolean spoken) {
+                       AltosState old_state = state;
                        state = new_state;
+                       if (!started && state.state > Altos.ao_flight_pad) {
+                               started = true;
+                               start();
+                       }
+
+                       if (state.state < Altos.ao_flight_drogue)
+                               report_interval = 10000;
+                       else
+                               report_interval = 20000;
+                       if (old_state != null && old_state.state != state.state) {
+                               report_time = now();
+                               this.notify();
+                       } else if (spoken)
+                               set_report_time();
                }
        }
 
-       private void tell(AltosState state, AltosState old_state) {
+       private boolean tell(AltosState state, AltosState old_state) {
+               boolean ret = false;
                if (old_state == null || old_state.state != state.state) {
-                       voice.speak(state.data.state);
-                       if ((old_state == null || old_state.state <= AltosTelemetry.ao_flight_boost) &&
-                           state.state > AltosTelemetry.ao_flight_boost) {
+                       voice.speak(state.data.state());
+                       if ((old_state == null || old_state.state <= Altos.ao_flight_boost) &&
+                           state.state > Altos.ao_flight_boost) {
                                voice.speak("max speed: %d meters per second.",
                                            (int) (state.max_speed + 0.5));
-                       } else if ((old_state == null || old_state.state < AltosTelemetry.ao_flight_drogue) &&
-                                  state.state >= AltosTelemetry.ao_flight_drogue) {
+                               ret = true;
+                       } else if ((old_state == null || old_state.state < Altos.ao_flight_drogue) &&
+                                  state.state >= Altos.ao_flight_drogue) {
                                voice.speak("max height: %d meters.",
                                            (int) (state.max_height + 0.5));
+                               ret = true;
                        }
                }
                if (old_state == null || old_state.gps_ready != state.gps_ready) {
-                       if (state.gps_ready)
+                       if (state.gps_ready) {
                                voice.speak("GPS ready");
-                       else if (old_state != null)
+                               ret = true;
+                       }
+                       else if (old_state != null) {
                                voice.speak("GPS lost");
+                               ret = true;
+                       }
                }
                old_state = state;
+               return ret;
        }
 
        class DisplayThread extends Thread {
                IdleThread      idle_thread;
 
-               String read() throws InterruptedException { return null; }
+               String          name;
+
+               int             crc_errors;
 
-               void close() { }
+               void init() { }
+
+               AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException { return null; }
+
+               void close(boolean interrupted) { }
 
                void update(AltosState state) throws InterruptedException { }
 
                public void run() {
+                       boolean         interrupted = false;
                        String          line;
                        AltosState      state = null;
                        AltosState      old_state = null;
+                       boolean         told;
 
                        idle_thread = new IdleThread();
 
-                       info_reset();
-                       info_finish();
-                       idle_thread.start();
+                       flightInfo.clear();
                        try {
-                               while ((line = read()) != null) {
+                               for (;;) {
                                        try {
-                                               AltosTelemetry  t = new AltosTelemetry(line);
+                                               AltosRecord record = read();
+                                               if (record == null)
+                                                       break;
                                                old_state = state;
-                                               state = new AltosState(t, state);
+                                               state = new AltosState(record, state);
                                                update(state);
-                                               show(state);
-                                               tell(state, old_state);
-                                               idle_thread.notice(state);
+                                               show(state, crc_errors);
+                                               told = tell(state, old_state);
+                                               idle_thread.notice(state, told);
                                        } catch (ParseException pp) {
-                                               System.out.printf("Parse error on %s\n", line);
-                                               System.out.println("exception " + pp);
+                                               System.out.printf("Parse error: %d \"%s\"\n", pp.getErrorOffset(), pp.getMessage());
+                                       } catch (AltosCRCException ce) {
+                                               ++crc_errors;
+                                               show(state, crc_errors);
                                        }
                                }
                        } catch (InterruptedException ee) {
+                               interrupted = true;
+                       } catch (IOException ie) {
+                               JOptionPane.showMessageDialog(AltosUI.this,
+                                                             String.format("Error reading from \"%s\"", name),
+                                                             "Telemetry Read Error",
+                                                             JOptionPane.ERROR_MESSAGE);
                        } finally {
-                               close();
+                               close(interrupted);
                                idle_thread.interrupt();
+                               try {
+                                       idle_thread.join();
+                               } catch (InterruptedException ie) {}
                        }
                }
 
@@ -469,32 +336,39 @@ public class AltosUI extends JFrame {
 
        class DeviceThread extends DisplayThread {
                AltosSerial     serial;
-               LinkedBlockingQueue<String> telem;
+               LinkedBlockingQueue<AltosLine> telem;
 
-               String read() throws InterruptedException {
-                       return telem.take();
+               AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException {
+                       AltosLine l = telem.take();
+                       if (l.line == null)
+                               throw new IOException("IO error");
+                       return new AltosTelemetry(l.line);
                }
 
-               void close() {
+               void close(boolean interrupted) {
                        serial.close();
                        serial.remove_monitor(telem);
                }
 
-               public DeviceThread(AltosSerial s) {
+               public DeviceThread(AltosSerial s, String in_name) {
                        serial = s;
-                       telem = new LinkedBlockingQueue<String>();
+                       telem = new LinkedBlockingQueue<AltosLine>();
                        serial.add_monitor(telem);
+                       name = in_name;
                }
        }
 
        private void ConnectToDevice() {
-               altos_device    device = AltosDeviceDialog.show(AltosUI.this, "TeleDongle");
+               AltosDevice     device = AltosDeviceDialog.show(AltosUI.this,
+                                                               AltosDevice.product_basestation);
 
                if (device != null) {
                        try {
+                               stop_display();
                                serial_line.open(device);
-                               DeviceThread thread = new DeviceThread(serial_line);
+                               DeviceThread thread = new DeviceThread(serial_line, device.getPath());
                                serial_line.set_channel(AltosPreferences.channel());
+                               serial_line.set_callsign(AltosPreferences.callsign());
                                run_display(thread);
                        } catch (FileNotFoundException ee) {
                                JOptionPane.showMessageDialog(AltosUI.this,
@@ -515,19 +389,24 @@ public class AltosUI extends JFrame {
                stop_display();
        }
 
-       String readline(FileInputStream s) throws IOException {
-               int c;
-               String  line = "";
-
-               while ((c = s.read()) != -1) {
-                       if (c == '\r')
-                               continue;
-                       if (c == '\n') {
-                               return line;
-                       }
-                       line = line + (char) c;
+       void ConfigureCallsign() {
+               String  result;
+               result = JOptionPane.showInputDialog(AltosUI.this,
+                                                    "Configure Callsign",
+                                                    AltosPreferences.callsign());
+               if (result != null) {
+                       AltosPreferences.set_callsign(result);
+                       if (serial_line != null)
+                               serial_line.set_callsign(result);
                }
-               return null;
+       }
+
+       void ConfigureTeleMetrum() {
+               new AltosConfig(AltosUI.this);
+       }
+
+       void FlashImage() {
+               new AltosFlashUI(AltosUI.this);
        }
 
        /*
@@ -535,37 +414,33 @@ public class AltosUI extends JFrame {
         */
 
        class ReplayThread extends DisplayThread {
-               FileInputStream replay;
-               String filename;
-
-               ReplayThread(FileInputStream in, String name) {
-                       replay = in;
-                       filename = name;
-               }
+               AltosReader     reader;
+               String          name;
 
-               String read() {
+               public AltosRecord read() {
                        try {
-                               return readline(replay);
-                       } catch (IOException ee) {
+                               return reader.read();
+                       } catch (IOException ie) {
                                JOptionPane.showMessageDialog(AltosUI.this,
-                                                             filename,
+                                                             name,
                                                              "error reading",
                                                              JOptionPane.ERROR_MESSAGE);
+                       } catch (ParseException pe) {
                        }
                        return null;
                }
 
-               void close () {
-                       try {
-                               replay.close();
-                       } catch (IOException ee) {
-                       }
-                       report();
+               public void close (boolean interrupted) {
+                       if (!interrupted)
+                               report();
                }
 
+               public ReplayThread(AltosReader in_reader, String in_name) {
+                       reader = in_reader;
+               }
                void update(AltosState state) throws InterruptedException {
                        /* Make it run in realtime after the rocket leaves the pad */
-                       if (state.state > AltosTelemetry.ao_flight_pad)
+                       if (state.state > Altos.ao_flight_pad)
                                Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
                }
        }
@@ -573,8 +448,12 @@ public class AltosUI extends JFrame {
        Thread          display_thread;
 
        private void stop_display() {
-               if (display_thread != null && display_thread.isAlive())
+               if (display_thread != null && display_thread.isAlive()) {
                        display_thread.interrupt();
+                       try {
+                               display_thread.join();
+                       } catch (InterruptedException ie) {}
+               }
                display_thread = null;
        }
 
@@ -588,36 +467,34 @@ public class AltosUI extends JFrame {
         * Replay a flight from telemetry data
         */
        private void Replay() {
-               JFileChooser    logfile_chooser = new JFileChooser();
-
-               logfile_chooser.setDialogTitle("Select Telemetry File");
-               logfile_chooser.setFileFilter(new FileNameExtensionFilter("Telemetry file", "telem"));
-               logfile_chooser.setCurrentDirectory(AltosPreferences.logdir());
-               int returnVal = logfile_chooser.showOpenDialog(AltosUI.this);
-
-               if (returnVal == JFileChooser.APPROVE_OPTION) {
-                       File file = logfile_chooser.getSelectedFile();
-                       if (file == null)
-                               System.out.println("No file selected?");
-                       String  filename = file.getName();
-                       try {
-                               FileInputStream replay = new FileInputStream(file);
-                               ReplayThread    thread = new ReplayThread(replay, filename);
-                               run_display(thread);
-                       } catch (FileNotFoundException ee) {
-                               JOptionPane.showMessageDialog(AltosUI.this,
-                                                             filename,
-                                                             "Cannot open telemetry file",
-                                                             JOptionPane.ERROR_MESSAGE);
-                       }
-               }
+               AltosLogfileChooser chooser = new AltosLogfileChooser(
+                       AltosUI.this);
+               AltosReader reader = chooser.runDialog();
+               if (reader != null)
+                       run_display(new ReplayThread(reader,
+                                                    chooser.filename()));
        }
 
        /* Connect to TeleMetrum, either directly or through
         * a TeleDongle over the packet link
         */
        private void SaveFlightData() {
-               new AltosEeprom(AltosUI.this);
+               new AltosEepromDownload(AltosUI.this);
+       }
+
+       /* Load a flight log file and write out a CSV file containing
+        * all of the data in standard units
+        */
+
+       private void ExportData() {
+               new AltosCSVUI(AltosUI.this);
+       }
+
+       /* Load a flight log CSV file and display a pretty graph.
+        */
+
+       private void GraphData() {
+               new AltosGraphUI(AltosUI.this);
        }
 
        /* Create the AltosUI menus
@@ -634,6 +511,46 @@ public class AltosUI extends JFrame {
                        menu.setMnemonic(KeyEvent.VK_F);
                        menubar.add(menu);
 
+                       item = new JMenuItem("Replay File",KeyEvent.VK_R);
+                       item.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               Replay();
+                                       }
+                               });
+                       menu.add(item);
+
+                       item = new JMenuItem("Save Flight Data",KeyEvent.VK_S);
+                       item.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               SaveFlightData();
+                                       }
+                               });
+                       menu.add(item);
+
+                       item = new JMenuItem("Flash Image",KeyEvent.VK_F);
+                       item.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               FlashImage();
+                                       }
+                               });
+                       menu.add(item);
+
+                       item = new JMenuItem("Export Data",KeyEvent.VK_F);
+                       item.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               ExportData();
+                                       }
+                               });
+                       menu.add(item);
+
+                       item = new JMenuItem("Graph Data",KeyEvent.VK_F);
+                       item.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               GraphData();
+                                       }
+                               });
+                       menu.add(item);
+
                        item = new JMenuItem("Quit",KeyEvent.VK_Q);
                        item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
                                                                   ActionEvent.CTRL_MASK));
@@ -669,20 +586,22 @@ public class AltosUI extends JFrame {
 
                        menu.addSeparator();
 
-                       item = new JMenuItem("Save Flight Data",KeyEvent.VK_S);
+                       item = new JMenuItem("Set Callsign",KeyEvent.VK_S);
                        item.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
-                                               SaveFlightData();
+                                               ConfigureCallsign();
                                        }
                                });
+
                        menu.add(item);
 
-                       item = new JMenuItem("Replay",KeyEvent.VK_R);
+                       item = new JMenuItem("Configure TeleMetrum device",KeyEvent.VK_T);
                        item.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
-                                               Replay();
+                                               ConfigureTeleMetrum();
                                        }
                                });
+
                        menu.add(item);
                }
                // Log menu
@@ -736,33 +655,82 @@ public class AltosUI extends JFrame {
 
                // Channel menu
                {
-                       menu = new JMenu("Channel", true);
-                       menu.setMnemonic(KeyEvent.VK_C);
-                       menubar.add(menu);
-                       ButtonGroup group = new ButtonGroup();
-
-                       for (int c = 0; c <= 9; c++) {
-                               radioitem = new JRadioButtonMenuItem(String.format("Channel %1d (%7.3fMHz)", c,
-                                                                                  434.550 + c * 0.1),
-                                                                    c == AltosPreferences.channel());
-                               radioitem.setActionCommand(String.format("%d", c));
-                               radioitem.addActionListener(new ActionListener() {
+                       menu = new AltosChannelMenu(AltosPreferences.channel());
+                       menu.addActionListener(new ActionListener() {
                                                public void actionPerformed(ActionEvent e) {
                                                        int new_channel = Integer.parseInt(e.getActionCommand());
                                                        AltosPreferences.set_channel(new_channel);
                                                        serial_line.set_channel(new_channel);
                                                }
-                                       });
-                               menu.add(radioitem);
-                               group.add(radioitem);
-                       }
+                               });
+                       menu.setMnemonic(KeyEvent.VK_C);
+                       menubar.add(menu);
                }
 
                this.setJMenuBar(menubar);
 
        }
+
+       static String replace_extension(String input, String extension) {
+               int dot = input.lastIndexOf(".");
+               if (dot > 0)
+                       input = input.substring(0,dot);
+               return input.concat(extension);
+       }
+
+       static AltosReader open_logfile(String filename) {
+               File file = new File (filename);
+               try {
+                       FileInputStream in;
+
+                       in = new FileInputStream(file);
+                       if (filename.endsWith("eeprom"))
+                               return new AltosEepromReader(in);
+                       else
+                               return new AltosTelemetryReader(in);
+               } catch (FileNotFoundException fe) {
+                       System.out.printf("Cannot open '%s'\n", filename);
+                       return null;
+               }
+       }
+
+       static AltosCSV open_csv(String filename) {
+               File file = new File (filename);
+               try {
+                       return new AltosCSV(file);
+               } catch (FileNotFoundException fe) {
+                       System.out.printf("Cannot open '%s'\n", filename);
+                       return null;
+               }
+       }
+
+       static void process_file(String input) {
+               String output = replace_extension(input,".csv");
+               if (input.equals(output)) {
+                       System.out.printf("Not processing '%s'\n", input);
+                       return;
+               }
+               System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
+               AltosReader reader = open_logfile(input);
+               if (reader == null)
+                       return;
+               AltosCSV writer = open_csv(output);
+               if (writer == null)
+                       return;
+               writer.write(reader);
+               reader.close();
+               writer.close();
+       }
+
        public static void main(final String[] args) {
-               AltosUI altosui = new AltosUI();
-               altosui.setVisible(true);
+
+               /* Handle batch-mode */
+               if (args.length > 0) {
+                       for (int i = 0; i < args.length; i++)
+                               process_file(args[i]);
+               } else {
+                       AltosUI altosui = new AltosUI();
+                       altosui.setVisible(true);
+               }
        }
-}
\ No newline at end of file
+}