projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.6
[fw/altos]
/
altosui
/
AltosLaunch.java
diff --git
a/altosui/AltosLaunch.java
b/altosui/AltosLaunch.java
index 503b062184276f049ac9b53fdd04ef93881392b8..fb2cd883fa97f37d9476e77c76c3fa6cbb0dd693 100644
(file)
--- a/
altosui/AltosLaunch.java
+++ b/
altosui/AltosLaunch.java
@@
-20,7
+20,7
@@
package altosui;
import java.io.*;
import java.util.concurrent.*;
import java.awt.*;
import java.io.*;
import java.util.concurrent.*;
import java.awt.*;
-import org.altusmetrum.altosuilib_1
0
.*;
+import org.altusmetrum.altosuilib_1
1
.*;
public class AltosLaunch {
AltosDevice device;
public class AltosLaunch {
AltosDevice device;
@@
-91,7
+91,7
@@
public class AltosLaunch {
throw new TimeoutException();
if (get_string(line, "Rssi: ", status_name)) {
try {
throw new TimeoutException();
if (get_string(line, "Rssi: ", status_name)) {
try {
- rssi = Altos.fromdec(status_name.get());
+ rssi =
(int)
Altos.fromdec(status_name.get());
} catch (NumberFormatException ne) {
}
break;
} catch (NumberFormatException ne) {
}
break;
@@
-194,4
+194,4
@@
public class AltosLaunch {
device = in_device;
serial = new AltosSerial(device);
}
device = in_device;
serial = new AltosSerial(device);
}
-}
\ No newline at end of file
+}