Merge branch 'branch-1.6' into debian

1 files changed, 6 insertions, 7 deletions

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 4edae54a..523f5a70 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -19,7 +19,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.altoslib_8;
+package org.altusmetrum.altoslib_9;
 
 import java.io.*;
 
@@ -284,7 +284,7 @@ public class AltosState implements Cloneable, Serializable {
 		}
 	}
 
-	public int	state;
+	private int	state;
 	public int	flight;
 	public int	serial;
 	public int	altitude_32;
@@ -1056,6 +1056,10 @@ public class AltosState implements Cloneable, Serializable {
 		}
 	}
 
+	public int state() {
+		return state;
+	}
+
 	public void set_device_type(int device_type) {
 		this.device_type = device_type;
 		switch (device_type) {
@@ -1358,11 +1362,6 @@ public class AltosState implements Cloneable, Serializable {
 		}
 	}
 
-	public void make_companion (int nchannels) {
-		if (companion == null)
-			companion = new AltosCompanion(nchannels);
-	}
-
 	public void set_companion(AltosCompanion companion) {
 		this.companion = companion;
 	}