boost_tick = tick;
}
+ public double ticks_per_sec = 100.0;
+
+ public void set_ticks_per_sec(double ticks_per_sec) {
+ this.ticks_per_sec = ticks_per_sec;
+ }
+
public double time() {
if (tick == AltosLib.MISSING)
return AltosLib.MISSING;
if (boost_tick == AltosLib.MISSING)
return AltosLib.MISSING;
- return (tick - boost_tick) / 100.0;
+ return (tick - boost_tick) / ticks_per_sec;
}
public double boost_time() {
if (boost_tick == AltosLib.MISSING)
return AltosLib.MISSING;
- return boost_tick / 100.0;
+ return boost_tick / ticks_per_sec;
}
public int state = AltosLib.MISSING;
this.state = state;
}
- public double gps_ground_altitude = AltosLib.MISSING;
+ public AltosGPS gps_pad = null;
+
+ public double gps_pad_altitude = AltosLib.MISSING;
- public void set_gps_altitude(double altitude) {
- if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) ||
- gps_ground_altitude == AltosLib.MISSING)
- gps_ground_altitude = altitude;
+ public void set_gps(AltosGPS gps) {
+ if ((state != AltosLib.MISSING && state < AltosLib.ao_flight_boost) || gps_pad == null)
+ gps_pad = gps;
+ if (gps_pad_altitude == AltosLib.MISSING && gps.alt != AltosLib.MISSING)
+ gps_pad_altitude = gps.alt;
}
/*
* object and then deliver the result atomically to the listener
*/
AltosGPS temp_gps = null;
+ AltosGPS prev_gps = null;
int temp_gps_sat_tick = AltosLib.MISSING;
public AltosGPS temp_gps() {
public void reset_temp_gps() {
if (temp_gps != null) {
if (temp_gps.locked && temp_gps.nsat >= 4)
- set_gps_altitude(temp_gps.alt);
+ set_gps(temp_gps);
+ prev_gps = temp_gps;
+ temp_gps = null;
}
- temp_gps = null;
}
public boolean gps_pending() {
public AltosGPS make_temp_gps(int tick, boolean sats) {
if (temp_gps == null) {
- temp_gps = new AltosGPS();
+ if (prev_gps != null)
+ temp_gps = prev_gps.clone();
+ else
+ temp_gps = new AltosGPS();
}
if (sats) {
if (tick != temp_gps_sat_tick)