X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=eb376be479527d1fb26e468ec8dd75d40c853192;hb=e844e8a0695e27af6f8e3e37a5e3bcc865b862e3;hp=5b48e26f16fda3c6cec6044580c8654908272cf5;hpb=63bd34cd1b5a411489e8c3ab377f0fe0eec11f67;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 5b48e26f..eb376be4 100644
--- 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.AltosLine;
 
 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" } };
 
+		java.net.URL imgURL = AltosUI.class.getResource("/images/altus-metrum-16x16.jpg");
+		if (imgURL != null)
+			setIconImage(new ImageIcon(imgURL).getImage());
+
 		AltosPreferences.init(this);
 
 		vbox = Box.createVerticalBox();
@@ -168,21 +173,19 @@ public class AltosUI extends JFrame {
 			flightInfoModel[i].finish();
 	}
 
-	public void show(AltosState state) {
+	public void show(AltosState state, int crc_errors) {
+		if (state == null)
+			return;
 		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, "CRC Errors", "%6d", crc_errors);
 		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);
@@ -197,6 +200,11 @@ public class AltosUI extends JFrame {
 		if (state.gps == null) {
 			info_add_row(1, "GPS", "not available");
 		} else {
+			if (state.gps_ready)
+				info_add_row(1, "GPS state", "%s", "ready");
+			else
+				info_add_row(1, "GPS state", "wait (%d)",
+					     state.gps_waiting);
 			if (state.data.gps.locked)
 				info_add_row(1, "GPS", "   locked");
 			else if (state.data.gps.connected)
@@ -362,7 +370,11 @@ public class AltosUI extends JFrame {
 
 		String		name;
 
-		AltosRecord read() throws InterruptedException, ParseException { return null; }
+		int		crc_errors;
+
+		void init() { }
+
+		AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException { return null; }
 
 		void close() { }
 
@@ -387,14 +399,22 @@ public class AltosUI extends JFrame {
 						old_state = state;
 						state = new AltosState(record, state);
 						update(state);
-						show(state);
+						show(state, crc_errors);
 						tell(state, old_state);
 						idle_thread.notice(state);
 					} catch (ParseException 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) {
+			} 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();
@@ -409,10 +429,13 @@ public class AltosUI extends JFrame {
 
 	class DeviceThread extends DisplayThread {
 		AltosSerial	serial;
-		LinkedBlockingQueue<String> telem;
+		LinkedBlockingQueue<AltosLine> telem;
 
-		AltosRecord read() throws InterruptedException, ParseException {
-			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() {
@@ -420,11 +443,11 @@ public class AltosUI extends JFrame {
 			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 = "telemetry";
+			name = in_name;
 		}
 	}
 
@@ -433,8 +456,9 @@ public class AltosUI extends JFrame {
 
 		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);
@@ -528,8 +552,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;
 	}