X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=dc036867047cf278432aa99b7b35be0ccb244d6f;hp=c39a6c94680e6683907088e11b5c1685d898cd03;hb=cfc09e8f1f263595972cbb6af23f22e2d749c744;hpb=171adbe7db8520f5ff52a5fe2c54fe165c6f91f8

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index c39a6c94..dc036867 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.util.*;
 import java.text.*;
@@ -405,7 +405,7 @@ public class AltosConfigData {
 
 		/* HAS_GYRO */
 		try {
-			if (line.startsWith("IMU call along")) {
+			if (line.startsWith("IMU cal along")) {
 				String[] bits = line.split("\\s+");
 				if (bits.length >= 8) {
 					accel_zero_along = Integer.parseInt(bits[3]);
@@ -451,8 +451,7 @@ public class AltosConfigData {
 			radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
 			radio_channel = AltosLib.MISSING;
 		} else if (setting != AltosLib.MISSING) {
-			radio_setting =AltosConvert.radio_frequency_to_setting(freq,
-										    radio_calibration);
+			radio_setting =AltosConvert.radio_frequency_to_setting(freq, radio_calibration);
 			radio_channel = AltosLib.MISSING;
 		} else {
 			radio_channel = AltosConvert.radio_frequency_to_channel(freq);
@@ -463,12 +462,12 @@ public class AltosConfigData {
 		int	channel = radio_channel;
 		int	setting = radio_setting;
 
-		if (radio_frequency < 0 && channel < 0 && setting < 0)
+		if (radio_frequency == AltosLib.MISSING && channel == AltosLib.MISSING && setting == AltosLib.MISSING)
 			return AltosLib.MISSING;
 
-		if (channel < 0)
+		if (channel == AltosLib.MISSING)
 			channel = 0;
-		if (setting < 0)
+		if (setting == AltosLib.MISSING)
 			setting = 0;
 
 		return AltosConvert.radio_to_frequency(radio_frequency,
@@ -489,14 +488,16 @@ public class AltosConfigData {
 
 
 	public boolean mma655x_inverted() throws AltosUnknownProduct {
-		if (product.startsWith("EasyMega-v1"))
-			return false;
-		if (product.startsWith("TeleMetrum-v2"))
-			return true;
-		if (product.startsWith("TeleMega-v2"))
-			return false;
-		if (product.startsWith("TeleMega-v1"))
-			return false;
+		if (product != null) {
+			if (product.startsWith("EasyMega-v1"))
+				return false;
+			if (product.startsWith("TeleMetrum-v2"))
+				return true;
+			if (product.startsWith("TeleMega-v2"))
+				return false;
+			if (product.startsWith("TeleMega-v1"))
+				return false;
+		}
 		throw new AltosUnknownProduct(product);
 	}
 
@@ -524,6 +525,12 @@ public class AltosConfigData {
 		if (pad_orientation != AltosLib.MISSING)
 			pad_orientation = source.pad_orientation();
 
+		if (accel_cal_plus != AltosLib.MISSING)
+			accel_cal_plus = source.accel_cal_plus();
+
+		if (accel_cal_minus != AltosLib.MISSING)
+			accel_cal_minus = source.accel_cal_minus();
+
 		/* HAS_LOG */
 		if (flight_log_max != AltosLib.MISSING)
 			flight_log_max = source.flight_log_max();
@@ -591,6 +598,7 @@ public class AltosConfigData {
 		dest.set_flight_log_max(flight_log_max);
 		dest.set_ignite_mode(ignite_mode);
 		dest.set_pad_orientation(pad_orientation);
+		dest.set_accel_cal(accel_cal_plus, accel_cal_minus);
 		dest.set_callsign(callsign);
 		if (npyro != AltosLib.MISSING)
 			dest.set_pyros(pyros);
@@ -668,9 +676,10 @@ public class AltosConfigData {
 			link.printf("c e %d\n", radio_enable);
 
 		/* HAS_ACCEL */
-		/* UI doesn't support accel cal */
 		if (pad_orientation != AltosLib.MISSING)
 			link.printf("c o %d\n", pad_orientation);
+		if (accel_cal_plus != AltosLib.MISSING && accel_cal_minus != AltosLib.MISSING)
+			link.printf("c a %d %d\n", accel_cal_plus, accel_cal_minus);
 
 		/* HAS_LOG */
 		if (flight_log_max != 0)