altoslib, altosuilib, altosui, telegps: Missing config values now MISSING
authorKeith Packard <keithp@keithp.com>
Sun, 11 Jun 2017 23:11:09 +0000 (16:11 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 12 Jun 2017 05:54:22 +0000 (22:54 -0700)
Config values that didn't apply to the current product used to get set
to -1, but now they're set to AltosLib.MISSING to be consistent with
the rest of the code. Deal with this in the UI bits.

Signed-off-by: Keith Packard <keithp@keithp.com>
altoslib/AltosConfigData.java
altosui/AltosConfigUI.java
altosui/AltosIgniteUI.java
altosuilib/AltosUIRateList.java
telegps/TeleGPSConfigUI.java

index cb19ddf..c39a6c9 100644 (file)
@@ -140,16 +140,16 @@ public class AltosConfigData {
        }
 
        public int log_space() {
-               if (log_space > 0)
+               if (log_space != AltosLib.MISSING)
                        return log_space;
 
-               if (storage_size > 0) {
+               if (storage_size != AltosLib.MISSING) {
                        int     space = storage_size;
 
-                       if (storage_erase_unit > 0 && use_flash_for_config())
+                       if (storage_erase_unit != AltosLib.MISSING && use_flash_for_config())
                                space -= storage_erase_unit;
 
-                       if (space > 0)
+                       if (space != AltosLib.MISSING)
                                return space;
                }
                return 0;
@@ -262,8 +262,8 @@ public class AltosConfigData {
 
                aes_key = null;
 
-               pyro = 0;
-               npyro = 0;
+               pyro = AltosLib.MISSING;
+               npyro = AltosLib.MISSING;
                pyros = null;
                pyro_firing_time = AltosLib.MISSING;
 
@@ -372,7 +372,7 @@ public class AltosConfigData {
                        pyros = new AltosPyro[npyro];
                        pyro = 0;
                } catch (Exception e) {}
-               if (npyro > 0) {
+               if (npyro != AltosLib.MISSING) {
                        try {
                                AltosPyro p = new AltosPyro(pyro, line);
                                if (pyro < npyro)
@@ -436,21 +436,21 @@ public class AltosConfigData {
        }
 
        public boolean has_frequency() {
-               return radio_frequency >= 0 || radio_setting >= 0 || radio_channel >= 0;
+               return radio_frequency != AltosLib.MISSING || radio_setting != AltosLib.MISSING || radio_channel != AltosLib.MISSING;
        }
 
        public boolean has_telemetry_rate() {
-               return telemetry_rate >= 0;
+               return telemetry_rate != AltosLib.MISSING;
        }
 
        public void set_frequency(double freq) {
                int     frequency = radio_frequency;
                int     setting = radio_setting;
 
-               if (frequency > 0) {
+               if (frequency != AltosLib.MISSING) {
                        radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
                        radio_channel = AltosLib.MISSING;
-               } else if (setting > 0) {
+               } else if (setting != AltosLib.MISSING) {
                        radio_setting =AltosConvert.radio_frequency_to_setting(freq,
                                                                                    radio_calibration);
                        radio_channel = AltosLib.MISSING;
@@ -503,56 +503,56 @@ public class AltosConfigData {
        public void get_values(AltosConfigValues source) throws AltosConfigDataException {
 
                /* HAS_FLIGHT */
-               if (main_deploy >= 0)
+               if (main_deploy != AltosLib.MISSING)
                        main_deploy = source.main_deploy();
-               if (apogee_delay >= 0)
+               if (apogee_delay != AltosLib.MISSING)
                        apogee_delay = source.apogee_delay();
-               if (apogee_lockout >= 0)
+               if (apogee_lockout != AltosLib.MISSING)
                        apogee_lockout = source.apogee_lockout();
 
                /* HAS_RADIO */
                if (has_frequency())
                        set_frequency(source.radio_frequency());
-               if (radio_enable >= 0)
+               if (radio_enable != AltosLib.MISSING)
                        radio_enable = source.radio_enable();
                if (callsign != null)
                        callsign = source.callsign();
-               if (telemetry_rate >= 0)
+               if (telemetry_rate != AltosLib.MISSING)
                        telemetry_rate = source.telemetry_rate();
 
                /* HAS_ACCEL */
-               if (pad_orientation >= 0)
+               if (pad_orientation != AltosLib.MISSING)
                        pad_orientation = source.pad_orientation();
 
                /* HAS_LOG */
-               if (flight_log_max >= 0)
+               if (flight_log_max != AltosLib.MISSING)
                        flight_log_max = source.flight_log_max();
 
                /* HAS_IGNITE */
-               if (ignite_mode >= 0)
+               if (ignite_mode != AltosLib.MISSING)
                        ignite_mode = source.ignite_mode();
 
                /* AO_PYRO_NUM */
-               if (npyro > 0)
+               if (npyro != AltosLib.MISSING)
                        pyros = source.pyros();
-               if (pyro_firing_time >= 0)
+               if (pyro_firing_time != AltosLib.MISSING)
                        pyro_firing_time = source.pyro_firing_time();
 
                /* HAS_APRS */
-               if (aprs_interval >= 0)
+               if (aprs_interval != AltosLib.MISSING)
                        aprs_interval = source.aprs_interval();
-               if (aprs_ssid >= 0)
+               if (aprs_ssid != AltosLib.MISSING)
                        aprs_ssid = source.aprs_ssid();
-               if (aprs_format >= 0)
+               if (aprs_format != AltosLib.MISSING)
                        aprs_format = source.aprs_format();
 
                /* HAS_BEEP */
-               if (beep >= 0)
+               if (beep != AltosLib.MISSING)
                        beep = source.beep();
                /* HAS_TRACKER */
-               if (tracker_motion >= 0)
+               if (tracker_motion != AltosLib.MISSING)
                        tracker_motion = source.tracker_motion();
-               if (tracker_interval >= 0)
+               if (tracker_interval != AltosLib.MISSING)
                        tracker_interval = source.tracker_interval();
        }
 
@@ -572,7 +572,7 @@ public class AltosConfigData {
                if (log_space() == 0)
                        max_enabled = false;
 
-               if (log_fixed > 0)
+               if (log_fixed != AltosLib.MISSING)
                        max_enabled = false;
 
                switch (log_format) {
@@ -580,7 +580,7 @@ public class AltosConfigData {
                        max_enabled = false;
                        break;
                default:
-                       if (stored_flight > 0)
+                       if (stored_flight != AltosLib.MISSING)
                                max_enabled = false;
                        break;
                }
@@ -592,7 +592,7 @@ public class AltosConfigData {
                dest.set_ignite_mode(ignite_mode);
                dest.set_pad_orientation(pad_orientation);
                dest.set_callsign(callsign);
-               if (npyro > 0)
+               if (npyro != AltosLib.MISSING)
                        dest.set_pyros(pyros);
                else
                        dest.set_pyros(null);
@@ -616,17 +616,17 @@ public class AltosConfigData {
        public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
 
                /* HAS_FLIGHT */
-               if (main_deploy >= 0)
+               if (main_deploy != AltosLib.MISSING)
                        link.printf("c m %d\n", main_deploy);
-               if (apogee_delay >= 0)
+               if (apogee_delay != AltosLib.MISSING)
                        link.printf("c d %d\n", apogee_delay);
-               if (apogee_lockout >= 0)
+               if (apogee_lockout != AltosLib.MISSING)
                        link.printf("c L %d\n", apogee_lockout);
 
                /* HAS_RADIO */
                if (has_frequency()) {
-                       boolean has_frequency = radio_frequency >= 0;
-                       boolean has_setting = radio_setting > 0;
+                       boolean has_frequency = radio_frequency != AltosLib.MISSING;
+                       boolean has_setting = radio_setting != AltosLib.MISSING;
                        double frequency = frequency();
                        link.set_radio_frequency(frequency,
                                                        has_frequency,
@@ -642,7 +642,7 @@ public class AltosConfigData {
                        }
                }
 
-               if (telemetry_rate >= 0) {
+               if (telemetry_rate != AltosLib.MISSING) {
                        link.printf("c T %d\n", telemetry_rate);
                        if (remote) {
                                link.flush_output();
@@ -664,12 +664,12 @@ public class AltosConfigData {
                        }
                }
 
-               if (radio_enable >= 0)
+               if (radio_enable != AltosLib.MISSING)
                        link.printf("c e %d\n", radio_enable);
 
                /* HAS_ACCEL */
                /* UI doesn't support accel cal */
-               if (pad_orientation >= 0)
+               if (pad_orientation != AltosLib.MISSING)
                        link.printf("c o %d\n", pad_orientation);
 
                /* HAS_LOG */
@@ -677,36 +677,36 @@ public class AltosConfigData {
                        link.printf("c l %d\n", flight_log_max);
 
                /* HAS_IGNITE */
-               if (ignite_mode >= 0)
+               if (ignite_mode != AltosLib.MISSING)
                        link.printf("c i %d\n", ignite_mode);
 
                /* HAS_AES */
                /* UI doesn't support AES key config */
 
                /* AO_PYRO_NUM */
-               if (npyro > 0) {
+               if (npyro != AltosLib.MISSING) {
                        for (int p = 0; p < pyros.length; p++) {
                                link.printf("c P %s\n",
                                                   pyros[p].toString());
                        }
                }
-               if (pyro_firing_time >= 0)
+               if (pyro_firing_time != AltosLib.MISSING)
                        link.printf("c I %d\n", (int) (pyro_firing_time * 100.0 + 0.5));
 
                /* HAS_APRS */
-               if (aprs_interval >= 0)
+               if (aprs_interval != AltosLib.MISSING)
                        link.printf("c A %d\n", aprs_interval);
-               if (aprs_ssid >= 0)
+               if (aprs_ssid != AltosLib.MISSING)
                        link.printf("c S %d\n", aprs_ssid);
-               if (aprs_format >= 0)
+               if (aprs_format != AltosLib.MISSING)
                        link.printf("c C %d\n", aprs_format);
 
                /* HAS_BEEP */
-               if (beep >= 0)
+               if (beep != AltosLib.MISSING)
                        link.printf("c b %d\n", beep);
 
                /* HAS_TRACKER */
-               if (tracker_motion >= 0 && tracker_interval >= 0)
+               if (tracker_motion != AltosLib.MISSING && tracker_interval != AltosLib.MISSING)
                        link.printf("c t %d %d\n", tracker_motion, tracker_interval);
 
                /* HAS_GYRO */
index e5f1949..c639dd6 100644 (file)
@@ -193,46 +193,46 @@ public class AltosConfigUI
        }
 
        void set_radio_enable_tool_tip() {
-               if (radio_enable_value.isEnabled())
+               if (radio_enable_value.isVisible())
                        radio_enable_value.setToolTipText("Enable/Disable telemetry and RDF transmissions");
                else
                        radio_enable_value.setToolTipText("Firmware version does not support disabling radio");
        }
 
        void set_rate_tool_tip() {
-               if (rate_value.isEnabled())
+               if (rate_value.isVisible())
                        rate_value.setToolTipText("Select telemetry baud rate");
                else
                        rate_value.setToolTipText("Firmware version does not support variable telemetry rates");
        }
 
        void set_aprs_interval_tool_tip() {
-               if (aprs_interval_value.isEnabled())
+               if (aprs_interval_value.isVisible())
                        aprs_interval_value.setToolTipText("Enable APRS and set the interval between APRS reports");
                else
                        aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
        }
 
        void set_aprs_ssid_tool_tip() {
-               if (aprs_ssid_value.isEnabled())
+               if (aprs_ssid_value.isVisible())
                        aprs_ssid_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
-               else if (aprs_ssid_value.isEnabled())
+               else if (aprs_ssid_value.isVisible())
                        aprs_ssid_value.setToolTipText("Software version doesn't support setting the APRS SSID");
                else
                        aprs_ssid_value.setToolTipText("Hardware doesn't support APRS");
        }
 
        void set_aprs_format_tool_tip() {
-               if (aprs_format_value.isEnabled())
+               if (aprs_format_value.isVisible())
                        aprs_format_value.setToolTipText("Set the APRS format (compressed/uncompressed)");
-               else if (aprs_format_value.isEnabled())
+               else if (aprs_format_value.isVisible())
                        aprs_format_value.setToolTipText("Software version doesn't support setting the APRS format");
                else
                        aprs_format_value.setToolTipText("Hardware doesn't support APRS");
        }
 
        void set_flight_log_max_tool_tip() {
-               if (flight_log_max_value.isEnabled())
+               if (flight_log_max_value.isVisible())
                        flight_log_max_value.setToolTipText("Size reserved for each flight log (in kB)");
                else {
                        if (is_telemini_v1())
@@ -243,14 +243,14 @@ public class AltosConfigUI
        }
 
        void set_ignite_mode_tool_tip() {
-               if (ignite_mode_value.isEnabled())
+               if (ignite_mode_value.isVisible())
                        ignite_mode_value.setToolTipText("Select when igniters will be fired");
                else
                        ignite_mode_value.setToolTipText("Older firmware could not select ignite mode");
        }
 
        void set_pad_orientation_tool_tip() {
-               if (pad_orientation_value.isEnabled())
+               if (pad_orientation_value.isVisible())
                        pad_orientation_value.setToolTipText("How will the computer be mounted in the airframe");
                else {
                        if (is_telemetrum())
@@ -263,7 +263,7 @@ public class AltosConfigUI
        }
 
        void set_beep_tool_tip() {
-               if (beep_value.isEnabled())
+               if (beep_value.isVisible())
                        beep_value.setToolTipText("What frequency the beeper will sound at");
                else
                        beep_value.setToolTipText("Older firmware could not select beeper frequency");
@@ -959,12 +959,10 @@ public class AltosConfigUI
        }
 
        public void set_main_deploy(int new_main_deploy) {
-               main_deploy_value.setSelectedItem(AltosConvert.height.say(new_main_deploy));
-               main_deploy_value.setEnabled(new_main_deploy >= 0);
-
-               main_deploy_value.setVisible(new_main_deploy >= 0);
-               main_deploy_label.setVisible(new_main_deploy >= 0);
-
+               if (new_main_deploy != AltosLib.MISSING)
+                       main_deploy_value.setSelectedItem(AltosConvert.height.say(new_main_deploy));
+               main_deploy_value.setVisible(new_main_deploy != AltosLib.MISSING);
+               main_deploy_label.setVisible(new_main_deploy != AltosLib.MISSING);
        }
 
        public int main_deploy() throws AltosConfigDataException {
@@ -1008,7 +1006,7 @@ public class AltosConfigUI
                } catch (ParseException pe) {
                }
 
-               if (tracker_motion_value.isEnabled()) {
+               if (tracker_motion_value.isVisible()) {
                        String motion = tracker_motion_value.getSelectedItem().toString();
                        tracker_motion_label.setText(get_tracker_motion_label());
                        set_tracker_motion_values();
@@ -1024,11 +1022,10 @@ public class AltosConfigUI
        }
 
        public void set_apogee_delay(int new_apogee_delay) {
-               apogee_delay_value.setVisible(new_apogee_delay >= 0);
-               apogee_delay_label.setVisible(new_apogee_delay >= 0);
-
-               apogee_delay_value.setSelectedItem(Integer.toString(new_apogee_delay));
-               apogee_delay_value.setEnabled(new_apogee_delay >= 0);
+               if (new_apogee_delay != AltosLib.MISSING)
+                       apogee_delay_value.setSelectedItem(Integer.toString(new_apogee_delay));
+               apogee_delay_value.setVisible(new_apogee_delay != AltosLib.MISSING);
+               apogee_delay_label.setVisible(new_apogee_delay != AltosLib.MISSING);
        }
 
        private int parse_int(String name, String s, boolean split) throws AltosConfigDataException {
@@ -1047,11 +1044,11 @@ public class AltosConfigUI
        }
 
        public void set_apogee_lockout(int new_apogee_lockout) {
-               apogee_lockout_value.setSelectedItem(Integer.toString(new_apogee_lockout));
-               apogee_lockout_value.setEnabled(new_apogee_lockout >= 0);
+               if (new_apogee_lockout != AltosLib.MISSING)
+                       apogee_lockout_value.setSelectedItem(Integer.toString(new_apogee_lockout));
 
-               apogee_lockout_value.setVisible(new_apogee_lockout >= 0);
-               apogee_lockout_label.setVisible(new_apogee_lockout >= 0);
+               apogee_lockout_value.setVisible(new_apogee_lockout != AltosLib.MISSING);
+               apogee_lockout_label.setVisible(new_apogee_lockout != AltosLib.MISSING);
        }
 
        public int apogee_lockout() throws AltosConfigDataException {
@@ -1059,8 +1056,10 @@ public class AltosConfigUI
        }
 
        public void set_radio_frequency(double new_radio_frequency) {
-               radio_frequency_label.setVisible(new_radio_frequency >= 0);
-               radio_frequency_value.set_frequency(new_radio_frequency);
+               if (new_radio_frequency != AltosLib.MISSING)
+                       radio_frequency_value.set_frequency(new_radio_frequency);
+               radio_frequency_label.setVisible(new_radio_frequency != AltosLib.MISSING);
+               radio_frequency_value.setVisible(new_radio_frequency != AltosLib.MISSING);
        }
 
        public double radio_frequency() {
@@ -1068,40 +1067,33 @@ public class AltosConfigUI
        }
 
        public void set_radio_calibration(int new_radio_calibration) {
-               radio_calibration_value.setVisible(new_radio_calibration >= 0);
-               radio_calibration_label.setVisible(new_radio_calibration >= 0);
-
-               if (new_radio_calibration < 0)
-                       radio_calibration_value.setText("Disabled");
-               else
+               if (new_radio_calibration != AltosLib.MISSING)
                        radio_calibration_value.setText(String.format("%d", new_radio_calibration));
+               radio_calibration_value.setVisible(new_radio_calibration != AltosLib.MISSING);
+               radio_calibration_label.setVisible(new_radio_calibration != AltosLib.MISSING);
        }
 
        public void set_radio_enable(int new_radio_enable) {
-               radio_enable_label.setVisible(new_radio_enable >= 0);
-               radio_enable_value.setVisible(new_radio_enable >= 0);
-
-               if (new_radio_enable >= 0) {
-                       radio_enable_value.setSelected(new_radio_enable > 0);
-                       radio_enable_value.setEnabled(true);
-               } else {
-                       radio_enable_value.setSelected(true);
-                       radio_enable_value.setEnabled(false);
-               }
+               if (new_radio_enable != AltosLib.MISSING)
+                       radio_enable_value.setSelected(new_radio_enable != 0);
+               radio_enable_label.setVisible(new_radio_enable != AltosLib.MISSING);
+               radio_enable_value.setVisible(new_radio_enable != AltosLib.MISSING);
                set_radio_enable_tool_tip();
        }
 
        public int radio_enable() {
-               if (radio_enable_value.isEnabled())
+               if (radio_enable_value.isVisible())
                        return radio_enable_value.isSelected() ? 1 : 0;
                else
-                       return -1;
+                       return AltosLib.MISSING;
        }
 
        public void set_telemetry_rate(int new_rate) {
-               rate_label.setVisible(new_rate >= 0);
-
-               rate_value.set_rate(new_rate);
+               if (new_rate != AltosLib.MISSING)
+                       rate_value.set_rate(new_rate);
+               rate_label.setVisible(new_rate != AltosLib.MISSING);
+               rate_value.setVisible(new_rate != AltosLib.MISSING);
+               set_rate_tool_tip();
        }
 
        public int telemetry_rate() {
@@ -1109,14 +1101,16 @@ public class AltosConfigUI
        }
 
        public void set_callsign(String new_callsign) {
+               if (new_callsign != null)
+                       callsign_value.setText(new_callsign);
                callsign_value.setVisible(new_callsign != null);
                callsign_label.setVisible(new_callsign != null);
-
-               callsign_value.setText(new_callsign);
        }
 
        public String callsign() {
-               return callsign_value.getText();
+               if (callsign_value.isVisible())
+                       return callsign_value.getText();
+               return null;
        }
 
        int     flight_log_max_limit;
@@ -1133,11 +1127,12 @@ public class AltosConfigUI
        }
 
        public void set_flight_log_max(int new_flight_log_max) {
-               flight_log_max_value.setVisible(new_flight_log_max >= 0);
-               flight_log_max_label.setVisible(new_flight_log_max >= 0);
-
-               flight_log_max_value.setSelectedItem(flight_log_max_label(new_flight_log_max));
-               flight_log_max = new_flight_log_max;
+               if (new_flight_log_max != AltosLib.MISSING) {
+                       flight_log_max_value.setSelectedItem(flight_log_max_label(new_flight_log_max));
+                       flight_log_max = new_flight_log_max;
+               }
+               flight_log_max_value.setVisible(new_flight_log_max != AltosLib.MISSING);
+               flight_log_max_label.setVisible(new_flight_log_max != AltosLib.MISSING);
                set_flight_log_max_tool_tip();
        }
 
@@ -1147,84 +1142,92 @@ public class AltosConfigUI
        }
 
        public int flight_log_max() throws AltosConfigDataException {
-               return parse_int("flight log max", flight_log_max_value.getSelectedItem().toString(), true);
+               if (flight_log_max_value.isVisible())
+                       return parse_int("flight log max", flight_log_max_value.getSelectedItem().toString(), true);
+               return AltosLib.MISSING;
        }
 
        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 = 8; i >= 1; i--) {
-                       int     size = flight_log_max_limit / i;
-                       flight_log_max_value.addItem(String.format("%d (%d flights)", size, i));
+               if (new_flight_log_max_limit != AltosLib.MISSING) {
+                       flight_log_max_value.removeAllItems();
+                       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));
+                       }
                }
                if (flight_log_max != 0)
                        set_flight_log_max(flight_log_max);
        }
 
        public void set_ignite_mode(int new_ignite_mode) {
-               ignite_mode_value.setVisible(new_ignite_mode >= 0);
-               ignite_mode_label.setVisible(new_ignite_mode >= 0);
-
-               if (new_ignite_mode >= ignite_mode_values.length)
-                       new_ignite_mode = 0;
-               if (new_ignite_mode < 0) {
-                       ignite_mode_value.setEnabled(false);
-                       new_ignite_mode = 0;
-               } else {
-                       ignite_mode_value.setEnabled(true);
+               if (new_ignite_mode != AltosLib.MISSING) {
+                       if (new_ignite_mode >= ignite_mode_values.length)
+                               new_ignite_mode = 0;
+                       if (new_ignite_mode < 0) {
+                               ignite_mode_value.setEnabled(false);
+                               new_ignite_mode = 0;
+                       } else {
+                               ignite_mode_value.setEnabled(true);
+                       }
+                       ignite_mode_value.setSelectedIndex(new_ignite_mode);
                }
-               ignite_mode_value.setSelectedIndex(new_ignite_mode);
+               ignite_mode_value.setVisible(new_ignite_mode != AltosLib.MISSING);
+               ignite_mode_label.setVisible(new_ignite_mode != AltosLib.MISSING);
+
                set_ignite_mode_tool_tip();
        }
 
        public int ignite_mode() {
-               if (ignite_mode_value.isEnabled())
+               if (ignite_mode_value.isVisible())
                        return ignite_mode_value.getSelectedIndex();
                else
-                       return -1;
+                       return AltosLib.MISSING;
        }
 
 
        public void set_pad_orientation(int new_pad_orientation) {
-               pad_orientation_value.setVisible(new_pad_orientation >= 0);
-               pad_orientation_label.setVisible(new_pad_orientation >= 0);
-
-               if (new_pad_orientation >= pad_orientation_values.length)
-                       new_pad_orientation = 0;
-               if (new_pad_orientation < 0)
-                       new_pad_orientation = 0;
-               pad_orientation_value.setSelectedIndex(new_pad_orientation);
+               if (new_pad_orientation != AltosLib.MISSING) {
+                       if (new_pad_orientation >= pad_orientation_values.length)
+                               new_pad_orientation = 0;
+                       if (new_pad_orientation < 0)
+                               new_pad_orientation = 0;
+                       pad_orientation_value.setSelectedIndex(new_pad_orientation);
+               }
+               pad_orientation_value.setVisible(new_pad_orientation != AltosLib.MISSING);
+               pad_orientation_label.setVisible(new_pad_orientation != AltosLib.MISSING);
+
                set_pad_orientation_tool_tip();
        }
 
        public int pad_orientation() {
-               if (pad_orientation_value.isEnabled())
+               if (pad_orientation_value.isVisible())
                        return pad_orientation_value.getSelectedIndex();
                else
-                       return -1;
+                       return AltosLib.MISSING;
        }
 
        public void set_beep(int new_beep) {
-               beep_value.setVisible(new_beep >= 0);
-               beep_label.setVisible(new_beep >= 0);
-
-               int new_freq = (int) Math.floor (AltosConvert.beep_value_to_freq(new_beep) + 0.5);
-               for (int i = 0; i < beep_values.length; i++)
-                       if (new_beep == AltosConvert.beep_freq_to_value(Integer.parseInt(beep_values[i]))) {
-                               beep_value.setSelectedIndex(i);
-                               set_beep_tool_tip();
-                               return;
-                       }
-               beep_value.setSelectedItem(String.format("%d", new_freq));
-               beep_value.setEnabled(new_beep >= 0);
+               if (new_beep != AltosLib.MISSING) {
+                       int new_freq = (int) Math.floor (AltosConvert.beep_value_to_freq(new_beep) + 0.5);
+                       for (int i = 0; i < beep_values.length; i++)
+                               if (new_beep == AltosConvert.beep_freq_to_value(Integer.parseInt(beep_values[i]))) {
+                                       beep_value.setSelectedIndex(i);
+                                       set_beep_tool_tip();
+                                       return;
+                               }
+                       beep_value.setSelectedItem(String.format("%d", new_freq));
+               }
+               beep_value.setVisible(new_beep != AltosLib.MISSING);
+               beep_label.setVisible(new_beep != AltosLib.MISSING);
                set_beep_tool_tip();
        }
 
        public int beep() {
-               if (beep_value.isEnabled())
+               if (beep_value.isVisible())
                        return AltosConvert.beep_freq_to_value(Integer.parseInt(beep_value.getSelectedItem().toString()));
                else
-                       return -1;
+                       return AltosLib.MISSING;
        }
 
        String[] tracker_motion_values() {
@@ -1248,58 +1251,53 @@ public class AltosConfigUI
        }
 
        void set_tracker_tool_tip() {
-               if (tracker_motion_value.isEnabled())
+               if (tracker_motion_value.isVisible())
                        tracker_motion_value.setToolTipText("How far the device must move before logging");
                else
                        tracker_motion_value.setToolTipText("This device doesn't disable logging when stationary");
-               if (tracker_interval_value.isEnabled())
+               if (tracker_interval_value.isVisible())
                        tracker_interval_value.setToolTipText("How often to report GPS position");
                else
                        tracker_interval_value.setToolTipText("This device can't configure interval");
        }
 
        public void set_tracker_motion(int tracker_motion) {
-               tracker_motion_label.setVisible(tracker_motion >= 0);
-               tracker_motion_value.setVisible(tracker_motion >= 0);
-
-               if (tracker_motion < 0) {
-                       tracker_motion_value.setEnabled(false);
-               } else {
-                       tracker_motion_value.setEnabled(true);
+               if (tracker_motion != AltosLib.MISSING)
                        tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
-               }
+               tracker_motion_label.setVisible(tracker_motion != AltosLib.MISSING);
+               tracker_motion_value.setVisible(tracker_motion != AltosLib.MISSING);
        }
 
        public int tracker_motion() throws AltosConfigDataException {
-               String str = tracker_motion_value.getSelectedItem().toString();
-               try {
-                       return (int) (AltosConvert.height.parse_locale(str) + 0.5);
-               } catch (ParseException pe) {
-                       throw new AltosConfigDataException("invalid tracker motion %s", str);
+               if (tracker_motion_value.isVisible()) {
+                       String str = tracker_motion_value.getSelectedItem().toString();
+                       try {
+                               return (int) (AltosConvert.height.parse_locale(str) + 0.5);
+                       } catch (ParseException pe) {
+                               throw new AltosConfigDataException("invalid tracker motion %s", str);
+                       }
                }
+               return AltosLib.MISSING;
        }
 
        public void set_tracker_interval(int tracker_interval) {
-               tracker_interval_label.setVisible(tracker_interval >= 0);
-               tracker_interval_value.setVisible(tracker_interval >= 0);
-
-               if (tracker_interval< 0) {
-                       tracker_interval_value.setEnabled(false);
-               } else {
-                       tracker_interval_value.setEnabled(true);
+               if (tracker_interval != AltosLib.MISSING)
                        tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
-               }
+               tracker_interval_label.setVisible(tracker_interval != AltosLib.MISSING);
+               tracker_interval_value.setVisible(tracker_interval != AltosLib.MISSING);
        }
 
        public int tracker_interval() throws AltosConfigDataException {
-               return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false);
+               if (tracker_interval_value.isVisible())
+                       return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false);
+               return AltosLib.MISSING;
        }
 
        public void set_pyros(AltosPyro[] new_pyros) {
                pyros = new_pyros;
-               pyro.setVisible(pyros != null);
                if (pyros != null && pyro_ui != null)
                        pyro_ui.set_pyros(pyros);
+               pyro.setVisible(pyros != null);
        }
 
        public AltosPyro[] pyros() throws AltosConfigDataException {
@@ -1310,9 +1308,9 @@ public class AltosConfigUI
 
        public void set_pyro_firing_time(double new_pyro_firing_time) {
                pyro_firing_time = new_pyro_firing_time;
-               pyro.setVisible(pyro_firing_time >= 0);
-               if (pyro_firing_time >= 0 && pyro_ui != null)
+               if (pyro_firing_time != AltosLib.MISSING && pyro_ui != null)
                        pyro_ui.set_pyro_firing_time(pyro_firing_time);
+               pyro.setVisible(pyro_firing_time != AltosLib.MISSING);
        }
 
        public double pyro_firing_time() throws AltosConfigDataException {
@@ -1322,49 +1320,49 @@ public class AltosConfigUI
        }
 
        public void set_aprs_interval(int new_aprs_interval) {
-               aprs_interval_value.setVisible(new_aprs_interval >= 0);
-               aprs_interval_label.setVisible(new_aprs_interval >= 0);
-
-               String  s;
-
-               if (new_aprs_interval <= 0)
-                       s = "Disabled";
-               else
-                       s = Integer.toString(new_aprs_interval);
-               aprs_interval_value.setSelectedItem(s);
+               if (new_aprs_interval != AltosLib.MISSING)
+                       aprs_interval_value.setSelectedItem(Integer.toString(new_aprs_interval));
+               aprs_interval_value.setVisible(new_aprs_interval != AltosLib.MISSING);
+               aprs_interval_label.setVisible(new_aprs_interval != AltosLib.MISSING);
                set_aprs_interval_tool_tip();
        }
 
        public int aprs_interval() throws AltosConfigDataException {
-               String  s = aprs_interval_value.getSelectedItem().toString();
+               if (aprs_interval_value.isVisible()) {
+                       String  s = aprs_interval_value.getSelectedItem().toString();
 
-               if (s.equals("Disabled"))
-                       return 0;
-               return parse_int("aprs interval", s, false);
+                       return parse_int("aprs interval", s, false);
+               }
+               return AltosLib.MISSING;
        }
 
        public void set_aprs_ssid(int new_aprs_ssid) {
-               aprs_ssid_value.setVisible(new_aprs_ssid >= 0);
-               aprs_ssid_label.setVisible(new_aprs_ssid >= 0);
-
-               aprs_ssid_value.setSelectedItem(Math.max(0,new_aprs_ssid));
+               if (new_aprs_ssid != AltosLib.MISSING)
+                       aprs_ssid_value.setSelectedItem(new_aprs_ssid);
+               aprs_ssid_value.setVisible(new_aprs_ssid != AltosLib.MISSING);
+               aprs_ssid_label.setVisible(new_aprs_ssid != AltosLib.MISSING);
                set_aprs_ssid_tool_tip();
        }
 
        public int aprs_ssid() throws AltosConfigDataException {
-               Integer i = (Integer) aprs_ssid_value.getSelectedItem();
-               return i;
+               if (aprs_ssid_value.isVisible()) {
+                       Integer i = (Integer) aprs_ssid_value.getSelectedItem();
+                       return i;
+               }
+               return AltosLib.MISSING;
        }
 
        public void set_aprs_format(int new_aprs_format) {
-               aprs_format_value.setVisible(new_aprs_format >= 0);
-               aprs_format_label.setVisible(new_aprs_format >= 0);
-
-               aprs_format_value.setSelectedIndex(Math.max(0,new_aprs_format));
+               if (new_aprs_format != AltosLib.MISSING)
+                       aprs_format_value.setSelectedIndex(new_aprs_format);
+               aprs_format_value.setVisible(new_aprs_format != AltosLib.MISSING);
+               aprs_format_label.setVisible(new_aprs_format != AltosLib.MISSING);
                set_aprs_format_tool_tip();
        }
 
        public int aprs_format() throws AltosConfigDataException {
-               return aprs_format_value.getSelectedIndex();
+               if (aprs_format_value.isVisible())
+                       return aprs_format_value.getSelectedIndex();
+               return AltosLib.MISSING;
        }
 }
index 15493b8..fe6194e 100644 (file)
@@ -213,6 +213,8 @@ public class AltosIgniteUI
                        fired();
                } else if (reply.startsWith("npyro")) {
                        npyro = Integer.parseInt(reply.substring(6));
+                       if (npyro == AltosLib.MISSING)
+                               npyro = 0;
                        make_ui();
                }
        }
@@ -255,15 +257,11 @@ public class AltosIgniteUI
 
        boolean getting_status = false;
 
-       boolean visible = false;
-
        void set_ignite_status() {
                getting_status = false;
                poll_remaining = 2;
-               if (!visible) {
-                       visible = true;
+               if (!isVisible())
                        setVisible(true);
-               }
        }
 
        void poll_ignite_status() {
index 187977d..7bdd3f7 100644 (file)
@@ -27,10 +27,9 @@ public class AltosUIRateList extends JComboBox<String> {
        int     serial;
 
        public void set_rate(int new_rate) {
-               int i;
-
-               setVisible(new_rate >= 0);
-               setSelectedIndex(new_rate);
+               if (new_rate != AltosLib.MISSING)
+                       setSelectedIndex(new_rate);
+               setVisible(new_rate != AltosLib.MISSING);
        }
 
        public void set_product(String new_product) {
index dd3965b..a68c82c 100644 (file)
@@ -131,7 +131,7 @@ public class TeleGPSConfigUI
        }
 
        public double pyro_firing_time() {
-               return -1;
+               return AltosLib.MISSING;
        }
 
        boolean is_telemetrum() {
@@ -140,46 +140,46 @@ public class TeleGPSConfigUI
        }
 
        void set_radio_enable_tool_tip() {
-               if (radio_enable_value.isEnabled())
+               if (radio_enable_value.isVisible())
                        radio_enable_value.setToolTipText("Enable/Disable telemetry and RDF transmissions");
                else
                        radio_enable_value.setToolTipText("Firmware version does not support disabling radio");
        }
 
        void set_rate_tool_tip() {
-               if (rate_value.isEnabled())
+               if (rate_value.isVisible())
                        rate_value.setToolTipText("Select telemetry baud rate");
                else
                        rate_value.setToolTipText("Firmware version does not support variable telemetry rates");
        }
 
        void set_aprs_interval_tool_tip() {
-               if (aprs_interval_value.isEnabled())
+               if (aprs_interval_value.isVisible())
                        aprs_interval_value.setToolTipText("Enable APRS and set the interval between APRS reports");
                else
                        aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
        }
 
        void set_aprs_ssid_tool_tip() {
-               if (aprs_ssid_value.isEnabled())
+               if (aprs_ssid_value.isVisible())
                        aprs_ssid_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
-               else if (aprs_ssid_value.isEnabled())
+               else if (aprs_ssid_value.isVisible())
                        aprs_ssid_value.setToolTipText("Software version doesn't support setting the APRS SSID");
                else
                        aprs_ssid_value.setToolTipText("Hardware doesn't support APRS");
        }
 
        void set_aprs_format_tool_tip() {
-               if (aprs_format_value.isEnabled())
+               if (aprs_format_value.isVisible())
                        aprs_format_value.setToolTipText("Set the APRS format (compressed/uncompressed)");
-               else if (aprs_format_value.isEnabled())
+               else if (aprs_format_value.isVisible())
                        aprs_format_value.setToolTipText("Software version doesn't support setting the APRS format");
                else
                        aprs_format_value.setToolTipText("Hardware doesn't support APRS");
        }
 
        void set_flight_log_max_tool_tip() {
-               if (flight_log_max_value.isEnabled())
+               if (flight_log_max_value.isVisible())
                        flight_log_max_value.setToolTipText("Size reserved for each flight log (in kB)");
                else
                        flight_log_max_value.setToolTipText("Cannot set max value with flight logs in memory");
@@ -675,7 +675,7 @@ public class TeleGPSConfigUI
        public void units_changed(boolean imperial_units) {
                boolean was_dirty = dirty;
 
-               if (tracker_motion_value.isEnabled()) {
+               if (tracker_motion_value.isVisible()) {
                        String motion = tracker_motion_value.getSelectedItem().toString();
                        tracker_motion_label.setText(get_tracker_motion_label());
                        set_tracker_motion_values();
@@ -712,21 +712,24 @@ public class TeleGPSConfigUI
        }
 
        public int main_deploy() {
-               return -1;
+               return AltosLib.MISSING;
        }
 
        public void set_apogee_delay(int new_apogee_delay) { }
 
        public int apogee_delay() {
-               return -1;
+               return AltosLib.MISSING;
        }
 
        public void set_apogee_lockout(int new_apogee_lockout) { }
 
-       public int apogee_lockout() { return -1; }
+       public int apogee_lockout() { return AltosLib.MISSING; }
 
        public void set_radio_frequency(double new_radio_frequency) {
-               radio_frequency_value.set_frequency(new_radio_frequency);
+               if (new_radio_frequency != AltosLib.MISSING)
+                       radio_frequency_value.set_frequency(new_radio_frequency);
+               radio_frequency_label.setVisible(new_radio_frequency != AltosLib.MISSING);
+               radio_frequency_value.setVisible(new_radio_frequency != AltosLib.MISSING);
        }
 
        public double radio_frequency() {
@@ -734,45 +737,32 @@ public class TeleGPSConfigUI
        }
 
        public void set_radio_calibration(int new_radio_calibration) {
-               radio_calibration_value.setVisible(new_radio_calibration >= 0);
-               if (new_radio_calibration < 0)
-                       radio_calibration_value.setText("Disabled");
-               else
+               if (new_radio_calibration != AltosLib.MISSING)
                        radio_calibration_value.setText(String.format("%d", new_radio_calibration));
-       }
-
-       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);
-               }
+               radio_calibration_value.setVisible(new_radio_calibration == AltosLib.MISSING);
+               radio_calibration_label.setVisible(new_radio_calibration == AltosLib.MISSING);
        }
 
        public void set_radio_enable(int new_radio_enable) {
-               if (new_radio_enable >= 0) {
-                       radio_enable_value.setSelected(new_radio_enable > 0);
-                       radio_enable_value.setEnabled(true);
-               } else {
-                       radio_enable_value.setSelected(true);
-                       radio_enable_value.setVisible(radio_frequency() > 0);
-                       radio_enable_value.setEnabled(false);
-               }
+               if (new_radio_enable != AltosLib.MISSING)
+                       radio_enable_value.setSelected(new_radio_enable != 0);
+               radio_enable_label.setVisible(new_radio_enable != AltosLib.MISSING);
+               radio_enable_value.setVisible(new_radio_enable != AltosLib.MISSING);
                set_radio_enable_tool_tip();
        }
 
        public int radio_enable() {
-               if (radio_enable_value.isEnabled())
+               if (radio_enable_value.isVisible())
                        return radio_enable_value.isSelected() ? 1 : 0;
                else
-                       return -1;
+                       return AltosLib.MISSING;
        }
 
        public void set_telemetry_rate(int new_rate) {
-               rate_value.set_rate(new_rate);
+               if (new_rate != AltosLib.MISSING)
+                       rate_value.set_rate(new_rate);
+               rate_label.setVisible(new_rate != AltosLib.MISSING);
+               rate_value.setVisible(new_rate != AltosLib.MISSING);
        }
 
        public int telemetry_rate() {
@@ -780,12 +770,27 @@ public class TeleGPSConfigUI
        }
 
        public void set_callsign(String new_callsign) {
+               if (new_callsign != null)
+                       callsign_value.setText(new_callsign);
                callsign_value.setVisible(new_callsign != null);
-               callsign_value.setText(new_callsign);
+               callsign_label.setVisible(new_callsign != null);
        }
 
        public String callsign() {
-               return callsign_value.getText();
+               if (callsign_value.isVisible())
+                       return callsign_value.getText();
+               return null;
+       }
+
+       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);
+               }
        }
 
        int     flight_log_max_limit;
@@ -828,15 +833,15 @@ public class TeleGPSConfigUI
        }
 
        public void set_ignite_mode(int new_ignite_mode) { }
-       public int ignite_mode() { return -1; }
+       public int ignite_mode() { return AltosLib.MISSING; }
 
 
        public void set_pad_orientation(int new_pad_orientation) { }
-       public int pad_orientation() { return -1; }
+       public int pad_orientation() { return AltosLib.MISSING; }
 
        public void set_beep(int new_beep) { }
 
-       public int beep() { return -1; }
+       public int beep() { return AltosLib.MISSING; }
 
        String[] tracker_motion_values() {
                if (AltosConvert.imperial_units)
@@ -859,87 +864,92 @@ public class TeleGPSConfigUI
        }
 
        void set_tracker_tool_tip() {
-               if (tracker_motion_value.isEnabled())
+               if (tracker_motion_value.isVisible())
                        tracker_motion_value.setToolTipText("How far the device must move before logging");
                else
                        tracker_motion_value.setToolTipText("This device doesn't disable logging when stationary");
-               if (tracker_interval_value.isEnabled())
+               if (tracker_interval_value.isVisible())
                        tracker_interval_value.setToolTipText("How often to report GPS position");
                else
                        tracker_interval_value.setToolTipText("This device can't configure interval");
        }
 
        public void set_tracker_motion(int tracker_motion) {
-               if (tracker_motion < 0) {
-                       tracker_motion_value.setEnabled(false);
-               } else {
-                       tracker_motion_value.setEnabled(true);
+               if (tracker_motion != AltosLib.MISSING)
                        tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion));
-               }
+               tracker_motion_label.setVisible(tracker_motion != AltosLib.MISSING);
+               tracker_motion_value.setVisible(tracker_motion != AltosLib.MISSING);
        }
 
        public int tracker_motion() throws AltosConfigDataException {
-               String str = tracker_motion_value.getSelectedItem().toString();
-               try {
-                       return (int) (AltosConvert.height.parse_locale(str) + 0.5);
-               } catch (ParseException pe) {
-                       throw new AltosConfigDataException("invalid tracker motion %s", str);
+               if (tracker_motion_value.isVisible()) {
+                       String str = tracker_motion_value.getSelectedItem().toString();
+                       try {
+                               return (int) (AltosConvert.height.parse_locale(str) + 0.5);
+                       } catch (ParseException pe) {
+                               throw new AltosConfigDataException("invalid tracker motion %s", str);
+                       }
                }
+               return AltosLib.MISSING;
        }
 
        public void set_tracker_interval(int tracker_interval) {
-               if (tracker_interval< 0) {
-                       tracker_interval_value.setEnabled(false);
-               } else {
-                       tracker_interval_value.setEnabled(true);
+               if (tracker_interval != AltosLib.MISSING)
                        tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval));
-               }
+               tracker_interval_label.setVisible(tracker_interval != AltosLib.MISSING);
+               tracker_interval_value.setVisible(tracker_interval != AltosLib.MISSING);
        }
 
        public int tracker_interval() throws AltosConfigDataException {
-               return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false);
+               if (tracker_interval_value.isVisible())
+                       return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false);
+               return AltosLib.MISSING;
        }
 
        public void set_aprs_interval(int new_aprs_interval) {
-               String  s;
-
-               if (new_aprs_interval <= 0)
-                       s = "Disabled";
-               else
-                       s = Integer.toString(new_aprs_interval);
-               aprs_interval_value.setSelectedItem(s);
-               aprs_interval_value.setVisible(new_aprs_interval >= 0);
+               if (new_aprs_interval != AltosLib.MISSING)
+                       aprs_interval_value.setSelectedItem(Integer.toString(new_aprs_interval));
+               aprs_interval_value.setVisible(new_aprs_interval != AltosLib.MISSING);
+               aprs_interval_label.setVisible(new_aprs_interval != AltosLib.MISSING);
                set_aprs_interval_tool_tip();
        }
 
        public int aprs_interval() throws AltosConfigDataException {
-               String  s = aprs_interval_value.getSelectedItem().toString();
+               if (aprs_interval_value.isVisible()) {
+                       String  s = aprs_interval_value.getSelectedItem().toString();
 
-               if (s.equals("Disabled"))
-                       return 0;
-               return parse_int("aprs interval", s, false);
+                       return parse_int("aprs interval", s, false);
+               }
+               return AltosLib.MISSING;
        }
 
        public void set_aprs_ssid(int new_aprs_ssid) {
-               aprs_ssid_value.setSelectedItem(Math.max(0,new_aprs_ssid));
-               aprs_ssid_value.setVisible(new_aprs_ssid >= 0);
+               if (new_aprs_ssid != AltosLib.MISSING)
+                       aprs_ssid_value.setSelectedItem(new_aprs_ssid);
+               aprs_ssid_value.setVisible(new_aprs_ssid != AltosLib.MISSING);
+               aprs_ssid_label.setVisible(new_aprs_ssid != AltosLib.MISSING);
                set_aprs_ssid_tool_tip();
        }
 
        public int aprs_ssid() throws AltosConfigDataException {
-               Integer i = (Integer) aprs_ssid_value.getSelectedItem();
-               return i;
+               if (aprs_ssid_value.isVisible()) {
+                       Integer i = (Integer) aprs_ssid_value.getSelectedItem();
+                       return i;
+               }
+               return AltosLib.MISSING;
        }
 
        public void set_aprs_format(int new_aprs_format) {
-               aprs_format_value.setVisible(new_aprs_format >= 0);
-               aprs_format_label.setVisible(new_aprs_format >= 0);
-
-               aprs_format_value.setSelectedIndex(Math.max(0,new_aprs_format));
+               if (new_aprs_format != AltosLib.MISSING)
+                       aprs_format_value.setSelectedIndex(new_aprs_format);
+               aprs_format_value.setVisible(new_aprs_format != AltosLib.MISSING);
+               aprs_format_label.setVisible(new_aprs_format != AltosLib.MISSING);
                set_aprs_format_tool_tip();
        }
 
        public int aprs_format() throws AltosConfigDataException {
-               return aprs_format_value.getSelectedIndex();
+               if (aprs_format_value.isVisible())
+                       return aprs_format_value.getSelectedIndex();
+               return AltosLib.MISSING;
        }
 }