Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 13 insertions, 14 deletions

diff --git a/altoslib/AltosTelemetryStandard.java b/altoslib/AltosTelemetryStandard.java
index 35d315c7..2a1c9365 100644
--- a/altoslib/AltosTelemetryStandard.java
+++ b/altoslib/AltosTelemetryStandard.java
@@ -16,12 +16,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public abstract class AltosTelemetryStandard extends AltosTelemetry {
-	int[]	bytes;
-	int	type;
-
 	public int int8(int off) {
 		return AltosLib.int8(bytes, off + 1);
 	}
@@ -50,10 +47,16 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry {
 		return AltosLib.string(bytes, off + 1, l);
 	}
 
-	public static AltosTelemetry parse_hex(int[] bytes) {
-		int	type = AltosLib.uint8(bytes, 4 + 1);
+	public int type() { return uint8(4); }
+
+	public int serial() { return uint16(0); }
+
+	public int tick() { return uint16(2); }
 
+	public static AltosTelemetry parse_hex(int[] bytes) throws AltosCRCException {
 		AltosTelemetry	telem;
+
+		int type = AltosLib.uint8(bytes, 4+1);
 		switch (type) {
 		case packet_type_TM_sensor:
 		case packet_type_Tm_sensor:
@@ -97,15 +100,11 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry {
 		return telem;
 	}
 
-	public AltosTelemetryStandard(int[] bytes) {
-		this.bytes = bytes;
-
-		serial = uint16(0);
-		tick   = uint16(2);
-		type   = uint8(4);
+	public AltosTelemetryStandard(int[] bytes) throws AltosCRCException {
+		super(bytes);
 	}
 
-	public void update_state(AltosState state) {
-		super.update_state(state);
+	public void provide_data(AltosDataListener listener) {
+		super.provide_data(listener);
 	}
 }