From: Keith Packard <keithp@keithp.com>
Date: Fri, 10 Sep 2010 05:30:48 +0000 (-0700)
Subject: altosui: Fix telemetry file reader to handle tick count wrapping
X-Git-Tag: 0.7.1~6
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=af200f5b84555de0556b52146379f3934774a3f3

altosui: Fix telemetry file reader to handle tick count wrapping

The telemetry reader was ignoring tick count wrapping, so you'd see
time go backwards in jumps. Not useful.

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

diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/ao-tools/altosui/AltosTelemetryReader.java
index fdedbde2..ae9682ab 100644
--- a/ao-tools/altosui/AltosTelemetryReader.java
+++ b/ao-tools/altosui/AltosTelemetryReader.java
@@ -41,6 +41,7 @@ public class AltosTelemetryReader extends AltosReader {
 
 	public AltosTelemetryReader (FileInputStream input) {
 		boolean saw_boost = false;
+		int	current_tick = 0;
 
 		records = new LinkedList<AltosRecord> ();
 
@@ -51,9 +52,20 @@ public class AltosTelemetryReader extends AltosReader {
 					break;
 				}
 				try {
+					System.out.printf("%s\n", line);
 					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;
+					}
+					System.out.printf("\tRSSI %d tick %d\n", record.rssi, record.tick);
 					if (!saw_boost && record.state >= Altos.ao_flight_boost)
 					{
 						saw_boost = true;