projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Move AltosConfigData.java to library
[fw/altos]
/
altosui
/
altoslib
/
src
/
org
/
altusmetrum
/
AltosLib
/
AltosConfigData.java
diff --git
a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
index ef34dd3ee06747ed6e2e0260e54bd670c2f816cb..0bc5d5a80a8b9ca1659ba3b8c18308b0d2c8c5c6 100644
(file)
--- a/
altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
+++ b/
altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConfigData.java
@@
-17,11
+17,6
@@
package altosui;
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.io.*;
import java.util.*;
import java.text.*;
@@
-29,8
+24,6
@@
import java.util.prefs.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
-import libaltosJNI.*;
-
public class AltosConfigData implements Iterable<String> {
/* Version information */
public class AltosConfigData implements Iterable<String> {
/* Version information */
@@
-138,14
+131,14
@@
public class AltosConfigData implements Iterable<String> {
return 0;
}
return 0;
}
- public AltosConfigData(Altos
Serial serial_line
) throws InterruptedException, TimeoutException {
-
serial_line
.printf("c s\np\nf\nl\nv\n");
+ public AltosConfigData(Altos
Link link
) throws InterruptedException, TimeoutException {
+
link
.printf("c s\np\nf\nl\nv\n");
lines = new LinkedList<String>();
radio_setting = 0;
radio_frequency = 0;
stored_flight = 0;
for (;;) {
lines = new LinkedList<String>();
radio_setting = 0;
radio_frequency = 0;
stored_flight = 0;
for (;;) {
- String line =
serial_line
.get_reply();
+ String line =
link
.get_reply();
if (line == null)
throw new TimeoutException();
if (line.contains("Syntax error"))
if (line == null)
throw new TimeoutException();
if (line.contains("Syntax error"))