diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 | 
| commit | f766a457323268857b3f2dfc7f42427437b71cb7 (patch) | |
| tree | 8afc8a661d682fc34b16fc0b1b44f2844d34f336 /altoslib/AltosGPS.java | |
| parent | db51224af01731e7323f6f696a7397d64eb80b92 (diff) | |
| parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
Merge branch 'branch-1.6' into debian
Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac
Diffstat (limited to 'altoslib/AltosGPS.java')
| -rw-r--r-- | altoslib/AltosGPS.java | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/altoslib/AltosGPS.java b/altoslib/AltosGPS.java index 0154e95d..2139efb2 100644 --- 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_6;  import java.text.*;  import java.util.concurrent.*; +import java.io.*; -public class AltosGPS implements Cloneable { +public class AltosGPS implements Cloneable, Serializable {  	public final static int MISSING = AltosLib.MISSING; @@ -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);  | 
