diff options
| author | Keith Packard <keithp@keithp.com> | 2011-03-24 08:08:43 +0900 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-03-24 08:08:43 +0900 | 
| commit | 7f5b5848ad6ef5c808638a29c3dc0101b56ed11e (patch) | |
| tree | c85d6936a17ee4533cc8b41e29e59acd1e93d47c /altosui/AltosFlightUI.java | |
| parent | f3e68341f6f5daaf26dd162e4f9a06c29988986a (diff) | |
altosui: Add telemetry format menu and preferences
Switches the TeleDongle between full and tiny telemetry packet
formats, saving the last used format for each teledongle in the
application preferences.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/AltosFlightUI.java')
| -rw-r--r-- | altosui/AltosFlightUI.java | 24 | 
1 files changed, 24 insertions, 0 deletions
| diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java index 68e0ef87..286b2a4e 100644 --- a/altosui/AltosFlightUI.java +++ b/altosui/AltosFlightUI.java @@ -119,6 +119,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {  	Container	bag;  	JComboBox	channels; +	JComboBox	telemetries;  	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {  		AltosPreferences.init(this); @@ -149,8 +150,28 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {  			});  			c.gridx = 0;  			c.gridy = 0; +			c.insets = new Insets(3, 3, 3, 3);  			c.anchor = GridBagConstraints.WEST;  			bag.add (channels, c); + +			// Telemetry format menu +			telemetries = new JComboBox(); +			telemetries.addItem("TeleMetrum"); +			telemetries.addItem("TeleMini/TeleNano"); +			telemetries.setSelectedIndex(AltosPreferences.telemetry(serial) - 1); +			telemetries.setMaximumRowCount(2); +			telemetries.addActionListener(new ActionListener() { +					public void actionPerformed(ActionEvent e) { +						int telemetry = telemetries.getSelectedIndex(); +						reader.set_telemetry(telemetry); +					} +				}); +			c.gridx = 1; +			c.gridy = 0; +			c.fill = GridBagConstraints.NONE; +			c.anchor = GridBagConstraints.WEST; +			bag.add (telemetries, c); +			c.insets = new Insets(0, 0, 0, 0);  		}  		/* Flight status is always visible */ @@ -159,7 +180,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {  		c.gridy = 1;  		c.fill = GridBagConstraints.HORIZONTAL;  		c.weightx = 1; +		c.gridwidth = 2;  		bag.add(flightStatus, c); +		c.gridwidth = 1;  		/* The rest of the window uses a tabbed pane to  		 * show one of the alternate data views @@ -190,6 +213,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {  		c.fill = GridBagConstraints.BOTH;  		c.weightx = 1;  		c.weighty = 1; +		c.gridwidth = 2;  		bag.add(pane, c);  		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); | 
