altos/lisp: Fix uninitialized values in ao_lisp_make_const

[fw/altos] / altoslib / AltosMag.java

diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index b3bbd92fa9843acbcbdf633489e7c0c741357af2..e89ec0debf5742abff50960451dd0006b02b3493 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,82 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_11;
 
-public class AltosMag {
-       public int              x;
-       public int              y;
-       public int              z;
+import java.util.concurrent.*;
+import java.io.*;
+
+public class AltosMag implements Cloneable {
+       public int              along;
+       public int              across;
+       public int              through;
+
+       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("Syntax error")) {
+//                     along = across = through = 0;
+//                     return true;
+//             }
+
+               if (!line.startsWith("X:"))
+                       return false;
+
+               String[] items = line.split("\\s+");
+
+               if (items.length >= 6) {
+                       along = Integer.parseInt(items[1]);
+                       across = Integer.parseInt(items[3]);
+                       through = Integer.parseInt(items[5]);
+               }
+               return true;
+       }
+
+       public AltosMag clone() {
+               AltosMag n = new AltosMag();
+
+               n.along = along;
+               n.across = across;
+               n.through = through;
+               return n;
+       }
+
+       public AltosMag() {
+               along = AltosLib.MISSING;
+               across = AltosLib.MISSING;
+               through = AltosLib.MISSING;
+       }
+
+       public AltosMag(int along, int across, int through) {
+               this.along = along;
+               this.across = across;
+               this.through = through;
+       }
+
+       static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+               try {
+                       AltosMag        mag = new AltosMag(link);
+
+                       if (mag != null)
+                               state.set_mag(mag);
+               } 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