X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosUIAccelCal.java;h=af72a21d4b4af5314e06bd7f6277bc9e7acf65d5;hb=debian;hp=7ca8ea8292fb589f36a0c9a810024cc23ba5243d;hpb=ec46adee44ea08120b1940ca55a5fbdf56874bb1;p=fw%2Faltos

diff --git a/altosuilib/AltosUIAccelCal.java b/altosuilib/AltosUIAccelCal.java
index 7ca8ea82..ae8d6246 100644
--- a/altosuilib/AltosUIAccelCal.java
+++ b/altosuilib/AltosUIAccelCal.java
@@ -81,14 +81,14 @@ public class AltosUIAccelCal
 				public void run() {
 					switch (phase) {
 					case AltosAccelCal.phase_antenna_up:
-						message.setText("Orient antenna upwards and click on Antenna Up");
+						message.setText(String.format ("Orient antenna upwards and click on %s", up_msg()));
 						antenna_up.setEnabled(true);
 						setDefaultButton(antenna_up);
 						antenna_down.setEnabled(false);
 						ok.setEnabled(false);
 						break;
 					case AltosAccelCal.phase_antenna_down:
-						message.setText("Orient antenna downwards and click on Antenna Down");
+						message.setText(String.format("Orient antenna downwards and click on %s", down_msg()));
 						antenna_up.setEnabled(false);
 						antenna_down.setEnabled(true);
 						setDefaultButton(antenna_down);
@@ -157,6 +157,10 @@ public class AltosUIAccelCal
 			}
 		}
 	}
+
+	public String up_msg() { return config_values.has_radio() ? "Antenna Up" : "Beeper Up"; }
+	public String down_msg() { return config_values.has_radio() ? "Antenna Down" : "Beeper Down"; }
+
 	public AltosUIAccelCal(Frame owner, AltosLink link, AltosConfigValues config_values) {
 		super(owner, "Calibrate Accelerometer", true);
 
@@ -164,7 +168,7 @@ public class AltosUIAccelCal
 		this.link = link;
 		this.config_values = config_values;
 
-		pane = getContentPane();
+		pane = getScrollablePane();
 		pane.setLayout(new GridBagLayout());
 
 		GridBagConstraints c = new GridBagConstraints();
@@ -193,7 +197,7 @@ public class AltosUIAccelCal
 		c.gridheight = 1;
 		c.weightx = 0;
 		c.weighty = 0;
-		antenna_up = new JButton("Antenna Up");
+		antenna_up = new JButton(up_msg());
 		antenna_up.setActionCommand("up");
 		antenna_up.setEnabled(false);
 		antenna_up.addActionListener(this);
@@ -208,7 +212,7 @@ public class AltosUIAccelCal
 		c.gridheight = 1;
 		c.weightx = 0;
 		c.weighty = 0;
-		antenna_down = new JButton("Antenna Down");
+		antenna_down = new JButton(down_msg());
 		antenna_down.setActionCommand("down");
 		antenna_down.setEnabled(false);
 		antenna_down.addActionListener(this);