X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosTelemetryReader.java;h=dde60dc931a353bc416698f518816a9a940a7271;hb=97663f922e236f4ee7bd08277ca80d419b5cd10f;hp=1f327a67c75773bf95a6c81ec583fd554042bef7;hpb=9e1487b1a5db0afd1d23c86d82c60b1c1a62aab0;p=fw%2Faltos

diff --git a/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java
index 1f327a67..dde60dc9 100644
--- a/altosui/AltosTelemetryReader.java
+++ b/altosui/AltosTelemetryReader.java
@@ -56,8 +56,35 @@ 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);
+		AltosUIPreferences.set_frequency(device.getSerial(), frequency);
 	}
 
 	void set_telemetry(int in_telemetry) {
@@ -66,7 +93,7 @@ class AltosTelemetryReader extends AltosFlightReader {
 	}
 
 	void save_telemetry() {
-		AltosPreferences.set_telemetry(device.getSerial(), telemetry);
+		AltosUIPreferences.set_telemetry(device.getSerial(), telemetry);
 	}
 
 	File backing_file() {
@@ -82,11 +109,11 @@ class AltosTelemetryReader extends AltosFlightReader {
 		previous = null;
 
 		telem = new LinkedBlockingQueue<AltosLine>();
-		frequency = AltosPreferences.frequency(device.getSerial());
+		frequency = AltosUIPreferences.frequency(device.getSerial());
 		set_frequency(frequency);
-		telemetry = AltosPreferences.telemetry(device.getSerial());
+		telemetry = AltosUIPreferences.telemetry(device.getSerial());
 		set_telemetry(telemetry);
-		serial.set_callsign(AltosPreferences.callsign());
+		serial.set_callsign(AltosUIPreferences.callsign());
 		serial.add_monitor(telem);
 	}
 }