X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosAccelCal.java;h=be5497a36690e85f080775bae3cc0beef07a73cf;hp=75592d9e1b87c393708f801c9c68c91f18677956;hb=9ea50f00039c812ea6a4a4235d78c140a0252662;hpb=b3474fb33a58e78b3b8f36958dd44768e49f3edc

diff --git a/altoslib/AltosAccelCal.java b/altoslib/AltosAccelCal.java
index 75592d9e..be5497a3 100644
--- a/altoslib/AltosAccelCal.java
+++ b/altoslib/AltosAccelCal.java
@@ -16,7 +16,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -174,23 +174,23 @@ public class AltosAccelCal implements Runnable {
 				if (worked)
 					new_config = new AltosConfigData(link);
 			} finally {
+				int plus = config_data.accel_cal_plus(config_data.pad_orientation);
+				int minus = config_data.accel_cal_minus(config_data.pad_orientation);
 				System.out.printf("Restore orientation %d +g %d -g %d\n",
 						  config_data.pad_orientation,
-						  config_data.accel_cal_plus,
-						  config_data.accel_cal_minus);
-				if (config_data.pad_orientation != AltosLib.MISSING && config_data.pad_orientation != 0)
+						  plus, minus);
+				if (config_data.pad_orientation != AltosLib.MISSING)
 					link.printf("c o %d\n", config_data.pad_orientation);
-				if (config_data.accel_cal_plus != AltosLib.MISSING && config_data.accel_cal_minus != AltosLib.MISSING)
-					link.printf("c a %d %d\n",
-						    config_data.accel_cal_plus, config_data.accel_cal_minus);
+				if (plus != AltosLib.MISSING && minus != AltosLib.MISSING)
+					link.printf("c a %d %d\n", plus, minus);
 				link.flush_output();
 				stop_link();
 			}
 			if (new_config != null) {
-				System.out.printf("*** +1g %d -1g %d\n",
-						  new_config.accel_cal_plus,
-						  new_config.accel_cal_minus);
-				listener.cal_done(this, new_config.accel_cal_plus, new_config.accel_cal_minus);
+				int plus = new_config.accel_cal_plus(AltosLib.AO_PAD_ORIENTATION_ANTENNA_UP);
+				int minus = new_config.accel_cal_minus(AltosLib.AO_PAD_ORIENTATION_ANTENNA_UP);
+				System.out.printf("*** +1g %d -1g %d\n", plus, minus);
+				listener.cal_done(this, plus, minus);
 				if (!wait_signal())
 					throw new InterruptedException("aborted");
 			} else