altoslib: Use AltosTelemetry.parse to pull telem lines apart

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

diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 17b04970ae613c7eb514d2fd9914a29bc68ceeb7..850b0437ebca932dffab808c593435ecb83f4607 100644 (file)
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -84,7 +84,7 @@ public class AltosLog implements Runnable {
                                if (line.line == null)
                                        continue;
                                try {
                                if (line.line == null)
                                        continue;
                                try {

-                                       AltosTelemetry  telem = new AltosTelemetryLegacy(line.line);
+                                       AltosTelemetry  telem = AltosTelemetry.parse(line.line);

                                        if (state != null)
                                                state = state.clone();
                                        else
                                        if (state != null)
                                                state = state.clone();
                                        else

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index dfbad5fb21c7b431b85cdc9e91990afcf2ffb60e..aea978445578e536b3daf3a5b1ffc73ffaf3675d 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -34,7 +34,7 @@ public class AltosTelemetryReader extends AltosFlightReader {
                AltosLine l = telem.take();
                if (l.line == null)
                        throw new IOException("IO error");
                AltosLine l = telem.take();
                if (l.line == null)
                        throw new IOException("IO error");

-               AltosTelemetry  telem = AltosTelemetryLegacy.parse(l.line);
+               AltosTelemetry  telem = AltosTelemetry.parse(l.line);

                if (state == null)
                        state = new AltosState();
                else
                if (state == null)
                        state = new AltosState();
                else