X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosTelemetryReader.java;h=85dc9cbc57d9f7f219a759c360552626d5871e1f;hb=93ae5f6ce09fa71ebd34f77a884684b3670c8b44;hp=980391b437476add2ca092b27ad0d00e6c89a2a2;hpb=7f5b5848ad6ef5c808638a29c3dc0101b56ed11e;p=fw%2Faltos

diff --git a/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java
index 980391b4..85dc9cbc 100644
--- a/altosui/AltosTelemetryReader.java
+++ b/altosui/AltosTelemetryReader.java
@@ -26,6 +26,9 @@ class AltosTelemetryReader extends AltosFlightReader {
 	AltosDevice	device;
 	AltosSerial	serial;
 	AltosLog	log;
+	AltosRecord	previous;
+	double		frequency;
+	int		telemetry;
 
 	LinkedBlockingQueue<AltosLine> telem;
 
@@ -33,7 +36,13 @@ class AltosTelemetryReader extends AltosFlightReader {
 		AltosLine l = telem.take();
 		if (l.line == null)
 			throw new IOException("IO error");
-		return new AltosTelemetry(l.line);
+		AltosRecord	next = AltosTelemetry.parse(l.line, previous);
+		previous = next;
+		return next;
+	}
+
+	void flush() {
+		telem.clear();
 	}
 
 	void close(boolean interrupted) {
@@ -42,25 +51,69 @@ class AltosTelemetryReader extends AltosFlightReader {
 		serial.close();
 	}
 
-	void set_channel(int channel) {
-		serial.set_channel(channel);
-		AltosPreferences.set_channel(device.getSerial(), channel);
+	public void set_frequency(double in_frequency) throws InterruptedException, TimeoutException {
+		frequency = in_frequency;
+		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 set_telemetry(int telemetry) {
+	void save_frequency() {
+		AltosPreferences.set_frequency(device.getSerial(), frequency);
+	}
+
+	void set_telemetry(int in_telemetry) {
+		telemetry = in_telemetry;
 		serial.set_telemetry(telemetry);
+	}
+
+	void save_telemetry() {
 		AltosPreferences.set_telemetry(device.getSerial(), telemetry);
 	}
 
+	File backing_file() {
+		return log.file();
+	}
+
 	public AltosTelemetryReader (AltosDevice in_device)
-		throws FileNotFoundException, AltosSerialInUseException, IOException {
+		throws FileNotFoundException, AltosSerialInUseException, IOException, InterruptedException, TimeoutException {
 		device = in_device;
 		serial = new AltosSerial(device);
 		log = new AltosLog(serial);
 		name = device.toShortString();
+		previous = null;
 
 		telem = new LinkedBlockingQueue<AltosLine>();
-		serial.set_radio();
+		frequency = AltosPreferences.frequency(device.getSerial());
+		set_frequency(frequency);
+		telemetry = AltosPreferences.telemetry(device.getSerial());
+		set_telemetry(telemetry);
+		serial.set_callsign(AltosPreferences.callsign());
 		serial.add_monitor(telem);
 	}
 }