projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Allow buttons to be high when pressed rather than low
[fw/altos]
/
telegps
/
TeleGPSState.java
diff --git
a/telegps/TeleGPSState.java
b/telegps/TeleGPSState.java
index dac7da5213230785ed52febe596c59777b3f8eda..9ba0b7a59cabf42b7cee93b371750a530d0fd2e1 100644
(file)
--- a/
telegps/TeleGPSState.java
+++ b/
telegps/TeleGPSState.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-21,8
+22,8
@@
import java.util.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
8
.*;
-import org.altusmetrum.altosuilib_
8
.*;
+import org.altusmetrum.altoslib_
11
.*;
+import org.altusmetrum.altosuilib_
11
.*;
public class TeleGPSState extends AltosUIFlightTab {
public class TeleGPSState extends AltosUIFlightTab {
@@
-136,10
+137,13
@@
public class TeleGPSState extends AltosUIFlightTab {
class FlightLogMax extends AltosUIIndicator {
public void show(AltosState state, AltosListenerState listener_state) {
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("Missing");
else
- show(String.format("%dkB", st
ate.flight_log_max
));
+ show(String.format("%dkB", st
orage
));
}
public FlightLogMax(Container container, int y) {
}
public FlightLogMax(Container container, int y) {