projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[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 ca066fc27cfa461efe64cbb711bc91d44ee1dff2..c40df64800c2676188fc02c38c63318ba5c9a7d7 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@
-17,7
+17,8
@@
package org.altusmetrum.AltosDroid;
package org.altusmetrum.AltosDroid;
-import org.altusmetrum.altoslib_6.*;
+import java.util.*;
+import org.altusmetrum.altoslib_7.*;
import android.location.Location;
public class TelemetryState {
import android.location.Location;
public class TelemetryState {
@@
-29,18
+30,23
@@
public class TelemetryState {
int connect;
DeviceAddress address;
AltosConfigData config;
int connect;
DeviceAddress address;
AltosConfigData config;
- AltosState state;
Location location;
int crc_errors;
Location location;
int crc_errors;
+ double receiver_battery;
double frequency;
int telemetry_rate;
double frequency;
int telemetry_rate;
+ HashMap<Integer,AltosState> states;
+
+ int latest_serial;
+
public TelemetryState() {
connect = CONNECT_NONE;
config = null;
public TelemetryState() {
connect = CONNECT_NONE;
config = null;
- state
= null
;
+ state
s = new HashMap<Integer,AltosState>()
;
location = null;
crc_errors = 0;
location = null;
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);
}