altosui: Split out UI-specific preferences

[fw/altos] / altosui / AltosTelemetryReader.java

diff --git a/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java
index 23524b2cb349c4a99a2d11878a5a2f879842f5a3..2c49b707ece21be517b7a5155b0b526cf3063148 100644 (file)
--- 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;
 
@@ -49,18 +51,30 @@ 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);
        }
 
-       void set_telemetry(int telemetry) {
+       void save_frequency() {
+               AltosUIPreferences.set_frequency(device.getSerial(), frequency);
+       }
+
+       void set_telemetry(int in_telemetry) {
+               telemetry = in_telemetry;
                serial.set_telemetry(telemetry);
-               AltosPreferences.set_telemetry(device.getSerial(), telemetry);
+       }
+
+       void save_telemetry() {
+               AltosUIPreferences.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);
@@ -68,7 +82,11 @@ class AltosTelemetryReader extends AltosFlightReader {
                previous = null;
 
                telem = new LinkedBlockingQueue<AltosLine>();
-               serial.set_radio();
+               frequency = AltosUIPreferences.frequency(device.getSerial());
+               set_frequency(frequency);
+               telemetry = AltosUIPreferences.telemetry(device.getSerial());
+               set_telemetry(telemetry);
+               serial.set_callsign(AltosUIPreferences.callsign());
                serial.add_monitor(telem);
        }
 }