From: Keith Packard <keithp@keithp.com>
Date: Fri, 29 Aug 2014 20:12:38 +0000 (-0500)
Subject: altos: Make sure pyro remains valid during delay
X-Git-Tag: 1.4.9.3~3^2~20
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5872bd10df14b47de0e541bff16d9220af0558aa;ds=sidebyside

altos: Make sure pyro remains valid during delay

Keep checking pyro status while waiting for delay to expire to make
sure nothing changes. Disable pyro channel if something does.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index 0b286466..154edad5 100644
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -252,7 +252,7 @@ ao_pyro_check(void)
 	struct ao_pyro	*pyro;
 	uint8_t		p, any_waiting;
 	uint16_t	fire = 0;
-	
+
 	any_waiting = 0;
 	for (p = 0; p < AO_PYRO_NUM; p++) {
 		pyro = &ao_config.pyro[p];
@@ -288,6 +288,16 @@ ao_pyro_check(void)
 		 * the delay to expire
 		 */
 		if (pyro->delay_done) {
+
+			/* Check to make sure the required conditions
+			 * remain valid. If not, inhibit the channel
+			 * by setting the fired bit
+			 */
+			if (!ao_pyro_ready(pyro)) {
+				pyro->fired = 1;
+				continue;
+			}
+
 			if ((int16_t) (ao_time() - pyro->delay_done) < 0)
 				continue;
 		}
@@ -465,7 +475,7 @@ ao_pyro_set(void)
 		printf ("invalid pyro channel %d\n", p);
 		return;
 	}
-	pyro_tmp.flags = 0;
+	memset(&pyro_tmp, '\0', sizeof (pyro_tmp));
 	for (;;) {
 		ao_cmd_white();
 		if (ao_cmd_lex_c == '\n')