projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add version numbers to released files. Set version to 0.7.1
[fw/altos]
/
ao-tools
/
altosui
/
AltosUI.java
diff --git
a/ao-tools/altosui/AltosUI.java
b/ao-tools/altosui/AltosUI.java
index e3f613037dc61eab425d2a1becf9a0d735be0ce7..37625e8e47f1944d899527f64dfa0f11eefe14fe 100644
(file)
--- a/
ao-tools/altosui/AltosUI.java
+++ b/
ao-tools/altosui/AltosUI.java
@@
-44,6
+44,7
@@
import altosui.AltosChannelMenu;
import altosui.AltosFlashUI;
import altosui.AltosLogfileChooser;
import altosui.AltosCSVUI;
import altosui.AltosFlashUI;
import altosui.AltosLogfileChooser;
import altosui.AltosCSVUI;
+import altosui.AltosLine;
import libaltosJNI.*;
import libaltosJNI.*;
@@
-74,6
+75,10
@@
public class AltosUI extends JFrame {
String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
Object[][] statusData = { { "0", "pad", "-50", "0" } };
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();
AltosPreferences.init(this);
vbox = Box.createVerticalBox();
@@
-169,6
+174,8
@@
public class AltosUI extends JFrame {
}
public void show(AltosState state, int crc_errors) {
}
public void show(AltosState state, int crc_errors) {
+ if (state == null)
+ return;
flightStatusModel.set(state);
info_reset();
flightStatusModel.set(state);
info_reset();
@@
-367,7
+374,7
@@
public class AltosUI extends JFrame {
void init() { }
void init() { }
- AltosRecord read() throws InterruptedException, ParseException, AltosCRCException { return null; }
+ AltosRecord read() throws InterruptedException, ParseException, AltosCRCException
, IOException
{ return null; }
void close() { }
void close() { }
@@
-403,6
+410,11
@@
public class AltosUI extends JFrame {
}
}
} catch (InterruptedException ee) {
}
}
} catch (InterruptedException ee) {
+ } catch (IOException ie) {
+ JOptionPane.showMessageDialog(AltosUI.this,
+ String.format("Error reading from \"%s\"", name),
+ "Telemetry Read Error",
+ JOptionPane.ERROR_MESSAGE);
} finally {
close();
idle_thread.interrupt();
} finally {
close();
idle_thread.interrupt();
@@
-417,10
+429,13
@@
public class AltosUI extends JFrame {
class DeviceThread extends DisplayThread {
AltosSerial serial;
class DeviceThread extends DisplayThread {
AltosSerial serial;
- LinkedBlockingQueue<
String
> telem;
+ LinkedBlockingQueue<
AltosLine
> telem;
- AltosRecord read() throws InterruptedException, ParseException, AltosCRCException {
- return new AltosTelemetry(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() {
@@
-428,11
+443,11
@@
public class AltosUI extends JFrame {
serial.remove_monitor(telem);
}
serial.remove_monitor(telem);
}
- public DeviceThread(AltosSerial s) {
+ public DeviceThread(AltosSerial s
, String in_name
) {
serial = s;
serial = s;
- telem = new LinkedBlockingQueue<
String
>();
+ telem = new LinkedBlockingQueue<
AltosLine
>();
serial.add_monitor(telem);
serial.add_monitor(telem);
- name =
"telemetry"
;
+ name =
in_name
;
}
}
}
}
@@
-441,8
+456,9
@@
public class AltosUI extends JFrame {
if (device != null) {
try {
if (device != null) {
try {
+ stop_display();
serial_line.open(device);
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);
serial_line.set_channel(AltosPreferences.channel());
serial_line.set_callsign(AltosPreferences.callsign());
run_display(thread);
@@
-536,8
+552,12
@@
public class AltosUI extends JFrame {
Thread display_thread;
private void stop_display() {
Thread display_thread;
private void stop_display() {
- if (display_thread != null && display_thread.isAlive())
+ if (display_thread != null && display_thread.isAlive())
{
display_thread.interrupt();
display_thread.interrupt();
+ try {
+ display_thread.join();
+ } catch (InterruptedException ie) {}
+ }
display_thread = null;
}
display_thread = null;
}