X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosRecord.java;h=3440d935348f074efec3a5d9b53de8557e4b0319;hp=c3e9d2110d52c9f013a8da6d342acce47878ae8f;hb=0e917f3ff822616adb147517ac961422e5fedbfd;hpb=d8bf05f7ad55964c9bce0551e58f4ef6c9f721ad

diff --git a/ao-tools/altosui/AltosRecord.java b/ao-tools/altosui/AltosRecord.java
index c3e9d211..3440d935 100644
--- 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;
-	String	state;
+	int	state;
 	int	tick;
 	int	accel;
 	int	pres;
@@ -72,7 +72,7 @@ public class AltosRecord {
 	}
 
 	public double pressure() {
-		return barometer_to_pressure(pres);
+		return barometer_to_pressure(flight_pres);
 	}
 
 	public double ground_pressure() {
@@ -136,9 +136,8 @@ public class AltosRecord {
 		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 {
@@ -188,7 +187,7 @@ public class AltosRecord {
 		flight = 0;
 		rssi = 0;
 		status = 0;
-		state = "startup";
+		state = Altos.ao_flight_startup;
 		tick = 0;
 		accel = 0;
 		pres = 0;