Merge remote-tracking branch 'origin/simple-quiet' into multiarch

Conflicts:
	configure.ac

fix version number

diff --git a/configure.ac b/configure.ac
index 959f3b4d86e2ce1a64b4216f7bc8d9398174432d..9f1921b987bf48c7e679cf629d15ce73f154639b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.0.9.0)
+AC_INIT([altos], 1.0.9.1)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

diff --git a/src/cc1111/ao_ignite.c b/src/cc1111/ao_ignite.c
index 289263abe51b99479328f4e5c966f3ef3d77d1da..dd5290881e7af443539ac1b210a1d37108274be6 100644 (file)
--- a/src/cc1111/ao_ignite.c
+++ b/src/cc1111/ao_ignite.c
@@ -62,6 +62,7 @@ ao_igniter_status(enum ao_igniter igniter)
 void
 ao_igniter_fire(enum ao_igniter igniter) __critical
 {
+       ao_mutex_get(&ao_radio_mutex);
        ao_ignition[igniter].firing = 1;
        switch(ao_config.ignite_mode) {
        case AO_IGNITE_MODE_DUAL:
@@ -106,6 +107,7 @@ ao_igniter_fire(enum ao_igniter igniter) __critical
                break;
        }
        ao_ignition[igniter].firing = 0;
+       ao_mutex_put(&ao_radio_mutex);
 }
 
 void

diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index c2707e7d57effeb820743c23d4d362f4dff6b31d..26e4e2a0e39530bc43997a4841f5790d8107b88e 100644 (file)
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -287,7 +287,7 @@ ao_rdf_set(uint8_t rdf)
        if (rdf == 0)
                ao_radio_rdf_abort();
        else
-               ao_rdf_time = ao_time();
+               ao_rdf_time = ao_time() + AO_RDF_INTERVAL_TICKS;
 }
 
 __xdata struct ao_task ao_telemetry_task;