From: Keith Packard <keithp@keithp.com>
Date: Fri, 18 Oct 2019 06:09:47 +0000 (-0700)
Subject: altos/telefire: Don't arm the box if the local arm switch is off
X-Git-Tag: 1.9.1~1^2~27
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=8d5792e32dc35441ec98339149fb4df3cc16f44b;ds=sidebyside

altos/telefire: Don't arm the box if the local arm switch is off

This skips arming the box when the local arming switch is off. This
keeps the siren and light from going off, and also avoids attempting
to fire the channels in case something else screwy is going on.

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

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index eeb9b505..ce9f8725 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -406,6 +406,10 @@ ao_pad(void)
 				PRINTD ("time difference too large %d\n", time_difference);
 				break;
 			}
+			if (query.arm_status != AO_PAD_ARM_STATUS_ARMED) {
+				PRINTD ("box not armed locally\n");
+				break;
+			}
 			PRINTD ("armed\n");
 			ao_pad_armed = command.channels;
 			ao_pad_arm_time = ao_time();