diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-06 13:41:36 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-06 13:41:36 -0600 |
| commit | 8c212cd5bfa03f71a31d84bd0051314e77d88461 (patch) | |
| tree | 5be036b3510b8b474ad829caea20fcbc75b56839 /altoslib/AltosEepromGPS.java | |
| parent | e9714e34091abe657aa1b30aeda9466331aa39c1 (diff) | |
| parent | dd26ec2e706bdd29090759deeb90090a0e3b74f0 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
ao-bringup/turnon_telemega
Diffstat (limited to 'altoslib/AltosEepromGPS.java')
| -rw-r--r-- | altoslib/AltosEepromGPS.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/altoslib/AltosEepromGPS.java b/altoslib/AltosEepromGPS.java index 482f0b5f..8c991a6e 100644 --- a/altoslib/AltosEepromGPS.java +++ b/altoslib/AltosEepromGPS.java @@ -91,8 +91,10 @@ public class AltosEepromGPS extends AltosEeprom { switch (cmd) { case AltosLib.AO_LOG_FLIGHT: - state.set_boost_tick(tick); - state.set_flight(flight()); + if (state.flight == AltosLib.MISSING) { + state.set_boost_tick(tick); + state.set_flight(flight()); + } /* no place to log start lat/lon yet */ break; case AltosLib.AO_LOG_GPS_TIME: |