altosui: Output recorded clock tick in CSV files

[fw/altos] / altosui / AltosSerial.java

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index ff1a91a5dedb1206e95376cff310bbad31b7b7bf..77c926b1f9629f9a9e171e6a4377e8ff84e1eba9 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -55,7 +55,7 @@ public class AltosSerial implements Runnable {
        boolean monitor_mode;
        int telemetry;
        double frequency;
-       static boolean debug;
+       public static boolean debug;
        boolean remote;
        LinkedList<String> pending_output = new LinkedList<String>();
        Frame frame;
@@ -380,6 +380,8 @@ public class AltosSerial implements Runnable {
                                        int cal) {
                if (debug)
                        System.out.printf("set_radio_frequency %7.3f (freq %b) (set %b) %d\n", frequency, has_frequency, has_setting, cal);
+               if (frequency == 0)
+                       return;
                if (has_frequency)
                        set_radio_freq((int) Math.floor (frequency * 1000));
                else if (has_setting)
@@ -390,6 +392,8 @@ public class AltosSerial implements Runnable {
 
        public void set_radio_frequency(double in_frequency) throws InterruptedException, TimeoutException {
                frequency = in_frequency;
+               if (frequency == 0.0)
+                       frequency = AltosPreferences.frequency(device.getSerial());
                config_data();
                set_radio_frequency(frequency,
                                    config_data.radio_frequency != 0,