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 32ba12546d66c2ae9cbafbb766945f21299053ca..77cee787b56219fc27b4fab518c057389fa411d6 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@
-19,7
+19,7
@@
package org.altusmetrum.AltosDroid;
import java.util.*;
package org.altusmetrum.AltosDroid;
import java.util.*;
-import org.altusmetrum.altoslib_1
1
.*;
+import org.altusmetrum.altoslib_1
2
.*;
import android.location.Location;
public class TelemetryState {
import android.location.Location;
public class TelemetryState {
@@
-36,6
+36,8
@@
public class TelemetryState {
double frequency;
int telemetry_rate;
double frequency;
int telemetry_rate;
+ boolean quiet;
+
HashMap<Integer,AltosState> states;
int latest_serial;
HashMap<Integer,AltosState> states;
int latest_serial;