X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigTD.java;h=4389e49b0c57ac431512a5544b3243441390afa0;hp=71d628b310c731a69eb8f25f88fdc3140efed2df;hb=0b70ea04e807c69a987d5976ab217f9f65fb1e09;hpb=fe009534ce6846b6db96cac8f6c2d53ba8010d91

diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index 71d628b3..4389e49b 100644
--- a/altosui/AltosConfigTD.java
+++ b/altosui/AltosConfigTD.java
@@ -17,20 +17,12 @@
 
 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_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosConfigTD implements ActionListener {
 
@@ -70,6 +62,7 @@ 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;
@@ -113,6 +106,7 @@ public class AltosConfigTD implements ActionListener {
 		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;
@@ -148,6 +142,7 @@ public class AltosConfigTD implements ActionListener {
 			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);
 		}
@@ -159,6 +154,7 @@ public class AltosConfigTD implements ActionListener {
 		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");
@@ -186,6 +182,17 @@ public class AltosConfigTD implements ActionListener {
 		}
 	}
 
+	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;
@@ -226,6 +233,7 @@ public class AltosConfigTD implements ActionListener {
 			 * 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");
 		}
 
@@ -234,6 +242,8 @@ public class AltosConfigTD implements ActionListener {
 			if (frequency != 0)
 				AltosPreferences.set_frequency(serial.get(),
 							       frequency);
+			AltosPreferences.set_telemetry_rate(serial.get(),
+							    telemetry_rate());
 		}
 
 		public void run () {
@@ -287,6 +297,8 @@ public class AltosConfigTD implements ActionListener {
 	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);
 	}
 
@@ -319,11 +331,12 @@ public class AltosConfigTD implements ActionListener {
 		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);
@@ -345,12 +358,7 @@ public class AltosConfigTD implements ActionListener {
 									    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
+}