From f2e45e4b1351ce505b9294d5dc25429ab9721e62 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 13 Feb 2020 15:00:55 -0800 Subject: [PATCH] altoslib: Move 'state_name' API to AltosCalData That's where state lives. Signed-off-by: Keith Packard --- altoslib/AltosCalData.java | 4 ++++ altoslib/AltosDataListener.java | 4 ++++ altoslib/AltosState.java | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index 7b16ae39..98f6b5b1 100644 --- a/altoslib/AltosCalData.java +++ b/altoslib/AltosCalData.java @@ -247,6 +247,10 @@ public class AltosCalData { public int state = AltosLib.MISSING; + public String state_name() { + return AltosLib.state_name(state); + } + public void set_state(int state) { if (state >= AltosLib.ao_flight_boost && boost_tick == AltosLib.MISSING) set_boost_tick(); diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java index 496235c3..52aeb5d5 100644 --- a/altoslib/AltosDataListener.java +++ b/altoslib/AltosDataListener.java @@ -70,6 +70,10 @@ public abstract class AltosDataListener { return time; } + public String state_name() { + return cal_data().state_name(); + } + public void set_state(int state) { cal_data().set_state(state); } diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java index b3bcff92..3ab2c0eb 100644 --- a/altoslib/AltosState.java +++ b/altoslib/AltosState.java @@ -860,10 +860,6 @@ public class AltosState extends AltosDataListener { } } - public String state_name() { - return AltosLib.state_name(state()); - } - public void set_state(int state) { super.set_state(state); ascent = (AltosLib.ao_flight_boost <= state() && -- 2.30.2