int flight;
int rssi;
int status;
- String state;
+ int state;
int tick;
int accel;
int pres;
int accel_minus_g;
AltosGPS gps;
+ double time; /* seconds since boost */
+
/*
* Values for our MP3H6115A pressure sensor
*
}
public double pressure() {
- return barometer_to_pressure(pres);
+ return barometer_to_pressure(flight_pres);
}
public double ground_pressure() {
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 {
flight = 0;
rssi = 0;
status = 0;
- state = "startup";
+ state = Altos.ao_flight_startup;
tick = 0;
accel = 0;
pres = 0;