use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / altosui / AltosTelemetryIterable.java

diff --git a/altosui/AltosTelemetryIterable.java b/altosui/AltosTelemetryIterable.java
index 90a08485c8301611ebd7e66d8d751f20d423d66e..1a31b3652e23745c6b2b41a4068c613c6fdf4cd1 100644 (file)
--- a/altosui/AltosTelemetryIterable.java
+++ b/altosui/AltosTelemetryIterable.java
@@ -53,7 +53,6 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
                                        AltosRecord record = AltosTelemetry.parse(line, previous);
                                        if (record == null)
                                                break;
-                                       previous = record;
                                        if (records.isEmpty()) {
                                                current_tick = record.tick;
                                        } else {
@@ -74,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) {
@@ -84,6 +85,9 @@ public class AltosTelemetryIterable extends AltosRecordIterable {
                        System.out.printf("io exception\n");
                }
 
+               if (previous != null)
+                       records.add(previous);
+
                /* adjust all tick counts to be relative to boost time */
                for (AltosRecord r : this)
                        r.time = (r.tick - boost_tick) / 100.0;