projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Handle EasyMini v2.0 ADC values
[fw/altos]
/
telegps
/
TeleGPSState.java
diff --git
a/telegps/TeleGPSState.java
b/telegps/TeleGPSState.java
index 9ba0b7a59cabf42b7cee93b371750a530d0fd2e1..2e39037c529f4e15d16111d70047025b6ff41ab8 100644
(file)
--- a/
telegps/TeleGPSState.java
+++ b/
telegps/TeleGPSState.java
@@
-124,10
+124,10
@@
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)
+ if (state.
cal_data.
firmware_version == null)
show("Missing");
else
show("Missing");
else
- show(state.firmware_version);
+ show(state.
cal_data.
firmware_version);
}
public FirmwareVersion(Container container, int y) {
}
public FirmwareVersion(Container container, int y) {
@@
-137,9
+137,7
@@
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;
+ int storage = state.cal_data.flight_log_max;
if (storage == AltosLib.MISSING)
show("Missing");
else
if (storage == AltosLib.MISSING)
show("Missing");
else