summaryrefslogtreecommitdiff
path: root/altosui/AltosFlightUI.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-06-28 01:03:00 -0700
committerKeith Packard <keithp@keithp.com>2011-06-28 01:03:00 -0700
commit7fd9b8f720add559b262e81d61ededc9df16ca94 (patch)
treeae32f830c27c99aacdfd6fb231e70a3ceee0f3ff /altosui/AltosFlightUI.java
parentcb239b7161feea8646425b1f5788c3c82ae24321 (diff)
altosui: Support raw telemetry from TeleDongle
Use raw telemetry frames when TeleDongle supports them, this involves parsing the hex dump of the packet instead of having teledongle take the packet apart. Only the legacy format is working at this point; the altos bits for the new split telemetry frames is not written yet. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/AltosFlightUI.java')
-rw-r--r--altosui/AltosFlightUI.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index eb6c6d9d..5f1fc678 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -156,9 +156,13 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
// Telemetry format menu
telemetries = new JComboBox();
- telemetries.addItem("TeleMetrum");
- telemetries.addItem("TeleMini/TeleNano");
- telemetries.setSelectedIndex(AltosPreferences.telemetry(serial) - 1);
+ telemetries.addItem("Legacy TeleMetrum");
+ telemetries.addItem("Split Telemetry");
+ int telemetry = 1;
+ telemetry = AltosPreferences.telemetry(serial);
+ if (telemetry > Altos.ao_telemetry_split)
+ telemetry = Altos.ao_telemetry_split;
+ telemetries.setSelectedIndex(telemetry - 1);
telemetries.setMaximumRowCount(2);
telemetries.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {