X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=5d58566ecb3dc0b9836e1bd676a5857f04a1cde1;hp=b6105f92fc3cb27265e087fb530d84da2f2f79e8;hb=HEAD;hpb=76847aadc1ea770099c6be05727dfa232e53205c

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index b6105f92..b076357d 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -83,6 +83,14 @@ public class AltosConfigData {
 	/* HAS_BEEP */
 	public int		beep;
 
+	/* HAS_RADIO_10MW */
+	public int		radio_10mw;
+
+	public int		report_feet;
+
+	/* HAS_GPS_MOSAIC */
+	public int		gps_receiver;
+
 	/* Storage info replies */
 	public int	storage_size;
 	public int	storage_erase_unit;
@@ -212,8 +220,15 @@ public class AltosConfigData {
 				return 4095 - value;
 			/* fall through */
 		case AltosLib.AO_LOG_FORMAT_TELEMEGA_4:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_5:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA_6:
 		case AltosLib.AO_LOG_FORMAT_EASYMEGA_2:
+		case AltosLib.AO_LOG_FORMAT_EASYMEGA_3:
 		case AltosLib.AO_LOG_FORMAT_EASYMOTOR:
+			/* ADXL375 */
+			return -value;
+		case AltosLib.AO_LOG_FORMAT_EASYTIMER_2:
+			/* BMI088 */
 			return -value;
 		default:
 			if (product.startsWith("EasyTimer-"))
@@ -230,6 +245,10 @@ public class AltosConfigData {
 		return false;
 	}
 
+	public boolean has_radio() {
+		return product.startsWith("Tele");
+	}
+
 	int[] parse_version(String v) {
 		String[] parts = v.split("\\.");
 		int r[] = new int[parts.length];
@@ -315,6 +334,12 @@ public class AltosConfigData {
 
 		beep = AltosLib.MISSING;
 
+		radio_10mw = AltosLib.MISSING;
+
+		report_feet = AltosLib.MISSING;
+
+		gps_receiver = AltosLib.MISSING;
+
 		tracker_motion = AltosLib.MISSING;
 		tracker_interval = AltosLib.MISSING;
 
@@ -505,6 +530,13 @@ public class AltosConfigData {
 		/* HAS_BEEP */
 		try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
 
+		/* HAS_RADIO_10MW */
+		try { radio_10mw = get_int(line, "Radio 10mw limit:"); } catch (Exception e) {}
+
+		try { report_feet = get_int(line, "Report in feet:"); } catch (Exception e) {}
+
+		try { gps_receiver = get_int(line, "GPS receiver:"); } catch (Exception e) {}
+
 		/* HAS_TRACKER */
 		try {
 			int[] values = get_values(line, "Tracker setting:");
@@ -624,6 +656,8 @@ public class AltosConfigData {
 			return false;
 		if (product.startsWith("TeleMetrum-v3"))
 			return false;
+		if (product.startsWith("TeleMetrum-v4"))
+			return true;
 		if (product.startsWith("EasyMega"))
 			return false;
 		return true;
@@ -650,10 +684,18 @@ public class AltosConfigData {
 				return true;
 			if (product.startsWith("TeleMetrum-v3"))
 				return true;
+			if (product.startsWith("TeleMetrum-v4"))
+				return true;
 			if (product.startsWith("TeleMega-v4"))
 				return true;
+			if (product.startsWith("TeleMega-v5"))
+				return true;
+			if (product.startsWith("TeleMega-v6"))
+				return true;
 			if (product.startsWith("EasyMotor-v2"))
 				return true;
+			if (product.startsWith("EasyMotor-v3"))
+				return true;
 		}
 		throw new AltosUnknownProduct(product);
 	}
@@ -664,10 +706,18 @@ public class AltosConfigData {
 				return AltosAdxl375.X_AXIS;
 			if (product.startsWith("TeleMetrum-v3"))
 				return AltosAdxl375.X_AXIS;
+			if (product.startsWith("TeleMetrum-v4"))
+				return AltosAdxl375.X_AXIS;
 			if (product.startsWith("TeleMega-v4"))
 				return AltosAdxl375.X_AXIS;
+			if (product.startsWith("TeleMega-v5"))
+				return AltosAdxl375.X_AXIS;
+			if (product.startsWith("TeleMega-v6"))
+				return AltosAdxl375.X_AXIS;
 			if (product.startsWith("EasyMotor-v2"))
 				return AltosAdxl375.X_AXIS;
+			if (product.startsWith("EasyMotor-v3"))
+				return AltosAdxl375.X_AXIS;
 
 		}
 		throw new AltosUnknownProduct(product);
@@ -730,6 +780,17 @@ public class AltosConfigData {
 		/* HAS_BEEP */
 		if (beep != AltosLib.MISSING)
 			beep = source.beep();
+
+		/* HAS_RADIO_10MW */
+		if (radio_10mw != AltosLib.MISSING)
+			radio_10mw = source.radio_10mw();
+
+		if (report_feet != AltosLib.MISSING)
+			report_feet = source.report_feet();
+
+		if (gps_receiver != AltosLib.MISSING)
+			gps_receiver = source.gps_receiver();
+
 		/* HAS_TRACKER */
 		if (tracker_motion != AltosLib.MISSING)
 			tracker_motion = source.tracker_motion();
@@ -785,6 +846,9 @@ public class AltosConfigData {
 		dest.set_aprs_format(aprs_format);
 		dest.set_aprs_offset(aprs_offset);
 		dest.set_beep(beep);
+		dest.set_radio_10mw(radio_10mw);
+		dest.set_report_feet(report_feet);
+		dest.set_gps_receiver(gps_receiver);
 		dest.set_tracker_motion(tracker_motion);
 		dest.set_tracker_interval(tracker_interval);
 	}
@@ -904,6 +968,17 @@ public class AltosConfigData {
 		if (beep != AltosLib.MISSING)
 			link.printf("c b %d\n", beep);
 
+		/* HAS_RADIO_10MW */
+		if (radio_10mw != AltosLib.MISSING)
+			link.printf("c p %d\n", radio_10mw);
+
+		if (report_feet != AltosLib.MISSING)
+			link.printf("c u %d\n", report_feet);
+
+		/* HAS_GPS_MOSAIC */
+		if (gps_receiver != AltosLib.MISSING)
+			link.printf("c g %d\n", gps_receiver);
+
 		/* HAS_TRACKER */
 		if (tracker_motion != AltosLib.MISSING && tracker_interval != AltosLib.MISSING)
 			link.printf("c t %d %d\n", tracker_motion, tracker_interval);