X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryStandard.java;h=b8e5d3d6f95979c28810dcf0263e3106d8583fc6;hp=f4dfd8e9665953dc58987c972022e313bc176e27;hb=52149fd81df45f37f5097850795f290f463c43ef;hpb=bd440afc2a6e37b74fffcf1b977e149485095316

diff --git a/altoslib/AltosTelemetryStandard.java b/altoslib/AltosTelemetryStandard.java
index f4dfd8e9..b8e5d3d6 100644
--- a/altoslib/AltosTelemetryStandard.java
+++ b/altoslib/AltosTelemetryStandard.java
@@ -3,7 +3,8 @@
  *
  * 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
@@ -15,12 +16,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_14;
 
 public abstract class AltosTelemetryStandard extends AltosTelemetry {
-	int[]	bytes;
-	int	type;
-
 	public int int8(int off) {
 		return AltosLib.int8(bytes, off + 1);
 	}
@@ -49,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:
@@ -68,13 +72,14 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry {
 		case packet_type_satellite:
 			telem = new AltosTelemetrySatellite(bytes);
 			break;
-/*
 		case packet_type_companion:
 			telem = new AltosTelemetryCompanion(bytes);
 			break;
-*/
-		case packet_type_mega_sensor:
-			telem = new AltosTelemetryMegaSensor(bytes);
+		case packet_type_mega_sensor_mpu:
+			telem = new AltosTelemetryMegaSensor(bytes, AltosIMU.imu_type_telemega_v3);
+			break;
+		case packet_type_mega_sensor_bmx160:
+			telem = new AltosTelemetryMegaSensor(bytes, AltosIMU.imu_type_telemega_v4);
 			break;
 		case packet_type_mega_data:
 			telem = new AltosTelemetryMegaData(bytes);
@@ -85,8 +90,11 @@ public abstract class AltosTelemetryStandard extends AltosTelemetry {
 		case packet_type_metrum_data:
 			telem = new AltosTelemetryMetrumData(bytes);
 			break;
-		case packet_type_mini:
-			telem = new AltosTelemetryMini(bytes);
+		case packet_type_mini2:
+			telem = new AltosTelemetryMini2(bytes);
+			break;
+		case packet_type_mini3:
+			telem = new AltosTelemetryMini3(bytes);
 			break;
 		default:
 			telem = new AltosTelemetryRaw(bytes);
@@ -95,15 +103,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);
 	}
 }