From: Bdale Garbee <bdale@gag.com>
Date: Tue, 27 Sep 2011 07:00:14 +0000 (-0600)
Subject: Merge branch 'master' into branch-1.0
X-Git-Tag: 1.0.2~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ac7633630c1b04fdd761c16af7bd9377e76926c5;hp=fc4173ff882dd9718f34ed043276ef612783dfe0

Merge branch 'master' into branch-1.0
---

diff --git a/configure.ac b/configure.ac
index 27d56751..650aeffb 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.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 1442ebea..8037195a 100644
--- 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);