X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosGPS.java;h=acb6fb2c8bbbdcb4c211022951ea13fb1427c2d2;hp=c3b368e26b47ce022f5e34068bf227e49d3bb7e1;hb=7e0506dc2014b7178f52b950e8c1cb820b35f9c6;hpb=447c121fc1ceb878e45718ad1364a5349965a59a

diff --git a/ao-tools/altosui/AltosGPS.java b/ao-tools/altosui/AltosGPS.java
index c3b368e2..acb6fb2c 100644
--- a/ao-tools/altosui/AltosGPS.java
+++ b/ao-tools/altosui/AltosGPS.java
@@ -23,49 +23,24 @@ import altosui.AltosParse;
 
 
 public class AltosGPS {
-	public class AltosGPSTime {
-		int year;
-		int month;
-		int day;
-		int hour;
-		int minute;
-		int second;
-
-		public AltosGPSTime(String date, String time) throws ParseException {
-			String[] ymd = date.split("-");
-			if (ymd.length != 3)
-				throw new ParseException("error parsing GPS date " + date + " got " + ymd.length, 0);
-			year = AltosParse.parse_int(ymd[0]);
-			month = AltosParse.parse_int(ymd[1]);
-			day = AltosParse.parse_int(ymd[2]);
-
-			String[] hms = time.split(":");
-			if (hms.length != 3)
-				throw new ParseException("Error parsing GPS time " + time + " got " + hms.length, 0);
-			hour = AltosParse.parse_int(hms[0]);
-			minute = AltosParse.parse_int(hms[1]);
-			second = AltosParse.parse_int(hms[2]);
-		}
-
-		public AltosGPSTime() {
-			year = month = day = 0;
-			hour = minute = second = 0;
-		}
-
-	}
-
 	public class AltosGPSSat {
 		int	svid;
 		int	c_n0;
 	}
 
 	int	nsat;
-	boolean	gps_locked;
-	boolean	gps_connected;
-	AltosGPSTime gps_time;
+	boolean	locked;
+	boolean	connected;
+	boolean date_valid;
 	double	lat;		/* degrees (+N -S) */
 	double	lon;		/* degrees (+E -W) */
 	int	alt;		/* m */
+	int	year;
+	int	month;
+	int	day;
+	int	hour;
+	int	minute;
+	int	second;
 
 	int	gps_extended;	/* has extra data */
 	double	ground_speed;	/* m/s */
@@ -77,48 +52,166 @@ public class AltosGPS {
 
 	AltosGPSSat[] cc_gps_sat;	/* tracking data */
 
-	public AltosGPS(String[] words, int i) throws ParseException {
+	void ParseGPSDate(String date) throws ParseException {
+		String[] ymd = date.split("-");
+		if (ymd.length != 3)
+			throw new ParseException("error parsing GPS date " + date + " got " + ymd.length, 0);
+		year = AltosParse.parse_int(ymd[0]);
+		month = AltosParse.parse_int(ymd[1]);
+		day = AltosParse.parse_int(ymd[2]);
+	}
+
+	void ParseGPSTime(String time) throws ParseException {
+		String[] hms = time.split(":");
+		if (hms.length != 3)
+			throw new ParseException("Error parsing GPS time " + time + " got " + hms.length, 0);
+		hour = AltosParse.parse_int(hms[0]);
+		minute = AltosParse.parse_int(hms[1]);
+		second = AltosParse.parse_int(hms[2]);
+	}
+
+	void ClearGPSTime() {
+		year = month = day = 0;
+		hour = minute = second = 0;
+	}
+
+	public AltosGPS(String[] words, int i, int version) throws ParseException {
 		AltosParse.word(words[i++], "GPS");
 		nsat = AltosParse.parse_int(words[i++]);
 		AltosParse.word(words[i++], "sat");
 
-		gps_connected = false;
-		gps_locked = false;
+		connected = false;
+		locked = false;
 		lat = lon = 0;
 		alt = 0;
+		ClearGPSTime();
 		if ((words[i]).equals("unlocked")) {
-			gps_connected = true;
-			gps_time = new AltosGPSTime();
+			connected = true;
+			i++;
+		} else if ((words[i]).equals("not-connected")) {
 			i++;
 		} else if (words.length >= 40) {
-			gps_locked = true;
-			gps_connected = true;
+			locked = true;
+			connected = true;
 
-			gps_time = new AltosGPSTime(words[i], words[i+1]); i += 2;
+			if (version > 1)
+				ParseGPSDate(words[i++]);
+			else
+				year = month = day = 0;
+			ParseGPSTime(words[i++]);
 			lat = AltosParse.parse_coord(words[i++]);
 			lon = AltosParse.parse_coord(words[i++]);
-			alt = AltosParse.parse_int(AltosParse.strip_suffix(words[i++], "m"));
-			ground_speed = AltosParse.parse_double(AltosParse.strip_suffix(words[i++], "m/s(H)"));
-			course = AltosParse.parse_int(AltosParse.strip_suffix(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)"));
-			h_error = AltosParse.parse_int(AltosParse.strip_suffix(words[i++], "(herr)"));
-			v_error = AltosParse.parse_int(AltosParse.strip_suffix(words[i++], "(verr)"));
+			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)"));
+				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)"));
+				h_error = AltosParse.parse_int(words[i++]);
+				v_error = AltosParse.parse_int(words[i++]);
+			}
 		} else {
-			gps_time = new AltosGPSTime();
+			i++;
 		}
-		AltosParse.word(words[i++], "SAT");
-		int tracking_channels = 0;
-		if (words[i].equals("not-connected"))
-			tracking_channels = 0;
-		else
-			tracking_channels = AltosParse.parse_int(words[i]);
-		i++;
-		cc_gps_sat = new AltosGPS.AltosGPSSat[tracking_channels];
-		for (int chan = 0; chan < tracking_channels; chan++) {
-			cc_gps_sat[chan] = new AltosGPS.AltosGPSSat();
-			cc_gps_sat[chan].svid = AltosParse.parse_int(words[i++]);
-			cc_gps_sat[chan].c_n0 = AltosParse.parse_int(words[i++]);
+		if (i < words.length) {
+			AltosParse.word(words[i++], "SAT");
+			int tracking_channels = 0;
+			if (words[i].equals("not-connected"))
+				tracking_channels = 0;
+			else
+				tracking_channels = AltosParse.parse_int(words[i]);
+			i++;
+			cc_gps_sat = new AltosGPS.AltosGPSSat[tracking_channels];
+			for (int chan = 0; chan < tracking_channels; chan++) {
+				cc_gps_sat[chan] = new AltosGPS.AltosGPSSat();
+				cc_gps_sat[chan].svid = AltosParse.parse_int(words[i++]);
+				/* Older versions included SiRF status bits */
+				if (version < 2)
+					i++;
+				cc_gps_sat[chan].c_n0 = AltosParse.parse_int(words[i++]);
+			}
+		} else
+			cc_gps_sat = new AltosGPS.AltosGPSSat[0];
+	}
+
+	public void set_latitude(int in_lat) {
+		lat = in_lat / 10.0e7;
+	}
+
+	public void set_longitude(int in_lon) {
+		lon = in_lon / 10.0e7;
+	}
+
+	public void set_time(int hour, int minute, int second) {
+		hour = hour;
+		minute = minute;
+		second = second;
+	}
+
+	public void set_date(int year, int month, int day) {
+		year = year;
+		month = month;
+		day = day;
+	}
+
+	public void set_flags(int flags) {
+		flags = flags;
+	}
+
+	public void set_altitude(int altitude) {
+		altitude = altitude;
+	}
+
+	public void add_sat(int svid, int c_n0) {
+		if (cc_gps_sat == null) {
+			cc_gps_sat = new AltosGPS.AltosGPSSat[1];
+		} else {
+			AltosGPSSat[] new_gps_sat = new AltosGPS.AltosGPSSat[cc_gps_sat.length + 1];
+			for (int i = 0; i < cc_gps_sat.length; i++)
+				new_gps_sat[i] = cc_gps_sat[i];
+			cc_gps_sat = new_gps_sat;
+		}
+		AltosGPS.AltosGPSSat	sat = new AltosGPS.AltosGPSSat();
+		sat.svid = svid;
+		sat.c_n0 = c_n0;
+		cc_gps_sat[cc_gps_sat.length - 1] = sat;
+	}
+
+	public AltosGPS() {
+		ClearGPSTime();
+		cc_gps_sat = null;
+	}
+
+	public AltosGPS(AltosGPS old) {
+		nsat = old.nsat;
+		locked = old.locked;
+		connected = old.connected;
+		date_valid = old.date_valid;
+		lat = old.lat;		/* degrees (+N -S) */
+		lon = old.lon;		/* degrees (+E -W) */
+		alt = old.alt;		/* m */
+		year = old.year;
+		month = old.month;
+		day = old.day;
+		hour = old.hour;
+		minute = old.minute;
+		second = old.second;
+
+		gps_extended = old.gps_extended;	/* has extra data */
+		ground_speed = old.ground_speed;	/* m/s */
+		course = old.course;		/* degrees */
+		climb_rate = old.climb_rate;	/* m/s */
+		hdop = old.hdop;		/* 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];
+			for (int i = 0; i < old.cc_gps_sat.length; i++) {
+				cc_gps_sat[i] = new AltosGPSSat();
+				cc_gps_sat[i].svid = old.cc_gps_sat[i].svid;
+				cc_gps_sat[i].c_n0 = old.cc_gps_sat[i].c_n0;
+			}
 		}
 	}
 }