projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update java library version numbers
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index 4edae54adaef19185e2735abe0013a68d9e29fc7..7b41e98dcbe50daea61776a6cc8265ea1545edab 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-19,7
+19,7
@@
* Track flight state from telemetry or eeprom data stream
*/
* Track flight state from telemetry or eeprom data stream
*/
-package org.altusmetrum.altoslib_
8
;
+package org.altusmetrum.altoslib_
10
;
import java.io.*;
import java.io.*;
@@
-284,7
+284,7
@@
public class AltosState implements Cloneable, Serializable {
}
}
}
}
- p
ublic int
state;
+ p
rivate int
state;
public int flight;
public int serial;
public int altitude_32;
public int flight;
public int serial;
public int altitude_32;
@@
-1056,6
+1056,10
@@
public class AltosState implements Cloneable, Serializable {
}
}
}
}
+ public int state() {
+ return state;
+ }
+
public void set_device_type(int device_type) {
this.device_type = device_type;
switch (device_type) {
public void set_device_type(int device_type) {
this.device_type = device_type;
switch (device_type) {
@@
-1358,11
+1362,6
@@
public class AltosState implements Cloneable, Serializable {
}
}
}
}
- public void make_companion (int nchannels) {
- if (companion == null)
- companion = new AltosCompanion(nchannels);
- }
-
public void set_companion(AltosCompanion companion) {
this.companion = companion;
}
public void set_companion(AltosCompanion companion) {
this.companion = companion;
}