projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Deal with AltosState changes
[fw/altos]
/
altoslib
/
AltosDataListener.java
diff --git
a/altoslib/AltosDataListener.java
b/altoslib/AltosDataListener.java
index 14c29d85263fc332e2ebe29f8be7bf6a22f121ec..f8d38731ea5004138ebf579d1f70e7d6d5a7881e 100644
(file)
--- a/
altoslib/AltosDataListener.java
+++ b/
altoslib/AltosDataListener.java
@@
-16,9
+16,9
@@
package org.altusmetrum.altoslib_11;
public abstract class AltosDataListener {
public abstract class AltosDataListener {
- public AltosCalData cal_data;
-
- public
double tim
e = AltosLib.MISSING;
+ public AltosCalData cal_data
= null
;
+ public double time = AltosLib.MISSING;
+ public
int stat
e = AltosLib.MISSING;
public void set_time(double time) {
if (time != AltosLib.MISSING)
public void set_time(double time) {
if (time != AltosLib.MISSING)
@@
-29,8
+29,6
@@
public abstract class AltosDataListener {
return time;
}
return time;
}
- public int state = AltosLib.MISSING;
-
public void set_state(int state) {
if (state != AltosLib.MISSING)
this.state = state;
public void set_state(int state) {
if (state != AltosLib.MISSING)
this.state = state;
@@
-67,6
+65,9
@@
public abstract class AltosDataListener {
public abstract void set_pyro_fired(int pyro_mask);
public abstract void set_companion(AltosCompanion companion);
public abstract void set_pyro_fired(int pyro_mask);
public abstract void set_companion(AltosCompanion companion);
+ public AltosDataListener() {
+ }
+
public AltosDataListener(AltosCalData cal_data) {
this.cal_data = cal_data;
}
public AltosDataListener(AltosCalData cal_data) {
this.cal_data = cal_data;
}