projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Add multi-tracker support
[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 fb7e18935954a5e6ca4f71803733e516ee06fce1..d023128f30bed382373bb85128a8a4c07984bea5 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@
-17,6
+17,7
@@
package org.altusmetrum.AltosDroid;
package org.altusmetrum.AltosDroid;
+import java.util.*;
import org.altusmetrum.altoslib_7.*;
import android.location.Location;
import org.altusmetrum.altoslib_7.*;
import android.location.Location;
@@
-29,16
+30,19
@@
public class TelemetryState {
int connect;
DeviceAddress address;
AltosConfigData config;
int connect;
DeviceAddress address;
AltosConfigData config;
- AltosState state;
Location location;
int crc_errors;
double frequency;
int telemetry_rate;
Location location;
int crc_errors;
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;
frequency = AltosPreferences.frequency(0);
location = null;
crc_errors = 0;
frequency = AltosPreferences.frequency(0);