X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigFCUI.java;h=39752b1dd771f8eaa8e67d5cb072768c28c820f8;hb=88e279b15b3d2357f142e58d20d73c24bf2561eb;hp=3fe6cf94b0b0bb6352b914e04a04c65280a26728;hpb=558a143315f0345b79cc4f22aa4b643fedcded9c;p=fw%2Faltos

diff --git a/altosui/AltosConfigFCUI.java b/altosui/AltosConfigFCUI.java
index 3fe6cf94..39752b1d 100644
--- a/altosui/AltosConfigFCUI.java
+++ b/altosui/AltosConfigFCUI.java
@@ -23,8 +23,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.text.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 public class AltosConfigFCUI
 	extends AltosUIDialog
@@ -440,7 +440,7 @@ public class AltosConfigFCUI
 		apogee_lockout_value.setEditable(true);
 		apogee_lockout_value.addItemListener(this);
 		pane.add(apogee_lockout_value, c);
-		apogee_lockout_value.setToolTipText("Time after boost while apogee detection is locked out");
+		apogee_lockout_value.setToolTipText("Time after launch while apogee detection is locked out");
 		row++;
 
 		/* Frequency */
@@ -954,13 +954,11 @@ public class AltosConfigFCUI
 	}
 
 	public void set_dirty() {
-		System.out.printf("set dirty\n");
 		dirty = true;
 		save.setEnabled(true);
 	}
 
 	public void set_clean() {
-		System.out.printf("set clean\n");
 		dirty = false;
 		save.setEnabled(false);
 	}
@@ -1429,20 +1427,29 @@ public class AltosConfigFCUI
 		return pyro_firing_time;
 	}
 
+	private String aprs_interval_string(int interval) {
+		if (interval == 0)
+			return "Disabled";
+		return Integer.toString(interval);
+	}
+
+	private int aprs_interval_value(String interval) throws AltosConfigDataException {
+		if (interval.equalsIgnoreCase("Disabled"))
+			return 0;
+		return parse_int("aprs interval", interval, false);
+	}
+
 	public void set_aprs_interval(int new_aprs_interval) {
 		if (new_aprs_interval != AltosLib.MISSING)
-			aprs_interval_value.setSelectedItem(Integer.toString(new_aprs_interval));
+			aprs_interval_value.setSelectedItem(aprs_interval_string(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 {
-		if (aprs_interval_value.isVisible()) {
-			String	s = aprs_interval_value.getSelectedItem().toString();
-
-			return parse_int("aprs interval", s, false);
-		}
+		if (aprs_interval_value.isVisible())
+			return aprs_interval_value(aprs_interval_value.getSelectedItem().toString());
 		return AltosLib.MISSING;
 	}