diff options
| -rw-r--r-- | ChangeLog | 67 | ||||
| -rw-r--r-- | ao-tools/altosui/AltosEepromReader.java | 9 | ||||
| -rw-r--r-- | ao-tools/altosui/AltosTelemetryReader.java | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
4 files changed, 80 insertions, 4 deletions
@@ -1,3 +1,70 @@ +commit 9d0e89e8ad8926dc8371fa809835a580ae49711d +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 9 23:04:59 2010 -0700 + + altosui: Stop parsing eeprom file after hitting 'landed' state + + Sometimes there are additional records found in the eeprom file; the + reader is mostly worried about not losing anything, so it reads as + much as it can. However, the last record written for any flight is the + 'landed' record, so we can stop looking at the file after hitting that. + + Signed-off-by: Keith Packard <keithp@keithp.com> + +commit 67b6952f7126704478ede5575e5e938d18fcc329 +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 9 23:04:14 2010 -0700 + + altosui: Fill in time value of last Eeprom record read from file + + The last record is handled separately, and was missing the code to + compute the time. Sigh. + + Signed-off-by: Keith Packard <keithp@keithp.com> + +commit 8b0b584cd0ca7542e65aac0c7897ad7ab4115122 +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 9 22:55:47 2010 -0700 + + altosui: Remove debug printfs from AltosTelemetryReader + + Signed-off-by: Keith Packard <keithp@keithp.com> + +commit a80bfae15f1499c49f7ef47978bf0337d8120892 +Author: Bdale Garbee <bdale@gag.com> +Date: Thu Sep 9 23:57:34 2010 -0600 + + rewind packaging changelog, again + +commit 78ce3120e5a53858ca0d43c734aa5d28b4948ce3 +Author: Bdale Garbee <bdale@gag.com> +Date: Thu Sep 9 23:52:20 2010 -0600 + + update changelogs for Debian build + +commit 71c85613a28c24c3aad7b4aa3299d8677ef1268e +Author: Bdale Garbee <bdale@gag.com> +Date: Thu Sep 9 23:51:23 2010 -0600 + + rewind packaging changelog + +commit af200f5b84555de0556b52146379f3934774a3f3 +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 9 22:30:48 2010 -0700 + + 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> + +commit 96ca7051f60ea299e3e05bafbe5717fc83c3afd2 +Author: Bdale Garbee <bdale@gag.com> +Date: Thu Sep 9 22:50:03 2010 -0600 + + update changelogs for Debian build + commit 2d5e48c5dc0e822fdf430f43804c1e5e79fdbf84 Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 9 21:28:10 2010 -0700 diff --git a/ao-tools/altosui/AltosEepromReader.java b/ao-tools/altosui/AltosEepromReader.java index cb82f9a9..4cc8536a 100644 --- a/ao-tools/altosui/AltosEepromReader.java +++ b/ao-tools/altosui/AltosEepromReader.java @@ -114,7 +114,9 @@ public class AltosEepromReader extends AltosReader { if (last_reported) return null; last_reported = true; - return new AltosRecord(state); + AltosRecord r = new AltosRecord(state); + r.time = (r.tick - boost_tick) / 100.0; + return r; } record = record_iterator.next(); @@ -389,6 +391,11 @@ public class AltosEepromReader extends AltosReader { } } records.add(record); + + /* Bail after reading the 'landed' record; we're all done */ + if (record.cmd == Altos.AO_LOG_STATE && + record.a == Altos.ao_flight_landed) + break; } } catch (IOException io) { } catch (ParseException pe) { diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/ao-tools/altosui/AltosTelemetryReader.java index ae9682ab..3564a0a5 100644 --- a/ao-tools/altosui/AltosTelemetryReader.java +++ b/ao-tools/altosui/AltosTelemetryReader.java @@ -52,7 +52,6 @@ public class AltosTelemetryReader extends AltosReader { break; } try { - System.out.printf("%s\n", line); AltosTelemetry record = new AltosTelemetry(line); if (record == null) break; @@ -65,7 +64,6 @@ public class AltosTelemetryReader extends AltosReader { 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; diff --git a/debian/changelog b/debian/changelog index c808c50d..98068ad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,12 @@ altos (0.7.1) unstable; urgency=low ../libaltos/.libs * Add --with-fat-dir configure option to publish finished stand-alone bits + * altosui: Fix telemetry file reader to handle tick count wrapping + * altosui: Remove debug printfs from AltosTelemetryReader + * altosui: Fill in time value of last Eeprom record read from file + * altosui: Stop parsing eeprom file after hitting 'landed' state - -- Bdale Garbee <bdale@gag.com> Thu, 09 Sep 2010 22:49:54 -0600 + -- Bdale Garbee <bdale@gag.com> Fri, 10 Sep 2010 00:09:02 -0600 altos (0.7+96+g48f5799) unstable; urgency=low |