altoslib/altosui/telegps: Switch TeleGPS config to motion/interval
[fw/altos] / altosui / AltosConfigUI.java
index bcb3e12c5df2da4b1ac1ee4b5fffdb61b96ee90a..ee54e31e30c32fe7457a7ab516c80d332f6ddbd8 100644 (file)
@@ -46,8 +46,8 @@ public class AltosConfigUI
        JLabel                  pad_orientation_label;
        JLabel                  callsign_label;
        JLabel                  beep_label;
-       JLabel                  tracker_horiz_label;
-       JLabel                  tracker_vert_label;
+       JLabel                  tracker_motion_label;
+       JLabel                  tracker_interval_label;
 
        public boolean          dirty;
 
@@ -67,8 +67,8 @@ public class AltosConfigUI
        JComboBox<String>       pad_orientation_value;
        JTextField              callsign_value;
        JComboBox<String>       beep_value;
-       JComboBox<String>       tracker_horiz_value;
-       JComboBox<String>       tracker_vert_value;
+       JComboBox<String>       tracker_motion_value;
+       JComboBox<String>       tracker_interval_value;
 
        JButton                 pyro;
 
@@ -99,12 +99,6 @@ public class AltosConfigUI
                "0", "5", "10", "15", "20"
        };
 
-       static String[]         flight_log_max_values = {
-               "64", "128", "192", "256", "320",
-               "384", "448", "512", "576", "640",
-               "704", "768", "832", "896", "960",
-       };
-
        static String[]         ignite_mode_values = {
                "Dual Deploy",
                "Redundant Apogee",
@@ -129,32 +123,25 @@ public class AltosConfigUI
                "Antenna Down",
        };
 
-       static String[]         tracker_horiz_values_m = {
-               "250",
-               "500",
-               "1000",
-               "2000"
-       };
-
-       static String[]         tracker_horiz_values_ft = {
-               "500",
-               "1000",
-               "2500",
-               "5000"
+       static String[]         tracker_motion_values_m = {
+               "2",
+               "5",
+               "10",
+               "25",
        };
 
-       static String[]         tracker_vert_values_m = {
-               "25",
+       static String[]         tracker_motion_values_ft = {
+               "5",
+               "20",
                "50",
-               "100",
-               "200"
+               "100"
        };
 
-       static String[]         tracker_vert_values_ft = {
-               "50",
-               "100",
-               "250",
-               "500"
+       static String[]         tracker_interval_values = {
+               "1",
+               "2",
+               "5",
+               "10"
        };
 
        /* A window listener to catch closing events and tell the config code */
@@ -546,7 +533,7 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = il;
                c.ipady = 5;
-               flight_log_max_label = new JLabel("Maximum Flight Log Size:");
+               flight_log_max_label = new JLabel("Maximum Flight Log Size (kB):");
                pane.add(flight_log_max_label, c);
 
                c = new GridBagConstraints();
@@ -557,7 +544,7 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               flight_log_max_value = new JComboBox<String>(flight_log_max_values);
+               flight_log_max_value = new JComboBox<String>();
                flight_log_max_value.setEditable(true);
                flight_log_max_value.addItemListener(this);
                pane.add(flight_log_max_value, c);
@@ -650,8 +637,8 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = il;
                c.ipady = 5;
-               tracker_horiz_label = new JLabel(get_tracker_horiz_label());
-               pane.add(tracker_horiz_label, c);
+               tracker_motion_label = new JLabel(get_tracker_motion_label());
+               pane.add(tracker_motion_label, c);
 
                c = new GridBagConstraints();
                c.gridx = 4; c.gridy = row;
@@ -661,10 +648,10 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               tracker_horiz_value = new JComboBox<String>(tracker_horiz_values());
-               tracker_horiz_value.setEditable(true);
-               tracker_horiz_value.addItemListener(this);
-               pane.add(tracker_horiz_value, c);
+               tracker_motion_value = new JComboBox<String>(tracker_motion_values());
+               tracker_motion_value.setEditable(true);
+               tracker_motion_value.addItemListener(this);
+               pane.add(tracker_motion_value, c);
                row++;
 
                /* Tracker triger vert distances */
@@ -675,8 +662,8 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = il;
                c.ipady = 5;
-               tracker_vert_label = new JLabel(get_tracker_vert_label());
-               pane.add(tracker_vert_label, c);
+               tracker_interval_label = new JLabel("Position Reporting Interval(s):");
+               pane.add(tracker_interval_label, c);
 
                c = new GridBagConstraints();
                c.gridx = 4; c.gridy = row;
@@ -686,10 +673,10 @@ public class AltosConfigUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               tracker_vert_value = new JComboBox<String>(tracker_vert_values());
-               tracker_vert_value.setEditable(true);
-               tracker_vert_value.addItemListener(this);
-               pane.add(tracker_vert_value, c);
+               tracker_interval_value = new JComboBox<String>(tracker_interval_values);
+               tracker_interval_value.setEditable(true);
+               tracker_interval_value.addItemListener(this);
+               pane.add(tracker_interval_value, c);
                set_tracker_tool_tip();
                row++;
 
@@ -898,18 +885,11 @@ public class AltosConfigUI
                int m = (int) (AltosConvert.height.parse(v, !imperial_units) + 0.5);
                set_main_deploy(m);
 
-               if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) {
-                       String th = tracker_horiz_value.getSelectedItem().toString();
-                       String tv = tracker_vert_value.getSelectedItem().toString();
-                       tracker_horiz_label.setText(get_tracker_horiz_label());
-                       tracker_vert_label.setText(get_tracker_vert_label());
-                       set_tracker_horiz_values();
-                       set_tracker_vert_values();
-                       int[] t = {
-                               (int) (AltosConvert.height.parse(th, !imperial_units) + 0.5),
-                               (int) (AltosConvert.height.parse(tv, !imperial_units) + 0.5)
-                       };
-                       set_tracker_distances(t);
+               if (tracker_motion_value.isEnabled()) {
+                       String motion = tracker_motion_value.getSelectedItem().toString();
+                       tracker_motion_label.setText(get_tracker_motion_label());
+                       set_tracker_motion_values();
+                       set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5));
                }
        }
 
@@ -918,8 +898,19 @@ public class AltosConfigUI
                apogee_delay_value.setEnabled(new_apogee_delay >= 0);
        }
 
-       public int apogee_delay() {
-               return Integer.parseInt(apogee_delay_value.getSelectedItem().toString());
+       private int parse_int(String name, String s, boolean split) throws AltosConfigDataException {
+               String v = s;
+               if (split)
+                       v = s.split("\\s+")[0];
+               try {
+                       return Integer.parseInt(v);
+               } catch (NumberFormatException ne) {
+                       throw new AltosConfigDataException("Invalid %s \"%s\"", name, s);
+               }
+       }
+
+       public int apogee_delay() throws AltosConfigDataException {
+               return parse_int("apogee delay", apogee_delay_value.getSelectedItem().toString(), false);
        }
 
        public void set_apogee_lockout(int new_apogee_lockout) {
@@ -927,8 +918,8 @@ public class AltosConfigUI
                apogee_lockout_value.setEnabled(new_apogee_lockout >= 0);
        }
 
-       public int apogee_lockout() {
-               return Integer.parseInt(apogee_lockout_value.getSelectedItem().toString());
+       public int apogee_lockout() throws AltosConfigDataException {
+               return parse_int("apogee lockout", apogee_lockout_value.getSelectedItem().toString(), false);
        }
 
        public void set_radio_frequency(double new_radio_frequency) {
@@ -947,8 +938,8 @@ public class AltosConfigUI
                        radio_calibration_value.setText(String.format("%d", new_radio_calibration));
        }
 
-       public int radio_calibration() {
-               return Integer.parseInt(radio_calibration_value.getText());
+       public int radio_calibration() throws AltosConfigDataException {
+               return parse_int("radio calibration", radio_calibration_value.getText(), false);
        }
 
        public void set_radio_enable(int new_radio_enable) {
@@ -979,8 +970,22 @@ public class AltosConfigUI
                return callsign_value.getText();
        }
 
+       int     flight_log_max_limit;
+       int     flight_log_max;
+
+       public String flight_log_max_label(int flight_log_max) {
+               if (flight_log_max_limit != 0) {
+                       int     nflight = flight_log_max_limit / flight_log_max;
+                       String  plural = nflight > 1 ? "s" : "";
+
+                       return String.format("%d (%d flight%s)", flight_log_max, nflight, plural);
+               }
+               return String.format("%d", flight_log_max);
+       }
+
        public void set_flight_log_max(int new_flight_log_max) {
-               flight_log_max_value.setSelectedItem(Integer.toString(new_flight_log_max));
+               flight_log_max_value.setSelectedItem(flight_log_max_label(new_flight_log_max));
+               flight_log_max = new_flight_log_max;
                set_flight_log_max_tool_tip();
        }
 
@@ -989,20 +994,19 @@ public class AltosConfigUI
                set_flight_log_max_tool_tip();
        }
 
-       public int flight_log_max() {
-               return Integer.parseInt(flight_log_max_value.getSelectedItem().toString());
+       public int flight_log_max() throws AltosConfigDataException {
+               return parse_int("flight log max", flight_log_max_value.getSelectedItem().toString(), true);
        }
 
-       public void set_flight_log_max_limit(int flight_log_max_limit) {
-               //boolean       any_added = false;
+       public void set_flight_log_max_limit(int new_flight_log_max_limit) {
+               flight_log_max_limit = new_flight_log_max_limit;
                flight_log_max_value.removeAllItems();
-               for (int i = 0; i < flight_log_max_values.length; i++) {
-                       if (Integer.parseInt(flight_log_max_values[i]) < flight_log_max_limit){
-                               flight_log_max_value.addItem(flight_log_max_values[i]);
-                               //any_added = true;
-                       }
+               for (int i = 8; i >= 1; i--) {
+                       int     size = flight_log_max_limit / i;
+                       flight_log_max_value.addItem(String.format("%d (%d flights)", size, i));
                }
-               flight_log_max_value.addItem(String.format("%d", flight_log_max_limit));
+               if (flight_log_max != 0)
+                       set_flight_log_max(flight_log_max);
        }
 
        public void set_ignite_mode(int new_ignite_mode) {
@@ -1066,78 +1070,51 @@ public class AltosConfigUI
                        return -1;
        }
 
-       String[] tracker_horiz_values() {
+       String[] tracker_motion_values() {
                if (AltosConvert.imperial_units)
-                       return tracker_horiz_values_ft;
+                       return tracker_motion_values_ft;
                else
-                       return tracker_horiz_values_m;
+                       return tracker_motion_values_m;
        }
 
-       void set_tracker_horiz_values() {
-               String[]        v = tracker_horiz_values();
-               while (tracker_horiz_value.getItemCount() > 0)
-                       tracker_horiz_value.removeItemAt(0);
+       void set_tracker_motion_values() {
+               String[]        v = tracker_motion_values();
+               while (tracker_motion_value.getItemCount() > 0)
+                       tracker_motion_value.removeItemAt(0);
                for (int i = 0; i < v.length; i++)
-                       tracker_horiz_value.addItem(v[i]);
-               tracker_horiz_value.setMaximumRowCount(v.length);
+                       tracker_motion_value.addItem(v[i]);
+               tracker_motion_value.setMaximumRowCount(v.length);
        }
 
-       String get_tracker_horiz_label() {
-               return String.format("Logging Trigger Horizontal (%s):", AltosConvert.height.show_units());
-       }
-
-       String[] tracker_vert_values() {
-               if (AltosConvert.imperial_units)
-                       return tracker_vert_values_ft;
-               else
-                       return tracker_vert_values_m;
-       }
-
-       void set_tracker_vert_values() {
-               String[]        v = tracker_vert_values();
-               while (tracker_vert_value.getItemCount() > 0)
-                       tracker_vert_value.removeItemAt(0);
-               for (int i = 0; i < v.length; i++)
-                       tracker_vert_value.addItem(v[i]);
-               tracker_vert_value.setMaximumRowCount(v.length);
+       String get_tracker_motion_label() {
+               return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units());
        }
 
        void set_tracker_tool_tip() {
-               if (tracker_horiz_value.isEnabled())
-                       tracker_horiz_value.setToolTipText("How far the device must move before logging is enabled");
+               if (tracker_motion_value.isEnabled())
+                       tracker_motion_value.setToolTipText("How far the device must move before logging");
                else
-                       tracker_horiz_value.setToolTipText("This device doesn't disable logging before motion");
-               if (tracker_vert_value.isEnabled())
-                       tracker_vert_value.setToolTipText("How far the device must move before logging is enabled");
+                       tracker_motion_value.setToolTipText("This device doesn't disable logging when stationary");
+               if (tracker_interval_value.isEnabled())
+                       tracker_interval_value.setToolTipText("How often to report GPS position");
                else
-                       tracker_vert_value.setToolTipText("This device doesn't disable logging before motion");
+                       tracker_interval_value.setToolTipText("This device can't configure interval");
        }
 
-       String get_tracker_vert_label() {
-               return String.format("Logging Trigger Vertical (%s):", AltosConvert.height.show_units());
+       public void set_tracker_motion(int tracker_motion) {
+               tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
        }
 
-       public void set_tracker_distances(int[] tracker_distances) {
-               if (tracker_distances != null) {
-                       tracker_horiz_value.setSelectedItem(AltosConvert.height.say(tracker_distances[0]));
-                       tracker_vert_value.setSelectedItem(AltosConvert.height.say(tracker_distances[1]));
-                       tracker_horiz_value.setEnabled(true);
-                       tracker_vert_value.setEnabled(true);
-               } else {
-                       tracker_horiz_value.setEnabled(false);
-                       tracker_vert_value.setEnabled(false);
-               }
+       public int tracker_motion() throws AltosConfigDataException {
+               return (int) AltosConvert.height.parse(tracker_motion_value.getSelectedItem().toString());
        }
 
-       public int[] tracker_distances() {
-               if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) {
-                       int[] t = {
-                               (int) (AltosConvert.height.parse(tracker_horiz_value.getSelectedItem().toString()) + 0.5),
-                               (int) (AltosConvert.height.parse(tracker_vert_value.getSelectedItem().toString()) + 0.5),
-                       };
-                       return t;
-               }
-               return null;
+       public void set_tracker_interval(int tracker_interval) {
+               tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
+       }
+
+       public int tracker_interval() throws AltosConfigDataException {
+               return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false);
        }
 
        public void set_pyros(AltosPyro[] new_pyros) {
@@ -1165,11 +1142,11 @@ public class AltosConfigUI
                set_aprs_interval_tool_tip();
        }
 
-       public int aprs_interval() {
+       public int aprs_interval() throws AltosConfigDataException {
                String  s = aprs_interval_value.getSelectedItem().toString();
 
                if (s.equals("Disabled"))
                        return 0;
-               return Integer.parseInt(s);
+               return parse_int("aprs interval", s, false);
        }
 }