Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosTelemetryReader.java

diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 1020efb0f1f4ffc0d1cbeaccd45a904e58297483..8fb61a4fe32490cbc4a31a6f16dbb71f33d0f643 100644 (file)
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.text.*;
 import java.io.*;
@@ -41,19 +41,15 @@ public class AltosTelemetryReader extends AltosFlightReader {
                                throw new IOException("IO error");
                } while (!link.get_monitor());
                AltosTelemetry  telem = AltosTelemetry.parse(l.line);
-               if (state == null) {
-                       System.out.printf("Make state\n");
+               if (state == null)
                        state = new AltosState(cal_data());
-               }
-               telem.provide_data(state, state.cal_data);
+               telem.provide_data(state);
                return state;
        }
 
        public AltosCalData cal_data() {
-               if (cal_data == null) {
-                       System.out.printf("Make cal data\n");
+               if (cal_data == null)
                        cal_data = new AltosCalData();
-               }
                return cal_data;
        }