X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=ea7b63fa5813e963eabc60786258135c785ae8e0;hb=3af81a45be69b4693396de4a5e2c386be566b933;hp=83f3ca07a55dfd35b3541dc70e6c239ae0203ec3;hpb=10a10667a28f82c24d895e44617e68c7c1848c45;p=fw%2Faltos

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 83f3ca07..ea7b63fa 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -202,11 +202,14 @@ public class AltosConfigData {
 		case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
-		case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
 			return 4095 - value;
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
 		case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
+		case AltosLib.AO_LOG_FORMAT_EASYMOTOR:
 			return -value;
 		default:
+			if (product.startsWith("EasyTimer-"))
+				return -value;
 			return AltosLib.MISSING;
 		}
 	}
@@ -318,6 +321,9 @@ public class AltosConfigData {
 	/* Return + accel calibration relative to a specific pad orientation */
 	public int accel_cal_plus(int pad_orientation) {
 		adjust_accel_cal();
+		if (!accel_cal_adjusted)
+			return AltosLib.MISSING;
+
 		switch (pad_orientation) {
 		case AltosLib.AO_PAD_ORIENTATION_ANTENNA_UP:
 		case AltosLib.AO_PAD_ORIENTATION_WORDS_UPRIGHT:
@@ -335,6 +341,9 @@ public class AltosConfigData {
 	/* Return - accel calibration relative to a specific pad orientation */
 	public int accel_cal_minus(int pad_orientation) {
 		adjust_accel_cal();
+		if (!accel_cal_adjusted)
+			return AltosLib.MISSING;
+
 		switch (pad_orientation) {
 		case AltosLib.AO_PAD_ORIENTATION_ANTENNA_UP:
 		case AltosLib.AO_PAD_ORIENTATION_WORDS_UPRIGHT:
@@ -354,10 +363,10 @@ public class AltosConfigData {
 	 */
 	private void adjust_accel_cal() {
 		if (!accel_cal_adjusted &&
+		    product != null &&
 		    pad_orientation != AltosLib.MISSING &&
 		    accel_cal_plus != AltosLib.MISSING &&
-		    accel_cal_minus != AltosLib.MISSING &&
-		    log_format != AltosLib.AO_LOG_FORMAT_UNKNOWN)
+		    accel_cal_minus != AltosLib.MISSING)
 		{
 			switch (pad_orientation) {
 			case AltosLib.AO_PAD_ORIENTATION_ANTENNA_UP:
@@ -536,9 +545,6 @@ public class AltosConfigData {
 				}
 			}
 		} catch (Exception e) {}
-
-		/* Fix accel cal as soon as all of the necessary values appear */
-		adjust_accel_cal();
 	}
 
 	public AltosConfigData() {
@@ -636,6 +642,8 @@ public class AltosConfigData {
 				return true;
 			if (product.startsWith("TeleMega-v4"))
 				return true;
+			if (product.startsWith("EasyMotor-v2"))
+				return true;
 		}
 		throw new AltosUnknownProduct(product);
 	}
@@ -648,6 +656,9 @@ public class AltosConfigData {
 				return AltosAdxl375.X_AXIS;
 			if (product.startsWith("TeleMega-v4"))
 				return AltosAdxl375.X_AXIS;
+			if (product.startsWith("EasyMotor-v2"))
+				return AltosAdxl375.X_AXIS;
+
 		}
 		throw new AltosUnknownProduct(product);
 	}
@@ -831,8 +842,22 @@ public class AltosConfigData {
 			link.printf("c o %d\n", pad_orientation);
 		int plus = accel_cal_plus(pad_orientation);
 		int minus = accel_cal_minus(pad_orientation);
-		if (plus != AltosLib.MISSING && minus != AltosLib.MISSING)
-			link.printf("c a %d %d\n", plus, minus);
+		if (plus != AltosLib.MISSING && minus != AltosLib.MISSING) {
+			if (plus < 0)
+				plus = 65536 + plus;
+			if (minus < 0)
+				minus = 65536 + minus;
+			if (accel_zero_along != AltosLib.MISSING &&
+			    accel_zero_across != AltosLib.MISSING &&
+			    accel_zero_through != AltosLib.MISSING)
+				link.printf("c a %d %d %d %d %d\n",
+ 					    plus, minus,
+					    accel_zero_along,
+					    accel_zero_across,
+					    accel_zero_through);
+			else
+				link.printf("c a %d %d\n", plus, minus);
+		}
 
 		/* HAS_LOG */
 		if (flight_log_max != 0 && flight_log_max != AltosLib.MISSING)
@@ -893,5 +918,6 @@ public class AltosConfigData {
 			read_link(link, "done");
 			break;
 		}
+		adjust_accel_cal();
 	}
 }