altoslib: Do data analysis on raw values rather than AltosState

[fw/altos] / altoslib / AltosMag.java

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index ec98882f2e0513629fa3e25395d814b120a9b757..523a31a5edb90f8076a52db1863792c806fbfb4a 100644 (file)
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.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
@@ -20,7 +21,7 @@ package org.altusmetrum.altoslib_11;
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
+public class AltosMag implements Cloneable {
        public int              along;
        public int              across;
        public int              through;
@@ -71,12 +72,14 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
                this.through = through;
        }
 
-       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+       static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
                try {
                        AltosMag        mag = new AltosMag(link);
 
                        if (mag != null)
-                               state.set_mag(mag);
+                               listener.set_mag(cal_data.mag_along(mag.along),
+                                                cal_data.mag_across(mag.across),
+                                                cal_data.mag_through(mag.through));
                } catch (TimeoutException te) {
                }
        }
@@ -93,52 +96,4 @@ public class AltosMag implements Cloneable, AltosHashable, AltosJsonable {
                                break;
                }
        }
-
-       public AltosHashSet hashSet() {
-               AltosHashSet    h = new AltosHashSet();
-
-               h.putInt("along", along);
-               h.putInt("across", across);
-               h.putInt("through", through);
-               return h;
-       }
-
-       public AltosJson json() {
-               AltosJson       j = new AltosJson();
-
-               j.put("along", along);
-               j.put("across", across);
-               j.put("through", through);
-               return j;
-       }
-
-       public AltosMag(AltosHashSet h) {
-               this();
-
-               along = h.getInt("along", along);
-               across = h.getInt("across", across);
-               through = h.getInt("through", through);
-       }
-
-       public static AltosMag fromHashSet(AltosHashSet h, AltosMag def) {
-               if (h == null)
-                       return def;
-
-               return new AltosMag(h);
-       }
-
-       public AltosMag(AltosJson j) {
-               this();
-
-               along = j.get_int("along", along);
-               across = j.get_int("across", across);
-               through = j.get_int("through", through);
-       }
-
-       public static AltosMag fromJson(AltosJson j, AltosMag def) {
-               if (j == null)
-                       return def;
-
-               return new AltosMag(j);
-       }
 }