X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosTelemetry.java;h=bdb6466a46d7d66ec03914cad9653bac9b71c8a9;hb=a08b2a6363c194195db92029743f6612676373ce;hp=af29b8c04ef5e940e25dd1ca3e796e9dc895fbeb;hpb=afea6c264c5ebf12f1d629bd4bc724da86d11b7a;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosTelemetry.java b/ao-tools/altosui/AltosTelemetry.java
index af29b8c0..bdb6466a 100644
--- a/ao-tools/altosui/AltosTelemetry.java
+++ b/ao-tools/altosui/AltosTelemetry.java
@@ -20,9 +20,6 @@ package altosui;
 import java.lang.*;
 import java.text.*;
 import java.util.HashMap;
-import altosui.AltosConvert;
-import altosui.AltosRecord;
-import altosui.AltosGPS;
 
 /*
  * Telemetry data contents
@@ -53,12 +50,22 @@ import altosui.AltosGPS;
  */
 
 public class AltosTelemetry extends AltosRecord {
-	public AltosTelemetry(String line) throws ParseException {
+	public AltosTelemetry(String line) throws ParseException, AltosCRCException {
 		String[] words = line.split("\\s+");
 		int	i = 0;
 
-		AltosParse.word (words[i++], "VERSION");
-		version = AltosParse.parse_int(words[i++]);
+		if (words[i].equals("CRC") && words[i+1].equals("INVALID")) {
+			i += 2;
+			AltosParse.word(words[i++], "RSSI");
+			rssi = AltosParse.parse_int(words[i++]);
+			throw new AltosCRCException(rssi);
+		}
+		if (words[i].equals("CALL")) {
+			version = 0;
+		} else {
+			AltosParse.word (words[i++], "VERSION");
+			version = AltosParse.parse_int(words[i++]);
+		}
 
 		AltosParse.word (words[i++], "CALL");
 		callsign = words[i++];
@@ -66,12 +73,19 @@ public class AltosTelemetry extends AltosRecord {
 		AltosParse.word (words[i++], "SERIAL");
 		serial = AltosParse.parse_int(words[i++]);
 
-		AltosParse.word (words[i++], "FLIGHT");
-		flight = AltosParse.parse_int(words[i++]);
+		if (version >= 2) {
+			AltosParse.word (words[i++], "FLIGHT");
+			flight = AltosParse.parse_int(words[i++]);
+		} else
+			flight = 0;
 
 		AltosParse.word(words[i++], "RSSI");
 		rssi = AltosParse.parse_int(words[i++]);
 
+		/* Older telemetry data had mis-computed RSSI value */
+		if (version <= 2)
+			rssi = (rssi + 74) / 2 - 74;
+
 		AltosParse.word(words[i++], "STATUS");
 		status = AltosParse.parse_hex(words[i++]);
 
@@ -113,12 +127,17 @@ public class AltosTelemetry extends AltosRecord {
 		AltosParse.word(words[i++], "gp:");
 		ground_pres = AltosParse.parse_int(words[i++]);
 
-		AltosParse.word(words[i++], "a+:");
-		accel_plus_g = AltosParse.parse_int(words[i++]);
+		if (version >= 1) {
+			AltosParse.word(words[i++], "a+:");
+			accel_plus_g = AltosParse.parse_int(words[i++]);
 
-		AltosParse.word(words[i++], "a-:");
-		accel_minus_g = AltosParse.parse_int(words[i++]);
+			AltosParse.word(words[i++], "a-:");
+			accel_minus_g = AltosParse.parse_int(words[i++]);
+		} else {
+			accel_plus_g = ground_accel;
+			accel_minus_g = ground_accel + 530;
+		}
 
-		gps = new AltosGPS(words, i);
+		gps = new AltosGPS(words, i, version);
 	}
 }