projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add timeout to RN4678 status message code
[fw/altos]
/
altoslib
/
AltosLink.java
diff --git
a/altoslib/AltosLink.java
b/altoslib/AltosLink.java
index eadab5dff6d3029b77c7e8b08e84c0444f6cba79..d75c9aa0c6e8f8d9a924e23842634f87cf0b0cb5 100644
(file)
--- a/
altoslib/AltosLink.java
+++ b/
altoslib/AltosLink.java
@@
-3,7
+3,8
@@
*
* 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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
5
;
+package org.altusmetrum.altoslib_
11
;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
@@
-55,8
+56,11
@@
public abstract class AltosLink implements Runnable {
public void printf(String format, Object ... arguments) {
String line = String.format(format, arguments);
public void printf(String format, Object ... arguments) {
String line = String.format(format, arguments);
- if (debug)
- pending_output.add(line);
+ if (debug) {
+ synchronized (pending_output) {
+ pending_output.add(line);
+ }
+ }
try {
print(line);
} catch (InterruptedException ie) {
try {
print(line);
} catch (InterruptedException ie) {
@@
-83,10
+87,17
@@
public abstract class AltosLink implements Runnable {
public boolean reply_abort;
public int in_reply;
public boolean reply_abort;
public int in_reply;
+ boolean cancel_enable = true;
+
+ public void set_cancel_enable(boolean e) {
+ cancel_enable = e;
+ }
boolean reply_timeout_shown = false;
private boolean check_reply_timeout() {
boolean reply_timeout_shown = false;
private boolean check_reply_timeout() {
+ if (!cancel_enable)
+ return false;
if (!reply_timeout_shown)
reply_timeout_shown = show_reply_timeout();
return reply_abort;
if (!reply_timeout_shown)
reply_timeout_shown = show_reply_timeout();
return reply_abort;
@@
-160,11
+171,24
@@
public abstract class AltosLink implements Runnable {
boolean can_cancel = can_cancel_reply();
String reply = null;
boolean can_cancel = can_cancel_reply();
String reply = null;
-
if (!can_cancel && remote)
-
System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
+
//
if (!can_cancel && remote)
+
//
System.out.printf("Uh-oh, reading remote serial device from swing thread\n");
- if (remote && can_cancel)
+ if (remote && can_cancel)
{
timeout = 500;
timeout = 500;
+ switch (telemetry_rate) {
+ case AltosLib.ao_telemetry_rate_38400:
+ default:
+ timeout = 500;
+ break;
+ case AltosLib.ao_telemetry_rate_9600:
+ timeout = 2000;
+ break;
+ case AltosLib.ao_telemetry_rate_2400:
+ timeout = 8000;
+ break;
+ }
+ }
try {
++in_reply;
try {
++in_reply;
@@
-273,12
+297,14
@@
public abstract class AltosLink implements Runnable {
binary_queue.put(dup);
}
binary_queue.put(dup);
}
- public void flush_output() {
+ public
synchronized
void flush_output() {
if (pending_output == null)
return;
if (pending_output == null)
return;
- for (String s : pending_output)
- System.out.print(s);
- pending_output.clear();
+ synchronized (pending_output) {
+ for (String s : pending_output)
+ System.out.print(s);
+ pending_output.clear();
+ }
}
public void flush_input(int timeout) throws InterruptedException {
}
public void flush_input(int timeout) throws InterruptedException {
@@
-307,7
+333,7
@@
public abstract class AltosLink implements Runnable {
*/
public boolean monitor_mode = false;
public int telemetry = AltosLib.ao_telemetry_standard;
*/
public boolean monitor_mode = false;
public int telemetry = AltosLib.ao_telemetry_standard;
- public int telemetry_rate =
AltosLib.ao_telemetry_rate_38400
;
+ public int telemetry_rate =
-1
;
public double frequency;
public String callsign;
AltosConfigData config_data;
public double frequency;
public String callsign;
AltosConfigData config_data;
@@
-336,7
+362,7
@@
public abstract class AltosLink implements Runnable {
if (frequency == 0)
return;
if (has_frequency)
if (frequency == 0)
return;
if (has_frequency)
- set_radio_freq((int) Math.floor (frequency * 1000));
+ set_radio_freq((int) Math.floor (frequency * 1000
+ 0.5
));
else if (has_setting)
set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
else
else if (has_setting)
set_radio_setting(AltosConvert.radio_frequency_to_setting(frequency, cal));
else
@@
-368,7
+394,7
@@
public abstract class AltosLink implements Runnable {
flush_output();
}
flush_output();
}
- public void set_monitor(boolean monitor) {
+ public
synchronized
void set_monitor(boolean monitor) {
monitor_mode = monitor;
if (monitor)
printf("m %x\n", telemetry_len());
monitor_mode = monitor;
if (monitor)
printf("m %x\n", telemetry_len());
@@
-377,6
+403,10
@@
public abstract class AltosLink implements Runnable {
flush_output();
}
flush_output();
}
+ public synchronized boolean get_monitor() {
+ return monitor_mode;
+ }
+
private void set_channel(int channel) {
if (monitor_mode)
printf("m 0\nc r %d\nm %x\n",
private void set_channel(int channel) {
if (monitor_mode)
printf("m 0\nc r %d\nm %x\n",
@@
-409,8
+439,10
@@
public abstract class AltosLink implements Runnable {
public void set_callsign(String callsign) {
this.callsign = callsign;
public void set_callsign(String callsign) {
this.callsign = callsign;
- printf ("c c %s\n", callsign);
- flush_output();
+ if (callsign != null) {
+ printf ("c c %s\n", callsign);
+ flush_output();
+ }
}
public boolean is_loader() throws InterruptedException {
}
public boolean is_loader() throws InterruptedException {
@@
-446,7
+478,12
@@
public abstract class AltosLink implements Runnable {
if (debug)
System.out.printf("start remote %7.3f\n", frequency);
set_radio_frequency(frequency);
if (debug)
System.out.printf("start remote %7.3f\n", frequency);
set_radio_frequency(frequency);
- set_callsign(AltosPreferences.callsign());
+ if (telemetry_rate < 0)
+ telemetry_rate = AltosPreferences.telemetry_rate(serial);
+ set_telemetry_rate(telemetry_rate);
+ if (callsign == null || callsign.equals(""))
+ callsign = AltosPreferences.callsign();
+ set_callsign(callsign);
printf("p\nE 0\n");
flush_input();
remote = true;
printf("p\nE 0\n");
flush_input();
remote = true;
@@
-503,21
+540,29
@@
public abstract class AltosLink implements Runnable {
if (config_data.has_monitor_battery()) {
try {
if (config_data.has_monitor_battery()) {
try {
- String[] items = adc();
- for (int i = 0; i < items.length;) {
- if (items[i].equals("batt")) {
- monitor_batt = Integer.parseInt(items[i+1]);
- i += 2;
- continue;
+ String[] items = adc();
+ for (int i = 0; i < items.length;) {
+ if (items[i].equals("batt")) {
+ monitor_batt = Integer.parseInt(items[i+1]);
+ i += 2;
+ continue;
+ }
+ i++;
}
}
- i++;
- }
} catch (TimeoutException te) {
}
}
if (monitor_batt == AltosLib.MISSING)
return AltosLib.MISSING;
} catch (TimeoutException te) {
}
}
if (monitor_batt == AltosLib.MISSING)
return AltosLib.MISSING;
- return AltosConvert.cc_battery_to_voltage(monitor_batt);
+
+ double volts = AltosLib.MISSING;
+ if (config_data.product.startsWith("TeleBT-v3") || config_data.product.startsWith("TeleBT-v4")) {
+ volts = AltosConvert.tele_bt_3_battery(monitor_batt);
+ } else {
+ volts = AltosConvert.cc_battery_to_voltage(monitor_batt);
+ }
+
+ return volts;
}
public AltosLink() {
}
public AltosLink() {