Merge branch 'master' into stm-flash

Conflicts:
	ao-tools/ao-stmload/ao-stmload.c

1 files changed, 8 insertions, 0 deletions

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index f365b821..b4293c73 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -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;