projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Split setup functions to separate dialog
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
TelemetryState.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index d023128f30bed382373bb85128a8a4c07984bea5..d3ccf0a9d8e576bab5e75c5cb96f2d0906790677 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@
-18,7
+18,7
@@
package org.altusmetrum.AltosDroid;
import java.util.*;
package org.altusmetrum.AltosDroid;
import java.util.*;
-import org.altusmetrum.altoslib_
7
.*;
+import org.altusmetrum.altoslib_
10
.*;
import android.location.Location;
public class TelemetryState {
import android.location.Location;
public class TelemetryState {
@@
-30,8
+30,8
@@
public class TelemetryState {
int connect;
DeviceAddress address;
AltosConfigData config;
int connect;
DeviceAddress address;
AltosConfigData config;
- Location location;
int crc_errors;
int crc_errors;
+ double receiver_battery;
double frequency;
int telemetry_rate;
double frequency;
int telemetry_rate;
@@
-43,8
+43,8
@@
public class TelemetryState {
connect = CONNECT_NONE;
config = null;
states = new HashMap<Integer,AltosState>();
connect = CONNECT_NONE;
config = null;
states = new HashMap<Integer,AltosState>();
- location = null;
crc_errors = 0;
crc_errors = 0;
+ receiver_battery = AltosLib.MISSING;
frequency = AltosPreferences.frequency(0);
telemetry_rate = AltosPreferences.telemetry_rate(0);
}
frequency = AltosPreferences.frequency(0);
telemetry_rate = AltosPreferences.telemetry_rate(0);
}