*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_14;
import java.text.*;
import java.util.concurrent.*;
import java.io.*;
+import java.time.*;
-public class AltosGPS implements Cloneable, Serializable {
+public class AltosGPS implements Cloneable {
public final static int MISSING = AltosLib.MISSING;
hour = minute = second = AltosLib.MISSING;
}
+ /* Return time since epoc in seconds */
+ public long seconds() {
+ if (year == AltosLib.MISSING)
+ return AltosLib.MISSING;
+ if (month == AltosLib.MISSING)
+ return AltosLib.MISSING;
+ if (day == AltosLib.MISSING)
+ return AltosLib.MISSING;
+ if (hour == AltosLib.MISSING)
+ return AltosLib.MISSING;
+ if (minute == AltosLib.MISSING)
+ return AltosLib.MISSING;
+ if (second == AltosLib.MISSING)
+ return AltosLib.MISSING;
+ OffsetDateTime odt = OffsetDateTime.of(year, month, day, hour, minute, second, 0, ZoneOffset.UTC);
+ return odt.toEpochSecond();
+ }
+
+ public AltosLatLon lat_lon() {
+ return new AltosLatLon(lat, lon);
+ }
+
public AltosGPS(AltosTelemetryMap map) throws ParseException {
String state = map.get_string(AltosTelemetryLegacy.AO_TELEM_GPS_STATE,
AltosTelemetryLegacy.AO_TELEM_GPS_STATE_ERROR);
}
}
- static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
- AltosGPS gps = new AltosGPS(link, config_data);
-
- if (gps != null) {
- state.set_gps(gps, state.gps_sequence++);
- return;
- }
+ AltosGPS gps = new AltosGPS(link, link.config_data());
+ if (gps != null)
+ listener.set_gps(gps, true, true);
} catch (TimeoutException te) {
}
- state.set_gps(null, 0);
}
public AltosGPS (AltosLink link, AltosConfigData config_data) throws TimeoutException, InterruptedException {