X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosTelemetryRecordRaw.java;h=08c85e858a333e9d76f2bb28336d96d04e6df28a;hb=c2550d72aee371676d2f09316051567681e53a7c;hp=35796a22fd5a9606a7958af266e2c7b86ceb4e1d;hpb=7fd9b8f720add559b262e81d61ededc9df16ca94;p=fw%2Faltos

diff --git a/altosui/AltosTelemetryRecordRaw.java b/altosui/AltosTelemetryRecordRaw.java
index 35796a22..08c85e85 100644
--- a/altosui/AltosTelemetryRecordRaw.java
+++ b/altosui/AltosTelemetryRecordRaw.java
@@ -21,83 +21,13 @@ import java.lang.*;
 import java.text.*;
 import java.util.HashMap;
 
-public class AltosTelemetryRecordRaw implements AltosTelemetryRecord {
+public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
 	int[]	bytes;
 	int	serial;
 	int	tick;
 	int	type;
 
-	final static int packet_type_TM_sensor = 0x01;
-	final static int packet_type_Tm_sensor = 0x02;
-	final static int packet_type_Tn_sensor = 0x03;
-	final static int packet_type_config = 0x04;
-	final static int packet_type_GPS_location = 0x05;
-	final static int packet_type_GPS_satellites = 0x06;
-	
-	final static int PKT_APPEND_STATUS_1_CRC_OK		= (1 << 7);
-	final static int PKT_APPEND_STATUS_1_LQI_MASK		= (0x7f);
-	final static int PKT_APPEND_STATUS_1_LQI_SHIFT		= 0;
-
-	static boolean cksum(int[] bytes) {
-		int	sum = 0x5a;
-		for (int i = 1; i < bytes.length - 1; i++)
-			sum += bytes[i];
-		sum &= 0xff;
-		System.out.printf("%d bytes sum 0x%x last byte 0x%x\n",
-				  bytes.length, sum, bytes[bytes.length - 1]);
-		return sum == bytes[bytes.length - 1];
-	}
-
-	public static AltosTelemetryRecord parse (String hex) throws ParseException, AltosCRCException {
-		AltosTelemetryRecord	r;
-
-		int[] bytes;
-		try {
-			bytes = Altos.hexbytes(hex);
-		} catch (NumberFormatException ne) {
-			throw new ParseException(ne.getMessage(), 0);
-		}
-
-		/* one for length, one for checksum */
-		if (bytes[0] != bytes.length - 2)
-			throw new ParseException(String.format("invalid length %d != %d\n",
-							       bytes[0],
-							       bytes.length - 2), 0);
-		if (!cksum(bytes))
-			throw new ParseException(String.format("invalid line \"%s\"", hex), 0);
-
-		int	rssi = Altos.int8(bytes, bytes.length - 3) / 2 - 74;
-		int	status = Altos.uint8(bytes, bytes.length - 2);
-
-		System.out.printf ("rssi 0x%x = %d status 0x%x\n",
-				   Altos.uint8(bytes, bytes.length - 3),
-				   rssi, status);
-
-		if ((status & PKT_APPEND_STATUS_1_CRC_OK) == 0)
-			throw new AltosCRCException(rssi);
-
-		/* length, data ..., rssi, status, checksum -- 4 bytes extra */
-		switch (bytes.length) {
-		case Altos.ao_telemetry_split_len + 4:
-			int	type = Altos.uint8(bytes, 4 + 1);
-			switch (type) {
-			case packet_type_TM_sensor:
-			case packet_type_Tm_sensor:
-			case packet_type_Tn_sensor:
-				r = new AltosTelemetryRecordSensor(bytes);
-				break;
-			default:
-				r = new AltosTelemetryRecordRaw(bytes);
-				break;
-			}
-		case Altos.ao_telemetry_legacy_len + 4:
-			r = new AltosTelemetryRecordLegacy(bytes, rssi, status);
-			break;
-		default:
-			throw new ParseException(String.format("Invalid packet length %d", bytes.length), 0);
-		}
-		return r;
-	}
+	long	received_time;
 
 	public int int8(int off) {
 		return Altos.int8(bytes, off + 1);
@@ -119,6 +49,10 @@ public class AltosTelemetryRecordRaw implements AltosTelemetryRecord {
 		return Altos.uint32(bytes, off + 1);
 	}
 
+	public String string(int off, int l) {
+		return Altos.string(bytes, off + 1, l);
+	}
+
 	public AltosTelemetryRecordRaw(int[] in_bytes) {
 		bytes = in_bytes;
 		serial = uint16(0);
@@ -127,9 +61,17 @@ public class AltosTelemetryRecordRaw implements AltosTelemetryRecord {
 	}
 
 	public AltosRecord update_state(AltosRecord previous) {
+		AltosRecord	next;
 		if (previous != null)
-			return new AltosRecord(previous);
+			next = new AltosRecord(previous);
 		else
-			return new AltosRecord();
+			next = new AltosRecord();
+		next.serial = serial;
+		next.tick = tick;
+		return next;
+	}
+
+	public long received_time() {
+		return received_time;
 	}
 }