altoslib: Remove spurious semicolon in AltosReplayReader.java

[fw/altos] / altoslib / AltosMag.java

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 0f8399ab02b28976f1798b52a77cc74d40d85590..0d8ec69fec6ecf85bd448d988b4de25577169673 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
@@ -15,11 +16,75 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_12;
 
-public class AltosMag {
+import java.util.concurrent.*;
+import java.io.*;
+
+public class AltosMag implements Cloneable {
        public int              x;
-       public int              y;
        public int              z;
+       public int              y;
+
+       public static final double counts_per_gauss = 1090;
+
+       public static double convert_gauss(double counts) {
+               return counts / counts_per_gauss;
+       }
+
+       public boolean parse_string(String line) {
+
+               if (!line.startsWith("X:"))
+                       return false;
+
+               String[] items = line.split("\\s+");
+
+               if (items.length >= 6) {
+                       x = Integer.parseInt(items[1]);
+                       z = Integer.parseInt(items[3]);
+                       y = Integer.parseInt(items[5]);
+               }
+               return true;
+       }
+
+       public AltosMag clone() {
+               AltosMag n = new AltosMag();
+
+               n.x = x;
+               n.z = z;
+               n.y = y;
+               return n;
+       }
+
+       public AltosMag() {
+               x = AltosLib.MISSING;
+               z = AltosLib.MISSING;
+               y = AltosLib.MISSING;
+       }
+
+       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),
+                                                cal_data.mag_across(mag.x),
+                                                cal_data.mag_through(mag.z));
+               } catch (TimeoutException te) {
+               }
+       }
+
+       public AltosMag(AltosLink link) throws InterruptedException, TimeoutException {
+               this();
+               link.printf("M\n");
+               for (;;) {
+                       String line = link.get_reply_no_dialog(5000);
+                       if (line == null) {
+                               throw new TimeoutException();
+                       }
+                       if (parse_string(line))
+                               break;
+               }
+       }
 }
-       
\ No newline at end of file