From: Keith Packard <keithp@keithp.com>
Date: Tue, 8 May 2012 04:53:53 +0000 (-0700)
Subject: altosui: Try to make telem tick counts match eeprom
X-Git-Tag: 1.0.9.5~25^2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=da2c920b9f3378d5a18551e008c1da5dace1e0ef

altosui: Try to make telem tick counts match eeprom

telem files can have an extra wrap or two of tick count if they start
recording a long time before the flight. Account for this so that the
CSV file output from each have matching tick values.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosui/AltosTelemetryIterable.java b/altosui/AltosTelemetryIterable.java
index 278cbfb7..a1b25332 100644
--- a/altosui/AltosTelemetryIterable.java
+++ b/altosui/AltosTelemetryIterable.java
@@ -88,6 +88,15 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
 		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;