diff options
author | Bdale Garbee <bdale@gag.com> | 2013-05-16 00:36:23 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2013-05-16 00:36:23 -0600 |
commit | 02d111b1b53ef01fc6e9ab6c4bc60b8af1be0067 (patch) | |
tree | 8356f4a019969ee99a45e264c87d38555cf316cc /altoslib/AltosTelemetryReader.java | |
parent | 7a2e1f05adad990a6b161865267abf07ffec7a7e (diff) | |
parent | 7699a55aed3a9a7daeb4c6a5a9a280f43edf455f (diff) |
Merge branch 'branch-1.2' into debian
Diffstat (limited to 'altoslib/AltosTelemetryReader.java')
-rw-r--r-- | altoslib/AltosTelemetryReader.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java index 94fa560b..b4293c73 100644 --- a/altoslib/AltosTelemetryReader.java +++ b/altoslib/AltosTelemetryReader.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.AltosLib; +package org.altusmetrum.altoslib_1; import java.text.*; import java.io.*; @@ -107,6 +107,14 @@ public class AltosTelemetryReader extends AltosFlightReader { return log.file(); } + public boolean has_monitor_battery() { + return link.has_monitor_battery(); + } + + public double monitor_battery() { + return link.monitor_battery(); + } + public AltosTelemetryReader (AltosLink in_link) throws IOException, InterruptedException, TimeoutException { link = in_link; |