projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Hook up apple messages to callbacks
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index a1bc83bf11c28c40fe2545f7e5dcd8691f37f277..1eb038055af1c23e219d53c282c47dfc4e611c9c 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-22,8
+22,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
3
.*;
-import org.altusmetrum.altosuilib_
1
.*;
+import org.altusmetrum.altoslib_
5
.*;
+import org.altusmetrum.altosuilib_
3
.*;
public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
public class AltosUI extends AltosUIFrame {
public AltosVoice voice = new AltosVoice();
@@
-74,6
+74,10
@@
public class AltosUI extends AltosUIFrame {
}
}
}
}
+ public void scan_device_selected(AltosDevice device) {
+ telemetry_window(device);
+ }
+
Container pane;
GridBagLayout gridbag;
Container pane;
GridBagLayout gridbag;
@@
-272,11
+276,11
@@
public class AltosUI extends AltosUIFrame {
}
void ScanChannels() {
}
void ScanChannels() {
- new AltosScanUI(AltosUI.this);
+ new AltosScanUI(AltosUI.this
, true
);
}
void LoadMaps() {
}
void LoadMaps() {
- new Altos
Site
MapPreload(AltosUI.this);
+ new Altos
UI
MapPreload(AltosUI.this);
}
void LaunchController() {
}
void LaunchController() {
@@
-302,7
+306,7
@@
public class AltosUI extends AltosUIFrame {
* a TeleDongle over the packet link
*/
private void SaveFlightData() {
* a TeleDongle over the packet link
*/
private void SaveFlightData() {
- new AltosEepromManage(AltosUI.this);
+ new AltosEepromManage(AltosUI.this
, AltosLib.product_any
);
}
/* Load a flight log file and write out a CSV file containing
}
/* Load a flight log file and write out a CSV file containing
@@
-574,7
+578,7
@@
public class AltosUI extends AltosUIFrame {
} else {
double lat = Double.parseDouble(args[i+1]);
double lon = Double.parseDouble(args[i+2]);
} else {
double lat = Double.parseDouble(args[i+1]);
double lon = Double.parseDouble(args[i+2]);
-
AltosSiteMap.prefetchMaps(lat, lon);
+
//
AltosSiteMap.prefetchMaps(lat, lon);
i += 2;
}
} else if (args[i].equals("--replay"))
i += 2;
}
} else if (args[i].equals("--replay"))