X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosTelemetryIterable.java;h=a1b253321fde593eb2f11238b1f7e420ca7f6f41;hb=da2c920b9f3378d5a18551e008c1da5dace1e0ef;hp=44e5ad8f8d9c2fe9977cd0550abf8ab67c8d9dc0;hpb=f558cfa1df77c36a459168c1953d0945ee5a7f9f;p=fw%2Faltos

diff --git a/altosui/AltosTelemetryIterable.java b/altosui/AltosTelemetryIterable.java
index 44e5ad8f..a1b25332 100644
--- a/altosui/AltosTelemetryIterable.java
+++ b/altosui/AltosTelemetryIterable.java
@@ -22,7 +22,7 @@ import java.util.*;
 import java.text.*;
 
 public class AltosTelemetryIterable extends AltosRecordIterable {
-	LinkedList<AltosRecord>	records;
+	TreeSet<AltosRecord>	records;
 
 	public Iterator<AltosRecord> iterator () {
 		return records.iterator();
@@ -40,7 +40,8 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
 		int	current_tick = 0;
 		int	boost_tick = 0;
 
-		records = new LinkedList<AltosRecord> ();
+		AltosRecord	previous = null;
+		records = new TreeSet<AltosRecord> ();
 
 		try {
 			for (;;) {
@@ -49,14 +50,14 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
 					break;
 				}
 				try {
-					AltosTelemetry record = new AltosTelemetry(line);
+					AltosRecord record = AltosTelemetry.parse(line, previous);
 					if (record == null)
 						break;
 					if (records.isEmpty()) {
 						current_tick = record.tick;
 					} else {
-						int tick = record.tick | (current_tick & ~ 0xffff);
-						if (tick < current_tick - 0x1000)
+						int tick = record.tick;
+						while (tick < current_tick - 0x1000)
 							tick += 0x10000;
 						current_tick = tick;
 						record.tick = current_tick;
@@ -72,7 +73,9 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
 						has_gps = true;
 					if (record.main != AltosRecord.MISSING)
 						has_ignite = true;
-					records.add(record);
+					if (previous != null && previous.tick != record.tick)
+						records.add(previous);
+					previous = record;
 				} catch (ParseException pe) {
 					System.out.printf("parse exception %s\n", pe.getMessage());
 				} catch (AltosCRCException ce) {
@@ -82,6 +85,18 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
 			System.out.printf("io exception\n");
 		}
 
+		if (previous != null)
+			records.add(previous);
+
+		/* Adjust all tick counts to match expected eeprom values,
+		 * which starts with a 16-bit tick count 16 samples before boost
+		 */
+
+		int tick_adjust = (boost_tick - 16) & 0xffff0000;
+		for (AltosRecord r : this)
+			r.tick -= tick_adjust;
+		boost_tick -= tick_adjust;
+
 		/* adjust all tick counts to be relative to boost time */
 		for (AltosRecord r : this)
 			r.time = (r.tick - boost_tick) / 100.0;