projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Start idle thread after the rocket leaves the pad
[fw/altos]
/
ao-tools
/
altosui
/
AltosRecord.java
diff --git
a/ao-tools/altosui/AltosRecord.java
b/ao-tools/altosui/AltosRecord.java
index c3e9d2110d52c9f013a8da6d342acce47878ae8f..b670ee371abed05de27cfd835642b16591a00adc 100644
(file)
--- a/
ao-tools/altosui/AltosRecord.java
+++ b/
ao-tools/altosui/AltosRecord.java
@@
-31,7
+31,7
@@
public class AltosRecord {
int flight;
int rssi;
int status;
int flight;
int rssi;
int status;
-
String
state;
+
int
state;
int tick;
int accel;
int pres;
int tick;
int accel;
int pres;
@@
-48,6
+48,8
@@
public class AltosRecord {
int accel_minus_g;
AltosGPS gps;
int accel_minus_g;
AltosGPS gps;
+ double time; /* seconds since boost */
+
/*
* Values for our MP3H6115A pressure sensor
*
/*
* Values for our MP3H6115A pressure sensor
*
@@
-72,7
+74,7
@@
public class AltosRecord {
}
public double pressure() {
}
public double pressure() {
- return barometer_to_pressure(pres);
+ return barometer_to_pressure(
flight_
pres);
}
public double ground_pressure() {
}
public double ground_pressure() {
@@
-136,9
+138,8
@@
public class AltosRecord {
return speed;
}
return speed;
}
- public int state() {
- System.out.printf("state: %s -> %d\n", state, Altos.state(state));
- return Altos.state(state);
+ public String state() {
+ return Altos.state_name(state);
}
public static String gets(FileInputStream s) throws IOException {
}
public static String gets(FileInputStream s) throws IOException {
@@
-188,7
+189,7
@@
public class AltosRecord {
flight = 0;
rssi = 0;
status = 0;
flight = 0;
rssi = 0;
status = 0;
- state =
"startup"
;
+ state =
Altos.ao_flight_startup
;
tick = 0;
accel = 0;
pres = 0;
tick = 0;
accel = 0;
pres = 0;