X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSerial.java;h=4cf306d051e478706294010c90c35c6ce7aae104;hp=f0e25fa56dd110e697e34db7566e0816862ad55a;hb=31e3255b6cbfaf95c0e97e2d1ec8de72f845994c;hpb=924d56a4d2d8b16530cd378b18cfc5d6e08420ed

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index f0e25fa5..4cf306d0 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -323,8 +323,10 @@ public class AltosSerial implements Runnable {
 		}
 		altos = device.open();
 		if (altos == null) {
+			final String	message = device.getErrorString();
 			close();
-			throw new FileNotFoundException(device.toShortString());
+			throw new FileNotFoundException(String.format("%s (%s)",
+								      device.toShortString(), message));
 		}
 		if (debug)
 			System.out.printf("Open %s\n", device.getPath());
@@ -353,10 +355,10 @@ public class AltosSerial implements Runnable {
 	private void set_radio_setting(int setting) {
 		if (altos != null) {
 			if (monitor_mode)
-				printf("m 0\nc R %d\nc r 0\nm %x\n",
+				printf("m 0\nc R %d\nm %x\n",
 				       setting, telemetry_len());
 			else
-				printf("c R %d\nc r 0\n", setting);
+				printf("c R %d\n", setting);
 			flush_output();
 		}
 	}
@@ -364,6 +366,8 @@ public class AltosSerial implements Runnable {
 	public void set_radio_frequency(double frequency,
 					boolean has_setting,
 					int cal) {
+		if (debug)
+			System.out.printf("set_radio_frequency %7.3f %b %d\n", frequency, has_setting, cal);
 		if (has_setting)
 			set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
 		else
@@ -413,7 +417,7 @@ public class AltosSerial implements Runnable {
 
 	public void start_remote() throws TimeoutException, InterruptedException {
 		if (debug)
-			System.out.printf("start remote\n");
+			System.out.printf("start remote %7.3f\n", frequency);
 		if (frequency == 0.0)
 			frequency = AltosPreferences.frequency(device.getSerial());
 		set_radio_frequency(frequency);