projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telegps: Keep ring of recent GPS positions to detect motion quickly
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index 6d5ce18512954c66a3aceee7c4c994760786e773..6137487c418cb0bf8fc414c292a00b2e77516dde 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_
1
.*;
-import org.altusmetrum.altosuilib_
1
.*;
+import org.altusmetrum.altoslib_
4
.*;
+import org.altusmetrum.altosuilib_
2
.*;
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;
@@
-233,7
+237,7
@@
public class AltosUI extends AltosUIFrame {
});
setLocationByPlatform(false);
});
setLocationByPlatform(false);
-
+
/* Insets aren't set before the window is visible */
setVisible(true);
}
/* Insets aren't set before the window is visible */
setVisible(true);
}
@@
-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
@@
-350,10
+354,10
@@
public class AltosUI extends AltosUIFrame {
FileInputStream in;
in = new FileInputStream(file);
FileInputStream in;
in = new FileInputStream(file);
- if (file.getName().endsWith("
eepro
m"))
- return new Altos
Eeprom
File(in);
+ if (file.getName().endsWith("
tele
m"))
+ return new Altos
Telemetry
File(in);
else
else
- return n
ull; // new AltosTelemetryIterab
le(in);
+ return n
ew AltosEepromFi
le(in);
} catch (FileNotFoundException fe) {
System.out.printf("%s\n", fe.getMessage());
return null;
} catch (FileNotFoundException fe) {
System.out.printf("%s\n", fe.getMessage());
return null;
@@
-434,11
+438,10
@@
public class AltosUI extends AltosUIFrame {
System.out.printf("Failed to open file '%s'\n", file);
return null;
}
System.out.printf("Failed to open file '%s'\n", file);
return null;
}
- if (file.getName().endsWith("eeprom")) {
+ if (file.getName().endsWith("telem"))
+ return new AltosTelemetryFile(in);
+ else
return new AltosEepromFile(in);
return new AltosEepromFile(in);
- } else {
- return null; // new AltosTelemetryIterable(in);
- }
}
static AltosReplayReader replay_file(File file) {
}
static AltosReplayReader replay_file(File file) {
@@
-469,7
+472,7
@@
public class AltosUI extends AltosUIFrame {
}
return false;
}
}
return false;
}
-
+
static boolean process_summary(File file) {
AltosStateIterable states = record_iterable(file);
if (states == null)
static boolean process_summary(File file) {
AltosStateIterable states = record_iterable(file);
if (states == null)
@@
-493,7
+496,7
@@
public class AltosUI extends AltosUIFrame {
stats.max_speed,
AltosConvert.meters_to_feet(stats.max_speed),
AltosConvert.meters_to_mach(stats.max_speed));
stats.max_speed,
AltosConvert.meters_to_feet(stats.max_speed),
AltosConvert.meters_to_mach(stats.max_speed));
- if (stats.max_acceleration != Altos
Record
.MISSING) {
+ if (stats.max_acceleration != Altos
Lib
.MISSING) {
System.out.printf("Max accel: %6.0f m/s² %6.0f ft/s² %6.2f g\n",
stats.max_acceleration,
AltosConvert.meters_to_feet(stats.max_acceleration),
System.out.printf("Max accel: %6.0f m/s² %6.0f ft/s² %6.2f g\n",
stats.max_acceleration,
AltosConvert.meters_to_feet(stats.max_acceleration),
@@
-517,10
+520,12
@@
public class AltosUI extends AltosUIFrame {
static boolean process_cat(File file) {
try {
static boolean process_cat(File file) {
try {
- FileInputStream input = new FileInputStream(file);
- AltosEepromFile eef = new AltosEepromFile(input);
+ AltosStateIterable eef = record_iterable(file);
+ System.out.printf ("process cat\n");
for (AltosState state : eef) {
for (AltosState state : eef) {
+ System.out.printf ("tick %d state %d height %g\n",
+ state.tick, state.state, state.height());
if ((state.set & AltosState.set_gps) != 0)
System.out.printf ("time %g lat %g lon %g alt %g\n",
state.time_since_boost(),
if ((state.set & AltosState.set_gps) != 0)
System.out.printf ("time %g lat %g lon %g alt %g\n",
state.time_since_boost(),
@@
-546,7
+551,7
@@
public class AltosUI extends AltosUIFrame {
System.out.printf(" --kml\tgenerate KML output for use with Google Earth\n");
System.exit(code);
}
System.out.printf(" --kml\tgenerate KML output for use with Google Earth\n");
System.exit(code);
}
-
+
public static void main(final String[] args) {
int errors = 0;
load_library(null);
public static void main(final String[] args) {
int errors = 0;
load_library(null);
@@
-559,8
+564,9
@@
public class AltosUI extends AltosUIFrame {
AltosUI altosui = new AltosUI();
java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
AltosUI altosui = new AltosUI();
java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
- for (AltosDevice device : devices)
- altosui.telemetry_window(device);
+ if (devices != null)
+ for (AltosDevice device : devices)
+ altosui.telemetry_window(device);
} else {
int process = process_none;
for (int i = 0; i < args.length; i++) {
} else {
int process = process_none;
for (int i = 0; i < args.length; i++) {
@@
-572,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, 5, 5
);
+
// AltosSiteMap.prefetchMaps(lat, lon
);
i += 2;
}
} else if (args[i].equals("--replay"))
i += 2;
}
} else if (args[i].equals("--replay"))