X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosGPS.java;h=a8c19e4ad4fe9a8853fe6ee24bb189d44383ac1d;hb=bc54014cfd4dbca67fa9db66e906ab8212a2eaa2;hp=f7929a4ca032e22343c742f2a8f02e4e25fcfd3d;hpb=04d7d0f829ba953ffeca8ad9887a4b6b2b5d5087;p=fw%2Faltos

diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java
index f7929a4c..a8c19e4a 100644
--- a/altoslib/AltosGPS.java
+++ b/altoslib/AltosGPS.java
@@ -28,7 +28,7 @@ public class AltosGPS implements Cloneable {
 	public boolean	connected;
 	public double	lat;		/* degrees (+N -S) */
 	public double	lon;		/* degrees (+E -W) */
-	public int	alt;		/* m */
+	public double	alt;		/* m */
 	public int	year;
 	public int	month;
 	public int	day;
@@ -65,40 +65,40 @@ public class AltosGPS implements Cloneable {
 	}
 
 	public void ClearGPSTime() {
-		year = month = day = 0;
-		hour = minute = second = 0;
+		year = month = day = AltosRecord.MISSING;
+		hour = minute = second = AltosRecord.MISSING;
 	}
 
 	public AltosGPS(AltosTelemetryMap map) throws ParseException {
-		String	state = map.get_string(AltosTelemetry.AO_TELEM_GPS_STATE,
-					       AltosTelemetry.AO_TELEM_GPS_STATE_ERROR);
+		String	state = map.get_string(AltosTelemetryLegacy.AO_TELEM_GPS_STATE,
+					       AltosTelemetryLegacy.AO_TELEM_GPS_STATE_ERROR);
 
-		nsat = map.get_int(AltosTelemetry.AO_TELEM_GPS_NUM_SAT, 0);
-		if (state.equals(AltosTelemetry.AO_TELEM_GPS_STATE_LOCKED)) {
+		nsat = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_NUM_SAT, 0);
+		if (state.equals(AltosTelemetryLegacy.AO_TELEM_GPS_STATE_LOCKED)) {
 			connected = true;
 			locked = true;
-			lat = map.get_double(AltosTelemetry.AO_TELEM_GPS_LATITUDE, MISSING, 1.0e-7);
-			lon = map.get_double(AltosTelemetry.AO_TELEM_GPS_LONGITUDE, MISSING, 1.0e-7);
-			alt = map.get_int(AltosTelemetry.AO_TELEM_GPS_ALTITUDE, MISSING);
-			year = map.get_int(AltosTelemetry.AO_TELEM_GPS_YEAR, MISSING);
+			lat = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_LATITUDE, MISSING, 1.0e-7);
+			lon = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_LONGITUDE, MISSING, 1.0e-7);
+			alt = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_ALTITUDE, MISSING);
+			year = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_YEAR, MISSING);
 			if (year != MISSING)
 				year += 2000;
-			month = map.get_int(AltosTelemetry.AO_TELEM_GPS_MONTH, MISSING);
-			day = map.get_int(AltosTelemetry.AO_TELEM_GPS_DAY, MISSING);
+			month = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_MONTH, MISSING);
+			day = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_DAY, MISSING);
 
-			hour = map.get_int(AltosTelemetry.AO_TELEM_GPS_HOUR, 0);
-			minute = map.get_int(AltosTelemetry.AO_TELEM_GPS_MINUTE, 0);
-			second = map.get_int(AltosTelemetry.AO_TELEM_GPS_SECOND, 0);
+			hour = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_HOUR, 0);
+			minute = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_MINUTE, 0);
+			second = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_SECOND, 0);
 
-			ground_speed = map.get_double(AltosTelemetry.AO_TELEM_GPS_HORIZONTAL_SPEED,
+			ground_speed = map.get_double(AltosTelemetryLegacy.AO_TELEM_GPS_HORIZONTAL_SPEED,
 						      AltosRecord.MISSING, 1/100.0);
-			course = map.get_int(AltosTelemetry.AO_TELEM_GPS_COURSE,
+			course = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_COURSE,
 					     AltosRecord.MISSING);
-			hdop = map.get_double(AltosTelemetry.AO_TELEM_GPS_HDOP, MISSING, 1.0);
-			vdop = map.get_double(AltosTelemetry.AO_TELEM_GPS_VDOP, MISSING, 1.0);
-			h_error = map.get_int(AltosTelemetry.AO_TELEM_GPS_HERROR, MISSING);
-			v_error = map.get_int(AltosTelemetry.AO_TELEM_GPS_VERROR, MISSING);
-		} else if (state.equals(AltosTelemetry.AO_TELEM_GPS_STATE_UNLOCKED)) {
+			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);
+			v_error = map.get_int(AltosTelemetryLegacy.AO_TELEM_GPS_VERROR, MISSING);
+		} else if (state.equals(AltosTelemetryLegacy.AO_TELEM_GPS_STATE_UNLOCKED)) {
 			connected = true;
 			locked = false;
 		} else {
@@ -212,6 +212,9 @@ public class AltosGPS implements Cloneable {
 	}
 
 	public AltosGPS() {
+		lat = AltosRecord.MISSING;
+		lon = AltosRecord.MISSING;
+		alt = AltosRecord.MISSING;
 		ClearGPSTime();
 		cc_gps_sat = null;
 	}
@@ -222,7 +225,7 @@ public class AltosGPS implements Cloneable {
 		g.nsat = nsat;
 		g.locked = locked;
 		g.connected = connected;
-		g.lat = lat;		g./* degrees (+N -S) */
+		g.lat = lat;		/* degrees (+N -S) */
 		g.lon = lon;		/* degrees (+E -W) */
 		g.alt = alt;		/* m */
 		g.year = year;
@@ -242,11 +245,11 @@ public class AltosGPS implements Cloneable {
 		if (cc_gps_sat != null) {
 			g.cc_gps_sat = new AltosGPSSat[cc_gps_sat.length];
 			for (int i = 0; i < cc_gps_sat.length; i++) {
-				g.cc_gps_sat[i] = new AltosGPSSat();
-				g.cc_gps_sat[i].svid = cc_gps_sat[i].svid;
-				g.cc_gps_sat[i].c_n0 = cc_gps_sat[i].c_n0;
+				g.cc_gps_sat[i] = new AltosGPSSat(cc_gps_sat[i].svid,
+								  cc_gps_sat[i].c_n0);
 			}
 		}
+		return g;
 	}
 
 	public AltosGPS(AltosGPS old) {
@@ -280,6 +283,9 @@ public class AltosGPS implements Cloneable {
 				}
 			}
 		} else {
+			lat = AltosRecord.MISSING;
+			lon = AltosRecord.MISSING;
+			alt = AltosRecord.MISSING;
 			ClearGPSTime();
 			cc_gps_sat = null;
 		}