altos: Remove *_TO_DATA macros

[fw/altos] / altoslib / AltosMag.java

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index e24fa11dafd9031209041739aefde6ccc5e19642..cbf9ecff21917b716dc60b2a1b05235220a9202e 100644 (file)
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.*;
 import java.io.*;
@@ -62,9 +62,10 @@ public class AltosMag implements Cloneable {
                y = AltosLib.MISSING;
        }
 
-       static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+       static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
                try {
                        AltosMag        mag = new AltosMag(link);
+                       AltosCalData    cal_data = listener.cal_data();
 
                        if (mag != null)
                                listener.set_mag(cal_data.mag_along(mag.y),