diff options
| author | Anthony Towns <aj@erisian.com.au> | 2010-11-20 17:40:49 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2010-11-20 17:40:49 +1000 |
| commit | 081fbd5715f9d3d81d98e149fb95d40447c07a79 (patch) | |
| tree | 073885e98179ef663f08aaaf52cb7e74c2c66427 /ao-tools/altosui/AltosDevice.java | |
| parent | 90b9bc4475011bead7117ed72fa5efa0f77b2813 (diff) | |
| parent | 7920ed5c34b088f45ce4213b061ddd1ffe22cee8 (diff) | |
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
Conflicts:
ao-tools/altosui/AltosFlightUI.java
Diffstat (limited to 'ao-tools/altosui/AltosDevice.java')
| -rw-r--r-- | ao-tools/altosui/AltosDevice.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ao-tools/altosui/AltosDevice.java b/ao-tools/altosui/AltosDevice.java index f646305b..f0fda57b 100644 --- a/ao-tools/altosui/AltosDevice.java +++ b/ao-tools/altosui/AltosDevice.java @@ -101,6 +101,15 @@ public class AltosDevice extends altos_device { getName(), getSerial(), getPath()); } + public String toShortString() { + String name = getName(); + if (name == null) + name = "Altus Metrum"; + return String.format("%s %d %s", + name, getSerial(), getPath()); + + } + public boolean isAltusMetrum() { if (getVendor() != vendor_altusmetrum) return false; |