X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosTelemetryReader.java;h=dc7e4a758321e66eb13f3472a2620e5d4ebfe094;hb=3c2f601139d36761de6a8a2210545d082ef16133;hp=4512e76186c4a8304c222a1d4bf8ff594d066da9;hpb=0e3e4f9c1e6a6bf972514f12c9d622258aa2aec2;p=fw%2Faltos

diff --git a/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java
index 4512e761..dc7e4a75 100644
--- a/altosui/AltosTelemetryReader.java
+++ b/altosui/AltosTelemetryReader.java
@@ -21,13 +21,13 @@ import java.lang.*;
 import java.text.*;
 import java.io.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 class AltosTelemetryReader extends AltosFlightReader {
 	AltosDevice	device;
 	AltosSerial	serial;
 	AltosLog	log;
 	AltosRecord	previous;
-	AltosConfigData	config_data;
 	double		frequency;
 	int		telemetry;
 
@@ -57,6 +57,33 @@ class AltosTelemetryReader extends AltosFlightReader {
 		serial.set_radio_frequency(frequency);
 	}
 
+	public boolean supports_telemetry(int telemetry) {
+
+		try {
+			/* Version 1.0 or later firmware supports all telemetry formats */
+			if (serial.config_data().compare_version("1.0") >= 0)
+				return true;
+
+			/* Version 0.9 firmware only supports 0.9 telemetry */
+			if (serial.config_data().compare_version("0.9") >= 0) {
+				if (telemetry == Altos.ao_telemetry_0_9)
+					return true;
+				else
+					return false;
+			}
+
+			/* Version 0.8 firmware only supports 0.8 telemetry */
+			if (telemetry == Altos.ao_telemetry_0_8)
+				return true;
+			else
+				return false;
+		} catch (InterruptedException ie) {
+			return true;
+		} catch (TimeoutException te) {
+			return true;
+		}
+	}
+
 	void save_frequency() {
 		AltosPreferences.set_frequency(device.getSerial(), frequency);
 	}
@@ -70,6 +97,10 @@ class AltosTelemetryReader extends AltosFlightReader {
 		AltosPreferences.set_telemetry(device.getSerial(), telemetry);
 	}
 
+	File backing_file() {
+		return log.file();
+	}
+
 	public AltosTelemetryReader (AltosDevice in_device)
 		throws FileNotFoundException, AltosSerialInUseException, IOException, InterruptedException, TimeoutException {
 		device = in_device;
@@ -83,7 +114,7 @@ class AltosTelemetryReader extends AltosFlightReader {
 		set_frequency(frequency);
 		telemetry = AltosPreferences.telemetry(device.getSerial());
 		set_telemetry(telemetry);
-		serial.set_callsign(AltosPreferences.callsign());
+		serial.set_callsign(AltosUIPreferences.callsign());
 		serial.add_monitor(telem);
 	}
 }