Merge branch 'new-packet-format' of ssh://git.gag.com/scm/git/fw/altos into new-package-format

1 files changed, 20 insertions, 1 deletions

diff --git a/ao-tools/altosui/AltosRomconfigUI.java b/ao-tools/altosui/AltosRomconfigUI.java
index 21c34ef4..bc511865 100644
--- a/ao-tools/altosui/AltosRomconfigUI.java
+++ b/ao-tools/altosui/AltosRomconfigUI.java
@@ -143,12 +143,31 @@ public class AltosRomconfigUI
 		return Integer.parseInt(serial_value.getText());
 	}
 
+	void set_serial(int serial) {
+		serial_value.setText(String.format("%d", serial));
+	}
+
 	int radio_calibration() {
 		return Integer.parseInt(radio_calibration_value.getText());
 	}
 
+	void set_radio_calibration(int calibration) {
+		radio_calibration_value.setText(String.format("%d", calibration));
+	}
+
+	public void set(AltosRomconfig config) {
+		if (config != null && config.valid()) {
+			set_serial(config.serial_number);
+			set_radio_calibration(config.radio_calibration);
+		}
+	}
+
 	public AltosRomconfig romconfig() {
-		return new AltosRomconfig(serial(), radio_calibration());
+		try {
+			return new AltosRomconfig(serial(), radio_calibration());
+		} catch (NumberFormatException ne) {
+			return null;
+		}
 	}
 
 	public AltosRomconfig showDialog() {