* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_2;
+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;
public double ground_speed; /* m/s */
public int course; /* degrees */
public double climb_rate; /* m/s */
+ public double pdop; /* unitless */
public double hdop; /* unitless */
public double vdop; /* unitless */
- public int h_error; /* m */
- public int v_error; /* m */
+ public double h_error; /* m */
+ public double v_error; /* m */
public AltosGPSSat[] cc_gps_sat; /* tracking data */
AltosLib.MISSING, 1/100.0);
course = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_COURSE,
AltosLib.MISSING);
+ pdop = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_PDOP, MISSING, 1.0);
hdop = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_HDOP, MISSING, 1.0);
vdop = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_VDOP, MISSING, 1.0);
h_error = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_HERROR, MISSING);
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++]);
}
cc_gps_sat[cc_gps_sat.length - 1] = sat;
}
- public AltosGPS() {
+ private void init() {
lat = AltosLib.MISSING;
lon = AltosLib.MISSING;
alt = AltosLib.MISSING;
+ ground_speed = AltosLib.MISSING;
+ course = AltosLib.MISSING;
+ climb_rate = AltosLib.MISSING;
+ pdop = AltosLib.MISSING;
+ hdop = AltosLib.MISSING;
+ vdop = AltosLib.MISSING;
+ h_error = AltosLib.MISSING;
+ v_error = AltosLib.MISSING;
ClearGPSTime();
cc_gps_sat = null;
}
+ public AltosGPS() {
+ init();
+ }
+
public AltosGPS clone() {
AltosGPS g = new AltosGPS();
g.ground_speed = ground_speed; /* m/s */
g.course = course; /* degrees */
g.climb_rate = climb_rate; /* m/s */
- g.hdop = hdop; /* unitless? */
+ g.pdop = pdop; /* unitless */
+ g.hdop = hdop; /* unitless */
+ g.vdop = vdop; /* unitless */
g.h_error = h_error; /* m */
g.v_error = v_error; /* m */
ground_speed = old.ground_speed; /* m/s */
course = old.course; /* degrees */
climb_rate = old.climb_rate; /* m/s */
+ pdop = old.pdop; /* unitless? */
hdop = old.hdop; /* unitless? */
- h_error = old.h_error; /* m */
- v_error = old.v_error; /* m */
+ vdop = old.vdop; /* unitless? */
+ h_error = old.h_error; /* m */
+ v_error = old.v_error; /* m */
if (old.cc_gps_sat != null) {
cc_gps_sat = new AltosGPSSat[old.cc_gps_sat.length];
}
}
} else {
- lat = AltosLib.MISSING;
- lon = AltosLib.MISSING;
- alt = AltosLib.MISSING;
- ClearGPSTime();
- cc_gps_sat = null;
+ init();
}
}
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);
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);
+ }
}
projects / fw / altos / blobdiff