From a579402f428dd6a0529505069d1846f70b83ab5d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 2 Apr 2010 18:10:59 -0700 Subject: [PATCH] Display table of flight info. gps is not working yet though --- ao-tools/altosui/AltosState.java | 30 ++-- ao-tools/altosui/AltosUI.java | 289 +++++++++++++++++++++++++++---- 2 files changed, 272 insertions(+), 47 deletions(-) diff --git a/ao-tools/altosui/AltosState.java b/ao-tools/altosui/AltosState.java index da465c75..b3054ce9 100644 --- a/ao-tools/altosui/AltosState.java +++ b/ao-tools/altosui/AltosState.java @@ -35,6 +35,8 @@ public class AltosState { int state; boolean ascent; /* going up? */ + double time_change; + double ground_altitude; double height; double speed; @@ -50,9 +52,7 @@ public class AltosState { double max_speed; AltosGPS gps; - AltosGPSTracking gps_tracking; - boolean gps_valid; double pad_lat; double pad_lon; double pad_alt; @@ -75,11 +75,10 @@ public class AltosState { return System.currentTimeMillis() / 1000.0; } - public AltosState (AltosTelemetry cur, AltosTelemetry prev, int prev_npad) { + void init (AltosTelemetry cur, AltosTelemetry prev, int prev_npad) { int i; double new_height; double height_change; - double time_change; double accel_counts_per_mss; int tick_count; @@ -108,7 +107,7 @@ public class AltosState { battery = AltosConvert.cc_battery_to_voltage(data.batt); state = data.state(); if (state == AltosTelemetry.ao_flight_pad) { - if (data.gps.gps_locked && data.gps.nsat >= 4) { + if (data.gps != null && data.gps.gps_locked && data.gps.nsat >= 4) { npad++; pad_lat_total += data.gps.lat; pad_lon_total += data.gps.lon; @@ -135,12 +134,9 @@ public class AltosState { if (height > max_height) max_height = height; - gps.gps_locked = data.gps.gps_locked; - gps.gps_connected = data.gps.gps_connected; - if (data.gps.gps_locked) { + if (data.gps != null) { gps = data.gps; - gps_valid = true; - if (npad > 0) + if (npad > 0 && gps.gps_locked) from_pad = new AltosGreatCircle(pad_lat, pad_lon, gps.lat, gps.lon); } if (npad > 0) { @@ -151,16 +147,16 @@ public class AltosState { } public AltosState(AltosTelemetry cur) { - this(cur, cur, 0); + init(cur, cur, 0); } public AltosState (AltosTelemetry cur, AltosState prev) { - this(cur, prev.data, prev.npad); - if (gps == null) { - gps = prev.gps; - gps_valid = prev.gps_valid; + if (prev == null) + init(cur, cur, 0); + else { + init(cur, prev.data, prev.npad); + if (gps == null) + gps = prev.gps; } - if (gps_tracking == null) - gps_tracking = prev.gps_tracking; } } diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java index 21c3e7a2..47a03f4e 100644 --- a/ao-tools/altosui/AltosUI.java +++ b/ao-tools/altosui/AltosUI.java @@ -57,30 +57,114 @@ class AltosFlightStatusTableModel extends AbstractTableModel { } public void set(AltosState state) { - setValueAt(state.height, 0); + setValueAt(String.format("%1.0f", state.height), 0); setValueAt(state.data.state, 1); setValueAt(state.data.rssi, 2); - setValueAt(state.speed, 3); + 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 rows = new ArrayList(); + + 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; - private JTable flightInfo; + + static final int info_columns = 3; + + private AltosFlightInfoTableModel[] flightInfoModel; + private JTable[] flightInfo; private AltosSerial serialLine; + private Box[] ibox; + private Box vbox; + private Box hbox; public AltosUI() { String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" }; Object[][] statusData = { { "0", "pad", "-50", "0" } }; - flightStatus = new JTable(statusData, statusNames); + vbox = Box.createVerticalBox(); + this.add(vbox); + + flightStatusModel = new AltosFlightStatusTableModel(); + flightStatus = new JTable(flightStatusModel); flightStatus.setShowGrid(false); - this.add(flightStatus); + flightInfo = new JTable[3]; + flightInfoModel = new AltosFlightInfoTableModel[3]; + ibox = new Box[3]; + + vbox.add(flightStatus.getTableHeader()); + vbox.add(flightStatus); + + hbox = Box.createHorizontalBox(); + vbox.add(hbox); + + for (int i = 0; i < info_columns; i++) { + ibox[i] = Box.createVerticalBox(); + flightInfoModel[i] = new AltosFlightInfoTableModel(); + flightInfo[i] = new JTable(flightInfoModel[i]); + flightInfo[i].setShowGrid(true); + ibox[i].add(flightInfo[i].getTableHeader()); + ibox[i].add(flightInfo[i]); + hbox.add(ibox[i]); + } setTitle("AltOS"); @@ -100,6 +184,131 @@ public class AltosUI extends JFrame { }); } + 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 value) { + flightInfoModel[col].addRow(name, String.format(format, value)); + } + + public void info_add_row(int col, String name, String format, Object v1, Object v2) { + flightInfoModel[col].addRow(name, String.format(format, v1, v2)); + } + + public void info_add_row(int col, String name, String format, Object v1, Object v2, Object v3) { + flightInfoModel[col].addRow(name, String.format(format, v1, v2, v3)); + } + + 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; + } + 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(); + } + + static final int MIN_PAD_SAMPLES = 10; + + public void show(AltosState state) { + flightStatusModel.set(state); + + info_reset(); + if (state.npad >= MIN_PAD_SAMPLES) + info_add_row(0, "Ground state", "%s", "ready"); + else + info_add_row(0, "Ground state", "waiting for gps (%d)", + MIN_PAD_SAMPLES - state.npad); + 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", "%d", state.data.serial); + info_add_row(0, "Rocket flight", "%d", state.data.flight); + + info_add_row(0, "RSSI", "%6ddBm", state.data.rssi); + info_add_row(0, "Height", "%6.0fm", state.height); + info_add_row(0, "Max height", "%6.0fm", state.max_height); + info_add_row(0, "Acceleration", "%7.1fm/s²", state.acceleration); + info_add_row(0, "Max acceleration", "%7.1fm/s²", state.max_acceleration); + info_add_row(0, "Speed", "%7.1fm/s", state.ascent ? state.speed : state.baro_speed); + info_add_row(0, "Max Speed", "%7.1fm/s", state.max_speed); + info_add_row(0, "Temperature", "%6.2f°C", state.temperature); + info_add_row(0, "Battery", "%5.2fV", state.battery); + info_add_row(0, "Drogue", "%5.2fV", state.drogue_sense); + info_add_row(0, "Main", "%5.2fV", state.main_sense); + info_add_row(0, "Pad altitude", "%6.0fm", state.ground_altitude); + if (state.gps != null) + info_add_row(1, "Satellites", "%d", state.gps.nsat); + else + info_add_row(1, "Satellites", "%d", 0); + if (state.gps != null && state.gps.gps_locked) { + info_add_row(1, "GPS", "locked"); + } else if (state.gps != null && state.gps.gps_connected) { + info_add_row(1, "GPS", "unlocked"); + } else { + info_add_row(1, "GPS", "not available"); + } + if (state.gps != null) { + 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", "%d", state.gps.alt); + info_add_row(1, "GPS height", "%d", state.gps_height); + 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); + info_add_row(1, "GPS ground speed", "%7.1fm/s %d°", + state.gps.ground_speed, + state.gps.course); + info_add_row(1, "GPS climb rate", "%7.1fm/s", + state.gps.climb_rate); + info_add_row(1, "GPS precision", "%4.1f(hdop) %3dm(h) %3dm(v)", + state.gps.hdop, state.gps.h_error, state.gps.v_error); + } + if (state.npad > 0) { + info_add_row(1, "Distance from pad", "%5.0fm", state.from_pad.distance); + info_add_row(1, "Direction from pad", "%4.0f°", state.from_pad.bearing); + 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", "%gm", state.pad_alt); + } + if (state.gps != null && state.gps.gps_connected) { + int nsat_vis = 0; + int c; + + if (state.gps.cc_gps_sat == null) + info_add_row(2, "Satellites Visible", "%d", 0); + else { + info_add_row(2, "Satellites Visible", "%d", 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", + "%3d,%2d", + state.gps.cc_gps_sat[c].svid, + state.gps.cc_gps_sat[c].c_n0); + } + } + } + info_finish(); + } + + final JFileChooser deviceChooser = new JFileChooser(); final JFileChooser logdirChooser = new JFileChooser(); final String logdirName = "TeleMetrum"; @@ -170,6 +379,49 @@ public class AltosUI extends JFrame { * Open an existing telemetry file and replay it in realtime */ + class ReplayThread extends Thread { + FileInputStream replay; + String filename; + + ReplayThread(FileInputStream in, String name) { + replay = in; + filename = name; + } + + public void run() { + String line; + AltosState state = null; + try { + while ((line = readline(replay)) != null) { + try { + AltosTelemetry t = new AltosTelemetry(line); + state = new AltosState(t, state); + show(state); + try { + if (state.state > AltosTelemetry.ao_flight_pad) + Thread.sleep((int) (state.time_change * 1000)); + } catch (InterruptedException e) {} + } catch (ParseException pp) { + JOptionPane.showMessageDialog(AltosUI.this, + line, + "error parsing", + JOptionPane.ERROR_MESSAGE); + break; + } + } + } catch (IOException ee) { + JOptionPane.showMessageDialog(AltosUI.this, + filename, + "error reading", + JOptionPane.ERROR_MESSAGE); + } finally { + try { + replay.close(); + } catch (IOException e) {} + } + } + } + private void Replay() { setLogdir(); logdirChooser.setDialogTitle("Select Telemetry File"); @@ -183,31 +435,8 @@ public class AltosUI extends JFrame { String filename = file.getName(); try { FileInputStream replay = new FileInputStream(file); - String line; - - try { - while ((line = readline(replay)) != null) { - try { - AltosTelemetry t = new AltosTelemetry(line); - System.out.println ("Version " + t.version + t.callsign); - } catch (ParseException pp) { - JOptionPane.showMessageDialog(AltosUI.this, - line, - "error parsing", - JOptionPane.ERROR_MESSAGE); - break; - } - } - } catch (IOException ee) { - JOptionPane.showMessageDialog(AltosUI.this, - filename, - "error reading", - JOptionPane.ERROR_MESSAGE); - } finally { - try { - replay.close(); - } catch (IOException e) {} - } + ReplayThread thread = new ReplayThread(replay, filename); + thread.start(); } catch (FileNotFoundException ee) { JOptionPane.showMessageDialog(AltosUI.this, filename, -- 2.30.2