altoslib: Improve AltosState save/restore debugging

[fw/altos] / altoslib / AltosGPS.java

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index 0154e95d7c96d3231d831d18973010a32f1989f9..ba2eda1bfba5aa931ecd4ae385c0a91a092696aa 100644 (file)
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -15,12 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.text.*;
 import java.util.concurrent.*;
+import java.io.*;
 
-public class AltosGPS implements Cloneable {
+public class AltosGPS implements Cloneable, AltosJsonable {
 
        public final static int MISSING = AltosLib.MISSING;
 
@@ -194,10 +195,10 @@ public class AltosGPS implements Cloneable {
                        lon = AltosParse.parse_coord(words[i++]);
                        alt = AltosParse.parse_int(words[i++]);
                        if (version > 1 || (i < words.length && !words[i].equals("SAT"))) {
-                               ground_speed = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "m/s(H)"));
+                               ground_speed = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "m/s(H)"));
                                course = AltosParse.parse_int(words[i++]);
-                               climb_rate = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "m/s(V)"));
-                               hdop = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "(hdop)"));
+                               climb_rate = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "m/s(V)"));
+                               hdop = AltosParse.parse_double_net(AltosParse.strip_suffix(words[i++], "(hdop)"));
                                h_error = AltosParse.parse_int(words[i++]);
                                v_error = AltosParse.parse_int(words[i++]);
                        }
@@ -377,6 +378,7 @@ public class AltosGPS implements Cloneable {
 
        public AltosGPS (AltosLink link, AltosConfigData config_data) throws TimeoutException, InterruptedException {
                boolean says_done = config_data.compare_version("1.0") >= 0;
+               init();
                link.printf("g\n");
                for (;;) {
                        String line = link.get_reply_no_dialog(5000);
@@ -386,4 +388,65 @@ public class AltosGPS implements Cloneable {
                                break;
                }
        }
+
+       public AltosJson json() {
+               AltosJson       j = new AltosJson();
+
+               j.put("nsat", nsat);
+               j.put("locked", locked);
+               j.put("connected", connected);
+               j.put("lat", lat);
+               j.put("lon", lon);
+               j.put("alt", alt);
+               j.put("year", year);
+               j.put("month", month);
+               j.put("day", day);
+               j.put("hour", hour);
+               j.put("minute", minute);
+               j.put("second", second);
+
+               j.put("ground_speed", ground_speed);
+               j.put("course", course);
+               j.put("climb_rate", climb_rate);
+               j.put("pdop", pdop);
+               j.put("hdop", hdop);
+               j.put("vdop", vdop);
+               j.put("h_error", h_error);
+               j.put("v_error", v_error);
+               j.put("cc_gps_sat", cc_gps_sat);
+               return j;
+       }
+
+       public AltosGPS(AltosJson j) {
+               init();
+               nsat = j.get_int("nsat", nsat);
+               locked = j.get_boolean("locked", locked);
+               connected = j.get_boolean("connected", connected);
+               lat = j.get_double("lat", lat);
+               lon = j.get_double("lon", lon);
+               alt = j.get_double("alt", alt);
+               year = j.get_int("year", year);
+               month = j.get_int("month", month);
+               day = j.get_int("day", day);
+               hour = j.get_int("hour", hour);
+               minute = j.get_int("minute", minute);
+               second = j.get_int("second", second);
+
+               ground_speed = j.get_double("ground_speed", ground_speed);
+               course = j.get_int("course", course);
+               climb_rate = j.get_double("climb_rate", climb_rate);
+               pdop = j.get_double("pdop", pdop);
+               hdop = j.get_double("hdop", hdop);
+               vdop = j.get_double("vdop", vdop);
+               h_error = j.get_double("h_error", h_error);
+               v_error = j.get_double("v_error", v_error);
+               cc_gps_sat = AltosGPSSat.json_array(j.get("cc_gps_sat"));
+       }
+
+       public static AltosGPS fromJson(AltosJson j, AltosGPS def) {
+               if (j == null)
+                       return def;
+
+               return new AltosGPS(j);
+       }
 }