telegps: Get telegps application working again

Many minor API tweaks

Signed-off-by: Keith Packard <keithp@keithp.com>

3 files changed, 25 insertions, 12 deletions

diff --git a/altoslib/AltosFlightReader.java b/altoslib/AltosFlightReader.java
index 790710e0..f252d60b 100644
--- a/altoslib/AltosFlightReader.java
+++ b/altoslib/AltosFlightReader.java
@@ -31,6 +31,8 @@ public abstract class AltosFlightReader {
 
 	public abstract AltosState read() throws InterruptedException, ParseException, AltosCRCException, IOException;
 
+	public abstract AltosCalData cal_data();
+
 	public abstract void close(boolean interrupted);
 
 	public void set_frequency(double frequency) throws InterruptedException, TimeoutException { }
diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index e5a0541e..5abc0c2d 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -1075,11 +1075,14 @@ public class AltosState extends AltosDataListener {
 	}
 
 	public AltosState() {
+		Thread.dumpStack();
 		init();
 	}
 
 	public AltosState (AltosCalData cal_data) {
 		super(cal_data);
+		if (cal_data == null)
+			Thread.dumpStack();
 		init();
 	}
 }
diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 96113613..1020efb0 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -23,13 +23,13 @@ import java.io.*;
 import java.util.concurrent.*;
 
 public class AltosTelemetryReader extends AltosFlightReader {
-	AltosLink	link;
-	AltosLog	log;
-	double		frequency;
-	int		telemetry;
-	int		telemetry_rate;
-	public AltosState	state = null;
-	public AltosCalData	cal_data = null;
+	AltosLink		link;
+	AltosLog		log;
+	double			frequency;
+	int			telemetry;
+	int			telemetry_rate;
+	private AltosState	state = null;
+	private AltosCalData	cal_data = null;
 
 	LinkedBlockingQueue<AltosLine> telem;
 
@@ -41,14 +41,22 @@ public class AltosTelemetryReader extends AltosFlightReader {
 				throw new IOException("IO error");
 		} while (!link.get_monitor());
 		AltosTelemetry	telem = AltosTelemetry.parse(l.line);
-		if (cal_data == null)
-			cal_data = new AltosCalData();
-		if (state == null)
-			state = new AltosState(cal_data);
-		telem.provide_data(state, cal_data);
+		if (state == null) {
+			System.out.printf("Make state\n");
+			state = new AltosState(cal_data());
+		}
+		telem.provide_data(state, state.cal_data);
 		return state;
 	}
 
+	public AltosCalData cal_data() {
+		if (cal_data == null) {
+			System.out.printf("Make cal data\n");
+			cal_data = new AltosCalData();
+		}
+		return cal_data;
+	}
+
 	public void flush() {
 		telem.clear();
 	}