projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Make sure degree and minute values are visible (map preload)
[fw/altos]
/
altosui
/
AltosIgnite.java
diff --git
a/altosui/AltosIgnite.java
b/altosui/AltosIgnite.java
index 3cbd8a751e1e53af63fa54c4de70ffcc3b0bab80..7a06c63d41244a7a53d2581c15d17907f93b1400 100644
(file)
--- a/
altosui/AltosIgnite.java
+++ b/
altosui/AltosIgnite.java
@@
-19,6
+19,12
@@
package altosui;
import java.io.*;
import java.util.concurrent.*;
import java.io.*;
import java.util.concurrent.*;
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.filechooser.FileNameExtensionFilter;
+import javax.swing.table.*;
+import javax.swing.event.*;
public class AltosIgnite {
AltosDevice device;
public class AltosIgnite {
AltosDevice device;
@@
-36,11
+42,8
@@
public class AltosIgnite {
private void start_serial() throws InterruptedException {
serial_started = true;
private void start_serial() throws InterruptedException {
serial_started = true;
- if (remote) {
- serial.set_radio();
- serial.printf("p\nE 0\n");
- serial.flush_input();
- }
+ if (remote)
+ serial.start_remote();
}
private void stop_serial() throws InterruptedException {
}
private void stop_serial() throws InterruptedException {
@@
-49,10
+52,8
@@
public class AltosIgnite {
serial_started = false;
if (serial == null)
return;
serial_started = false;
if (serial == null)
return;
- if (remote) {
- serial.printf("~");
- serial.flush_output();
- }
+ if (remote)
+ serial.stop_remote();
}
class string_ref {
}
class string_ref {
@@
-120,7
+121,7
@@
public class AltosIgnite {
return status;
}
return status;
}
- public String status_string(int status) {
+ public
static
String status_string(int status) {
switch (status) {
case Unknown: return "Unknown";
case Ready: return "Ready";
switch (status) {
case Unknown: return "Unknown";
case Ready: return "Ready";
@@
-161,13
+162,17
@@
public class AltosIgnite {
serial = null;
}
serial = null;
}
+ public void set_frame(Frame frame) {
+ serial.set_frame(frame);
+ }
+
public AltosIgnite(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
device = in_device;
serial = new AltosSerial(device);
remote = false;
public AltosIgnite(AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
device = in_device;
serial = new AltosSerial(device);
remote = false;
- if (!device.matchProduct(Altos
Device
.product_telemetrum))
+ if (!device.matchProduct(Altos.product_telemetrum))
remote = true;
}
}
\ No newline at end of file
remote = true;
}
}
\ No newline at end of file