Merge branch 'master' into branch-1.0

diff --git a/configure.ac b/configure.ac
index 27d56751b0322f25d24659249ea552054af138de..650aeffb18d27d54d6a81ad02d255cb638f8c46c 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.1)
+AC_INIT([altos], 1.0.2)
 AC_CONFIG_SRCDIR([src/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

diff --git a/src/ao_cmd.c b/src/ao_cmd.c
index 1442ebea8eafc9a32e31ae18006bf61ef2af9316..8037195a13f12264af41866ce1671e8982cb1e84 100644 (file)
--- a/src/ao_cmd.c
+++ b/src/ao_cmd.c
@@ -208,6 +208,13 @@ ao_reboot(void)
        ao_cmd_white();
        if (!ao_match_word("eboot"))
                return;
+
+       /* Delay waiting for the packet master to be turned off
+        * so that we don't end up back in idle mode because we
+        * received a packet after boot.
+        */
+       flush();
+       ao_delay(AO_SEC_TO_TICKS(1));
        WDCTL = WDCTL_EN | WDCTL_MODE_WATCHDOG | WDCTL_INT_64;
        ao_delay(AO_SEC_TO_TICKS(2));
        ao_panic(AO_PANIC_REBOOT);