diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:02:00 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-06-17 10:02:00 -0600 |
| commit | 085336c45ce0577031a7af5de117a8b856160708 (patch) | |
| tree | 13a145eab69e38f2658359fa8395e7257b3c3fb9 /telegps/TeleGPSState.java | |
| parent | 50c9a54ac6b04458970eedfa6d3e0e25f41c765f (diff) | |
| parent | 639e461ded29a48c155afea12171cbfc191ccfd7 (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'telegps/TeleGPSState.java')
| -rw-r--r-- | telegps/TeleGPSState.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/telegps/TeleGPSState.java b/telegps/TeleGPSState.java index 46e48fc4..e01ef47e 100644 --- a/telegps/TeleGPSState.java +++ b/telegps/TeleGPSState.java @@ -21,8 +21,8 @@ import java.util.*; import java.awt.*; import java.awt.event.*; import javax.swing.*; -import org.altusmetrum.altoslib_10.*; -import org.altusmetrum.altosuilib_10.*; +import org.altusmetrum.altoslib_11.*; +import org.altusmetrum.altosuilib_11.*; public class TeleGPSState extends AltosUIFlightTab { @@ -136,10 +136,13 @@ public class TeleGPSState extends AltosUIFlightTab { class FlightLogMax extends AltosUIIndicator { public void show(AltosState state, AltosListenerState listener_state) { - if (state.flight_log_max == AltosLib.MISSING) + int storage = state.flight_log_max; + if (storage == AltosLib.MISSING) + storage = state.log_space >> 10; + if (storage == AltosLib.MISSING) show("Missing"); else - show(String.format("%dkB", state.flight_log_max)); + show(String.format("%dkB", storage)); } public FlightLogMax(Container container, int y) { |