*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
package altosui;
-import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
-
-import libaltosJNI.*;
-
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
public class AltosConfigTD implements ActionListener {
int_ref radio_calibration;
int_ref radio_setting;
int_ref radio_frequency;
+ int_ref telemetry_rate;
string_ref config_version;
string_ref version;
string_ref product;
AltosConfigTDUI config_ui;
- boolean serial_started;
boolean made_visible;
boolean get_int(String line, String label, int_ref x) {
}
}
- void start_serial() throws InterruptedException, TimeoutException {
- serial_started = true;
- }
-
- void stop_serial() throws InterruptedException {
- if (!serial_started)
- return;
- serial_started = false;
- }
-
- void update_ui() {
+ synchronized void update_ui() {
config_ui.set_serial(serial.get());
config_ui.set_product(product.get());
config_ui.set_version(version.get());
config_ui.set_radio_frequency(frequency());
config_ui.set_radio_calibration(radio_calibration.get());
+ config_ui.set_telemetry_rate(telemetry_rate.get());
config_ui.set_clean();
if (!made_visible) {
made_visible = true;
}
}
- void process_line(String line) {
+ void finish_input(String line) {
if (line == null) {
abort();
return;
update_ui();
return;
}
- get_string(line, "Config version", config_version);
- get_int(line, "serial-number", serial);
- get_int(line, "Radio channel:", radio_channel);
- get_int(line, "Radio cal:", radio_calibration);
- get_int(line, "Frequency:", radio_frequency);
- get_int(line, "Radio setting:", radio_setting);
- get_string(line,"software-version", version);
- get_string(line,"product", product);
}
- final static int serial_mode_read = 0;
- final static int serial_mode_save = 1;
- final static int serial_mode_reboot = 2;
-
- class SerialData implements Runnable {
- AltosConfigTD config;
- int serial_mode;
-
- void process_line(String line) {
- config.process_line(line);
- }
- void callback(String in_line) {
- final String line = in_line;
+ synchronized void process_line(String line) {
+ if (line == null || line.equals("all finished")) {
+ final String last_line = line;
Runnable r = new Runnable() {
public void run() {
- process_line(line);
+ finish_input(last_line);
}
};
SwingUtilities.invokeLater(r);
+ } else {
+ get_string(line, "Config version", config_version);
+ get_int(line, "serial-number", serial);
+ get_int(line, "Radio channel:", radio_channel);
+ get_int(line, "Radio cal:", radio_calibration);
+ get_int(line, "Frequency:", radio_frequency);
+ get_int(line, "Radio setting:", radio_setting);
+ get_int(line, "Telemetry rate:", telemetry_rate);
+ get_string(line,"software-version", version);
+ get_string(line,"product", product);
}
+ }
- void reset_data() {
- serial.set(0);
+ synchronized void reset_data() {
+ serial.set(0);
+ radio_channel.set(0);
+ radio_setting.set(0);
+ radio_frequency.set(0);
+ radio_calibration.set(1186611);
+ telemetry_rate.set(Altos.ao_telemetry_rate_38400);
+ config_version.set("0.0");
+ version.set("unknown");
+ product.set("unknown");
+ }
+
+ synchronized double frequency() {
+ return AltosConvert.radio_to_frequency(radio_frequency.get(),
+ radio_setting.get(),
+ radio_calibration.get(),
+ radio_channel.get());
+ }
+
+ synchronized void set_frequency(double freq) {
+ int frequency = radio_frequency.get();
+ int setting = radio_setting.get();
+
+ if (frequency > 0) {
+ radio_frequency.set((int) Math.floor (freq * 1000 + 0.5));
+ } else if (setting > 0) {
+ radio_setting.set(AltosConvert.radio_frequency_to_setting(freq,
+ radio_calibration.get()));
radio_channel.set(0);
- radio_setting.set(0);
- radio_frequency.set(0);
- radio_calibration.set(1186611);
- config_version.set("0.0");
- version.set("unknown");
- product.set("unknown");
+ } else {
+ radio_channel.set(AltosConvert.radio_frequency_to_channel(freq));
}
+ }
+
+ synchronized int telemetry_rate() {
+ return telemetry_rate.get();
+ }
+
+ synchronized void set_telemetry_rate(int new_telemetry_rate){
+ int rate = telemetry_rate.get();
+
+ if (rate >= 0)
+ telemetry_rate.set(new_telemetry_rate);
+ }
+
+ final static int serial_mode_read = 0;
+ final static int serial_mode_save = 1;
+ final static int serial_mode_reboot = 2;
+
+ SerialData serial_data;
+ Thread serial_thread;
+
+ class SerialData implements Runnable {
+ AltosConfigTD config;
+ int serial_mode;
void get_data() {
try {
boolean been_there = false;
- config.start_serial();
- reset_data();
+ config.reset_data();
- for (;;) {
- config.serial_line.printf("c s\nf\nl\nv\n");
- for (;;) {
+ while (config.serial_line != null) {
+ config.serial_line.printf("c s\nf\nv\n");
+ while (config.serial_line != null) {
try {
String line = config.serial_line.get_reply(5000);
- if (line == null)
- stop_serial();
- callback(line);
- if (line.startsWith("software-version"))
+ config.process_line(line);
+ if (line != null && line.startsWith("software-version"))
break;
} catch (Exception e) {
break;
if (!config_version.get().equals("0.0"))
break;
been_there = true;
- config.serial_line.printf("C\n ");
- config.serial_line.flush_input();
+ if (config != null && config.serial_line != null) {
+ config.serial_line.printf("C\n ");
+ config.serial_line.flush_input();
+ }
}
} catch (InterruptedException ie) {
- } catch (TimeoutException te) {
- } finally {
- try {
- stop_serial();
- } catch (InterruptedException ie) {
- }
}
- double pref_frequency = AltosPreferences.frequency(serial.get());
- if (pref_frequency != 0)
- radio_frequency.set((int) Math.floor (pref_frequency * 1000 + 0.5));
- callback("all finished");
+ /*
+ * This makes sure the displayed frequency respects the limits that the
+ * available firmware version might place on the actual frequency
+ */
+ config.set_frequency(AltosPreferences.frequency(serial.get()));
+ config.set_telemetry_rate(AltosPreferences.telemetry_rate(serial.get()));
+ config.process_line("all finished");
}
void save_data() {
if (frequency != 0)
AltosPreferences.set_frequency(serial.get(),
frequency);
+ AltosPreferences.set_telemetry_rate(serial.get(),
+ telemetry_rate());
}
public void run () {
/* fall through ... */
case serial_mode_read:
get_data();
+ serial_thread = null;
break;
}
}
}
void run_serial_thread(int serial_mode) {
- SerialData sd = new SerialData(this, serial_mode);
- Thread st = new Thread(sd);
- st.start();
+ serial_data = new SerialData(this, serial_mode);
+ serial_thread = new Thread(serial_data);
+ serial_thread.start();
}
+ void abort_serial_thread() {
+ if (serial_thread != null) {
+ serial_thread.interrupt();
+ serial_thread = null;
+ }
+ }
void init_ui () throws InterruptedException, TimeoutException {
config_ui = new AltosConfigTDUI(owner);
config_ui.addActionListener(this);
}
void abort() {
- serial_line.close();
- serial_line = null;
+ abort_serial_thread();
+ if (serial_line != null) {
+ serial_line.close();
+ serial_line = null;
+ }
JOptionPane.showMessageDialog(owner,
String.format("Connection to \"%s\" failed",
device.toShortString()),
update_ui();
}
- double frequency() {
- return AltosConvert.radio_to_frequency(radio_frequency.get(),
- radio_setting.get(),
- radio_calibration.get(),
- radio_channel.get());
- }
-
- void set_frequency(double freq) {
- int frequency = radio_frequency.get();
- int setting = radio_setting.get();
-
- if (frequency > 0) {
- radio_frequency.set((int) Math.floor (freq * 1000 + 0.5));
- } else if (setting > 0) {
- radio_setting.set(AltosConvert.radio_frequency_to_setting(freq,
- radio_calibration.get()));
- radio_channel.set(0);
- } else {
- radio_channel.set(AltosConvert.radio_frequency_to_channel(freq));
- }
- }
-
void save_data() {
-
- set_frequency(config_ui.radio_frequency());
+ double freq = config_ui.radio_frequency();
+ set_frequency(freq);
+ int telemetry_rate = config_ui.telemetry_rate();
+ set_telemetry_rate(telemetry_rate);
run_serial_thread(serial_mode_save);
}
radio_setting = new int_ref(0);
radio_frequency = new int_ref(0);
radio_calibration = new int_ref(1186611);
+ telemetry_rate = new int_ref(AltosLib.ao_telemetry_rate_38400);
config_version = new string_ref("0.0");
version = new string_ref("unknown");
product = new string_ref("unknown");
- device = AltosDeviceDialog.show(owner, Altos.product_basestation);
+ device = AltosDeviceUIDialog.show(owner, Altos.product_basestation);
if (device != null) {
try {
serial_line = new AltosSerial(device);
device.toShortString()),
"Device in use",
JOptionPane.ERROR_MESSAGE);
- } catch (IOException ee) {
- JOptionPane.showMessageDialog(owner,
- device.toShortString(),
- ee.getLocalizedMessage(),
- JOptionPane.ERROR_MESSAGE);
}
}
}
-}
\ No newline at end of file
+}