From: Keith Packard <keithp@keithp.com>
Date: Sun, 28 May 2017 21:03:51 +0000 (-0700)
Subject: altosuilib: Display product/firmware version in stats table
X-Git-Tag: 1.8~68
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c075227c3a3c7714fe6f9d48c14dafaf4fed8e5e

altosuilib: Display product/firmware version in stats table

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosuilib/AltosFlightStatsTable.java b/altosuilib/AltosFlightStatsTable.java
index 47bdb75f..beda38bf 100644
--- a/altosuilib/AltosFlightStatsTable.java
+++ b/altosuilib/AltosFlightStatsTable.java
@@ -89,8 +89,15 @@ public class AltosFlightStatsTable extends JComponent implements AltosFontListen
 
 	public void set_stats(AltosFlightStats stats) {
 		int y = 0;
-		if (stats.serial != AltosLib.MISSING)
-			new FlightStat(layout, y++, "Serial", String.format("%d", stats.serial));
+		if (stats.serial != AltosLib.MISSING) {
+			if (stats.product != null && stats.firmware_version != null)
+				new FlightStat(layout, y++, "Device",
+					       stats.product,
+					       String.format("version %s", stats.firmware_version),
+					       String.format("serial %d", stats.serial));
+			else
+				new FlightStat(layout, y++, "Serial", String.format("%d", stats.serial));
+		}
 		if (stats.flight != AltosLib.MISSING)
 			new FlightStat(layout, y++, "Flight", String.format("%d", stats.flight));
 		if (stats.year != AltosLib.MISSING && stats.hour != AltosLib.MISSING)