diff options
| author | Keith Packard <keithp@keithp.com> | 2017-05-27 00:27:04 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-05-27 00:27:04 -0700 |
| commit | b6b5c64f93fa56bcb22ea1c4279e4f754e6e6f1c (patch) | |
| tree | 6ec6ecb767be291c8712030e0097fae051652637 /altoslib/AltosDataListener.java | |
| parent | 8b4dcca73c65e87462d5f8d08dbc025aa8cf08a6 (diff) | |
altosdroid: Deal with AltosState changes
cal data split out from altos state.
altos state needed to have no-arguments constructor for JSON code.
Also messed with voice to make it stay quiet during app startup.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosDataListener.java')
| -rw-r--r-- | altoslib/AltosDataListener.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java index 14c29d85..f8d38731 100644 --- a/altoslib/AltosDataListener.java +++ b/altoslib/AltosDataListener.java @@ -16,9 +16,9 @@ package org.altusmetrum.altoslib_11; public abstract class AltosDataListener { - public AltosCalData cal_data; - - public double time = AltosLib.MISSING; + public AltosCalData cal_data = null; + public double time = AltosLib.MISSING; + public int state = AltosLib.MISSING; public void set_time(double time) { if (time != AltosLib.MISSING) @@ -29,8 +29,6 @@ public abstract class AltosDataListener { return time; } - public int state = AltosLib.MISSING; - 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 AltosDataListener() { + } + public AltosDataListener(AltosCalData cal_data) { this.cal_data = cal_data; } |