X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosTelemetryReader.java;h=3564a0a5a7aa14acf5f98925dbef47f203f515d8;hb=7e053ae1f2d09347123ac9fa79e46645378b4c70;hp=f1f6788c0afbc17973574a0b98c5459647d153a8;hpb=f317f1324b69b4241f4bb192e164b33d712d5a43;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/ao-tools/altosui/AltosTelemetryReader.java
index f1f6788c..3564a0a5 100644
--- a/ao-tools/altosui/AltosTelemetryReader.java
+++ b/ao-tools/altosui/AltosTelemetryReader.java
@@ -41,26 +41,43 @@ public class AltosTelemetryReader extends AltosReader {
 
 	public AltosTelemetryReader (FileInputStream input) {
 		boolean saw_boost = false;
+		int	current_tick = 0;
 
 		records = new LinkedList<AltosRecord> ();
 
 		try {
 			for (;;) {
 				String line = AltosRecord.gets(input);
-				if (line == null)
+				if (line == null) {
 					break;
-				AltosTelemetry record = new AltosTelemetry(line);
-				if (record == null)
-					break;
-				if (!saw_boost && record.state >= Altos.ao_flight_boost)
-				{
-					saw_boost = true;
-					boost_tick = record.tick;
 				}
-				records.add(record);
+				try {
+					AltosTelemetry record = new AltosTelemetry(line);
+					if (record == null)
+						break;
+					if (records.isEmpty()) {
+						current_tick = record.tick;
+					} else {
+						int tick = record.tick | (current_tick & ~ 0xffff);
+						if (tick < current_tick - 0x1000)
+							tick += 0x10000;
+						current_tick = tick;
+						record.tick = current_tick;
+					}
+					if (!saw_boost && record.state >= Altos.ao_flight_boost)
+					{
+						saw_boost = true;
+						boost_tick = record.tick;
+					}
+					records.add(record);
+				} catch (ParseException pe) {
+					System.out.printf("parse exception %s\n", pe.getMessage());
+				} catch (AltosCRCException ce) {
+					System.out.printf("crc error\n");
+				}
 			}
 		} catch (IOException io) {
-		} catch (ParseException pe) {
+			System.out.printf("io exception\n");
 		}
 		record_iterator = records.iterator();
 		try {