diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 76 | ||||
| -rw-r--r-- | Releasing | 3 | ||||
| -rw-r--r-- | altoslib/AltosTelemetryReader.java | 2 | ||||
| -rw-r--r-- | src/kernel/ao_report.c | 10 | ||||
| -rw-r--r-- | src/kernel/ao_telemetry.c | 2 | ||||
| -rw-r--r-- | telegps/TeleGPSConfigUI.java | 2 |
7 files changed, 86 insertions, 10 deletions
@@ -65,3 +65,4 @@ doc/telemetrum.html doc/telemetrum.pdf altosui/altos-windows.log pdclib-root +ao-bringup/cal_values @@ -1,3 +1,79 @@ +commit d16e60858427bf7dbe83a858728ebf097a09207a +Author: Bdale Garbee <bdale@gag.com> +Date: Sat Sep 13 11:29:19 2014 -0600 + + ignore cal_values file in bringup directory + +commit 40885ae5e6be66faf08cdb9b481d1d998856ca4b +Author: Bdale Garbee <bdale@gag.com> +Date: Sat Sep 13 11:28:19 2014 -0600 + + need multi-arch in fat build + +commit e969172a81e24f70c349b10f429e69817900c307 +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 11 19:56:13 2014 -0700 + + altos: Make sure we don't beep out continuity twice in idle mode + + If the battery voltage report takes longer than the initialiation + sequence, we could get to the state reporting after the state had + switched from startup to idle. This would result in continuity being + reported the first time through the loop. Then, as the state had + already changed, we'd pass through the while test and go back to + report continuity a second time. + + Fixed by using the state remembered before beeping out the voltage to + decide whether to report the continuity. + + Signed-off-by: Keith Packard <keithp@keithp.com> + +commit 800f3377b1a374ad5cf826aa897efdcb08059040 +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 11 15:00:25 2014 -0700 + + altos: Fix ability to disable telemetry by setting interval to 0 + + For non-zero telemetry intervals, the radio code limits the value + based on the data rate. However, a zero interval means that telemetry + should be entirely disabled, so that value should be left alone when + checking. + + Signed-off-by: Keith Packard <keithp@keithp.com> + +commit 793588e218102204e69755a16bc32ea5c67f29c7 +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 11 14:23:29 2014 -0700 + + telegps: Was mis-configuring the 'Configure Device' dialog + + Make sure we show 'rate_label' instead of showing 'radio_enable_label' + twice. + + Signed-off-by: Keith Packard <keithp@keithp.com> + +commit 19730b872c61f34724b0f187f71cccb6a65251dd +Author: Keith Packard <keithp@keithp.com> +Date: Thu Sep 11 14:14:07 2014 -0700 + + altoslib: Stop re-loading previous flight when starting telemetry monitoring + + This feature is necessary on AltosDroid because there's no other UI + for reloading an old flight. It's not useful on the desktop where you + really just want to see new telemetry; old telemetry is availbale + through the 'graph flight' or 'replay' mechanisms. + + AltosDroid uses a different class for reading telemetry data, so we + can just remove this feature from altoslib at this point. + + Signed-off-by: Keith Packard <keithp@keithp.com> + +commit 10e31d84ee5cdf10248988079df91354ae6ed612 +Author: Bdale Garbee <bdale@gag.com> +Date: Wed Sep 10 01:33:33 2014 -0600 + + update changelog for release + commit 05e4094411f861bf29bea2e9c39c1b66f8f267f8 Merge: acb2791 2ee937b Author: Bdale Garbee <bdale@gag.com> @@ -61,7 +61,8 @@ These are Bdale's notes on how to do a release. make distclean - ./autogen.sh --with-fat-dir=/home/bdale/web/altusmetrum/AltOS/releases + ./autogen.sh --enable-multi-arch \ + --with-fat-dir=/home/bdale/web/altusmetrum/AltOS/releases make && make fat this pushes packages for each platform to web site diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java index 7539452d..20526a2c 100644 --- a/altoslib/AltosTelemetryReader.java +++ b/altoslib/AltosTelemetryReader.java @@ -199,6 +199,6 @@ public class AltosTelemetryReader extends AltosFlightReader { public AltosTelemetryReader(AltosLink link) throws IOException, InterruptedException, TimeoutException { - this(link, existing_data(link)); + this(link, null); } } diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c index 5314fc8f..f4253b3d 100644 --- a/src/kernel/ao_report.c +++ b/src/kernel/ao_report.c @@ -246,15 +246,15 @@ ao_report_continuity(void) __reentrant void ao_report(void) { - ao_report_state = ao_flight_state; for(;;) { + ao_report_state = ao_flight_state; #if HAS_BATTERY_REPORT - if (ao_flight_state == ao_flight_startup) + if (ao_report_state == ao_flight_startup) ao_report_battery(); else #endif ao_report_beep(); - if (ao_flight_state == ao_flight_landed) { + if (ao_report_state == ao_flight_landed) { ao_report_altitude(); #if HAS_FLIGHT ao_delay(AO_SEC_TO_TICKS(5)); @@ -262,7 +262,7 @@ ao_report(void) #endif } #if HAS_IGNITE_REPORT - if (ao_flight_state == ao_flight_idle) + if (ao_report_state == ao_flight_idle) ao_report_continuity(); while (ao_flight_state == ao_flight_pad) { uint8_t c; @@ -272,10 +272,8 @@ ao_report(void) pause(AO_MS_TO_TICKS(100)); } #endif - while (ao_report_state == ao_flight_state) ao_sleep(DATA_TO_XDATA(&ao_flight_state)); - ao_report_state = ao_flight_state; } } diff --git a/src/kernel/ao_telemetry.c b/src/kernel/ao_telemetry.c index 56bd715e..27306a34 100644 --- a/src/kernel/ao_telemetry.c +++ b/src/kernel/ao_telemetry.c @@ -518,7 +518,7 @@ ao_telemetry_set_interval(uint16_t interval) }; ao_telemetry_desired_interval = interval; - if (interval < min_interval[ao_config.radio_rate]) + if (interval && interval < min_interval[ao_config.radio_rate]) interval = min_interval[ao_config.radio_rate]; #endif ao_telemetry_interval = interval; diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java index 7a59bf48..e2e3d782 100644 --- a/telegps/TeleGPSConfigUI.java +++ b/telegps/TeleGPSConfigUI.java @@ -344,7 +344,7 @@ public class TeleGPSConfigUI c.insets = il; c.ipady = 5; rate_label = new JLabel("Telemetry baud rate:"); - pane.add(radio_enable_label, c); + pane.add(rate_label, c); c = new GridBagConstraints(); c.gridx = 4; c.gridy = row; |