diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-07 08:41:56 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-07 08:41:56 -0600 |
| commit | 128bbfa150f88c09f7adde2434b7bf0b5a9ed556 (patch) | |
| tree | ea1a1f66e0f2be53decf1ca31baa77a8710ec73e | |
| parent | f6f54d70b768dca1715ddddea64a4df00d82b09e (diff) | |
| parent | 246864b0597ddd397aba39be1fe39df0df189433 (diff) | |
Merge remote-tracking branch 'origin/simple-quiet' into multiarch
Conflicts:
configure.ac
fix version number
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/cc1111/ao_ignite.c | 2 | ||||
| -rw-r--r-- | src/core/ao_telemetry.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 959f3b4d..9f1921b9 100644 --- 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 289263ab..dd529088 100644 --- 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 c2707e7d..26e4e2a0 100644 --- 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; |