*
* 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
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
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;
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;
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);
}
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 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;
boolean been_there = false;
config.reset_data();
- for (;;) {
+ while (config.serial_line != null) {
config.serial_line.printf("c s\nf\nv\n");
- for (;;) {
+ while (config.serial_line != null) {
try {
String line = config.serial_line.get_reply(5000);
config.process_line(line);
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) {
}
* 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");
}
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()),
void save_data() {
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);
}
}
}
-}
\ No newline at end of file
+}