X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosTelemetryReader.java;h=1f327a67c75773bf95a6c81ec583fd554042bef7;hb=f4ea46dc205454411c224ada7805f813989efd4a;hp=18f17841acf76ac4373aeb58569ad46c0e732784;hpb=7fd9b8f720add559b262e81d61ededc9df16ca94;p=fw%2Faltos

diff --git a/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java
index 18f17841..1f327a67 100644
--- a/altosui/AltosTelemetryReader.java
+++ b/altosui/AltosTelemetryReader.java
@@ -27,6 +27,8 @@ class AltosTelemetryReader extends AltosFlightReader {
 	AltosSerial	serial;
 	AltosLog	log;
 	AltosRecord	previous;
+	double		frequency;
+	int		telemetry;
 
 	LinkedBlockingQueue<AltosLine> telem;
 
@@ -39,24 +41,40 @@ class AltosTelemetryReader extends AltosFlightReader {
 		return next;
 	}
 
+	void flush() {
+		telem.clear();
+	}
+
 	void close(boolean interrupted) {
 		serial.remove_monitor(telem);
 		log.close();
 		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);
+	}
+
+	void save_frequency() {
+		AltosPreferences.set_frequency(device.getSerial(), frequency);
 	}
 
-	void set_telemetry(int telemetry) {
+	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);
@@ -64,7 +82,11 @@ class AltosTelemetryReader extends AltosFlightReader {
 		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);
 	}
 }