altosui: Output recorded clock tick in CSV files

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index b44b9d43b84c4a7f3f511120a4c2e183c68f028d..b2ae485801212dc4198ffb03e91513866f4c581c 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -28,7 +28,7 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
 
-public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
        AltosVoice              voice;
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
@@ -98,7 +98,11 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
                set_font();
        }
 
+
+       AltosFlightStatusUpdate status_update;
+
        public void show(AltosState state, int crc_errors) {
+               status_update.saved_state = state;
                JComponent tab = which_tab(state);
                try {
                pad.show(state, crc_errors);
@@ -150,6 +154,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
        Container       bag;
        AltosFreqList   frequencies;
        JComboBox       telemetries;
+       JLabel          telemetry;
+
+       ActionListener  show_timer;
 
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
                AltosPreferences.set_component(this);
@@ -195,32 +202,53 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
                        bag.add (frequencies, c);
 
                        // Telemetry format menu
-                       telemetries = new JComboBox();
-                       for (int i = 1; i <= Altos.ao_telemetry_max; i++)
-                               telemetries.addItem(Altos.telemetry_name(i));
-                       int telemetry = AltosPreferences.telemetry(serial);
-                       if (telemetry <= Altos.ao_telemetry_off ||
-                           telemetry > Altos.ao_telemetry_max)
-                               telemetry = Altos.ao_telemetry_standard;
-                       telemetries.setSelectedIndex(telemetry - 1);
-                       telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
-                       telemetries.setPreferredSize(null);
-                       telemetries.revalidate();
-                       telemetries.addActionListener(new ActionListener() {
-                                       public void actionPerformed(ActionEvent e) {
-                                               int telemetry = telemetries.getSelectedIndex() + 1;
-                                               reader.set_telemetry(telemetry);
-                                               reader.save_telemetry();
-                                       }
-                               });
-                       c.gridx = 1;
-                       c.gridy = 0;
-                       c.weightx = 0;
-                       c.weighty = 0;
-                       c.fill = GridBagConstraints.NONE;
-                       c.anchor = GridBagConstraints.WEST;
-                       bag.add (telemetries, c);
-                       c.insets = new Insets(0, 0, 0, 0);
+                       if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
+                               telemetries = new JComboBox();
+                               for (int i = 1; i <= Altos.ao_telemetry_max; i++) 
+                                       telemetries.addItem(Altos.telemetry_name(i));
+                               int telemetry = AltosPreferences.telemetry(serial);
+                               if (telemetry <= Altos.ao_telemetry_off ||
+                                   telemetry > Altos.ao_telemetry_max)
+                                       telemetry = Altos.ao_telemetry_standard;
+                               telemetries.setSelectedIndex(telemetry - 1);
+                               telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
+                               telemetries.setPreferredSize(null);
+                               telemetries.revalidate();
+                               telemetries.addActionListener(new ActionListener() {
+                                               public void actionPerformed(ActionEvent e) {
+                                                       int telemetry = telemetries.getSelectedIndex() + 1;
+                                                       reader.set_telemetry(telemetry);
+                                                       reader.save_telemetry();
+                                               }
+                                       });
+                               c.gridx = 1;
+                               c.gridy = 0;
+                               c.weightx = 0;
+                               c.weighty = 0;
+                               c.fill = GridBagConstraints.NONE;
+                               c.anchor = GridBagConstraints.WEST;
+                               bag.add (telemetries, c);
+                               c.insets = new Insets(0, 0, 0, 0);
+                       } else {
+                               String  version;
+
+                               if (reader.supports_telemetry(Altos.ao_telemetry_0_9))
+                                       version = "Telemetry: 0.9";
+                               else if (reader.supports_telemetry(Altos.ao_telemetry_0_8))
+                                       version = "Telemetry: 0.8";
+                               else
+                                       version = "Telemetry: None";
+
+                               telemetry = new JLabel(version);
+                               c.gridx = 1;
+                               c.gridy = 0;
+                               c.weightx = 0;
+                               c.weighty = 0;
+                               c.fill = GridBagConstraints.NONE;
+                               c.anchor = GridBagConstraints.WEST;
+                               bag.add (telemetry, c);
+                               c.insets = new Insets(0, 0, 0, 0);
+                       }
                }
 
                /* Flight status is always visible */
@@ -289,6 +317,10 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay, AltosFo
 
                thread = new AltosDisplayThread(this, voice, this, reader);
 
+               status_update = new AltosFlightStatusUpdate(flightStatus);
+
+               new javax.swing.Timer(100, status_update).start();
+
                thread.start();
        }