X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFlightReader.java;h=f252d60bdf600e701c62cf01a9af1a651eb24287;hp=3039b4dcbaf22b018ee1ecf057a81224ebdf844b;hb=27131ec7abda875595c61be0b151b73eb28afab9;hpb=bf88c5f829ea5d32043431945e862a9f6c96740a

diff --git a/altoslib/AltosFlightReader.java b/altoslib/AltosFlightReader.java
index 3039b4dc..f252d60b 100644
--- a/altoslib/AltosFlightReader.java
+++ b/altoslib/AltosFlightReader.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,22 +16,24 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_11;
 
 import java.text.*;
 import java.io.*;
 import java.util.concurrent.*;
 
-public class AltosFlightReader {
+public abstract class AltosFlightReader {
 	public String name;
 
 	public int serial;
 
-	public void init() { }
+	public void init() {}
 
-	public AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException { return null; }
+	public abstract AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException;
 
-	public void close(boolean interrupted) { }
+	public abstract AltosCalData cal_data();
+
+	public abstract void close(boolean interrupted);
 
 	public void set_frequency(double frequency) throws InterruptedException, TimeoutException { }
 
@@ -38,11 +41,19 @@ public class AltosFlightReader {
 
 	public void set_telemetry(int telemetry) { }
 
+	public void set_telemetry_rate(int telemetry_rate) throws InterruptedException, TimeoutException { }
+
 	public void save_telemetry() { }
 
-	public void update(AltosState state) throws InterruptedException { }
+	public void save_telemetry_rate() { }
 
 	public boolean supports_telemetry(int telemetry) { return false; }
 
+	public boolean supports_telemetry_rate(int telemetry_rate) { return false; }
+
 	public File backing_file() { return null; }
+
+	public boolean has_monitor_battery() throws InterruptedException { return false; }
+
+	public double monitor_battery() throws InterruptedException { return AltosLib.MISSING; }
 }