projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Add 1.9 release notes
[fw/altos]
/
telegps
/
TeleGPSState.java
diff --git
a/telegps/TeleGPSState.java
b/telegps/TeleGPSState.java
index 9ba0b7a59cabf42b7cee93b371750a530d0fd2e1..0c15cbb1d3724ae3c3d6ab87ebf257f21672acc7 100644
(file)
--- a/
telegps/TeleGPSState.java
+++ b/
telegps/TeleGPSState.java
@@
-22,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_1
1
.*;
-import org.altusmetrum.altosuilib_1
1
.*;
+import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altosuilib_1
3
.*;
public class TeleGPSState extends AltosUIFlightTab {
public class TeleGPSState extends AltosUIFlightTab {
@@
-124,10
+124,11
@@
public class TeleGPSState extends AltosUIFlightTab {
class FirmwareVersion extends AltosUIIndicator {
public void show(AltosState state, AltosListenerState listener_state) {
class FirmwareVersion extends AltosUIIndicator {
public void show(AltosState state, AltosListenerState listener_state) {
- if (state.firmware_version == null)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data.firmware_version == null)
show("Missing");
else
show("Missing");
else
- show(
state
.firmware_version);
+ show(
cal_data
.firmware_version);
}
public FirmwareVersion(Container container, int y) {
}
public FirmwareVersion(Container container, int y) {
@@
-137,9
+138,8
@@
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) {
- int storage = state.flight_log_max;
- if (storage == AltosLib.MISSING)
- storage = state.log_space >> 10;
+ AltosCalData cal_data = state.cal_data();
+ int storage = cal_data.flight_log_max;
if (storage == AltosLib.MISSING)
show("Missing");
else
if (storage == AltosLib.MISSING)
show("Missing");
else