X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_pyro.c;h=39f40dfa44986c62fc225150bf8c8ff39ee03174;hp=84f949dc3872fc71a5ca7d1fdf54f2331f5d571f;hb=6f131e740477d29b6623fa336da79e53f765a55b;hpb=5ca472333a3587f0e47d54f5edc287494262ef98

diff --git a/src/core/ao_pyro.c b/src/core/ao_pyro.c
index 84f949dc..39f40dfa 100644
--- a/src/core/ao_pyro.c
+++ b/src/core/ao_pyro.c
@@ -170,6 +170,26 @@ ao_pyro_pin_set(uint8_t p, uint8_t v)
 
 uint8_t	ao_pyro_wakeup;
 
+static void
+ao_pyro_pins_fire(uint16_t fire)
+{
+	uint8_t p;
+
+	for (p = 0; p < AO_PYRO_NUM; p++) {
+		if (fire & (1 << p))
+			ao_pyro_pin_set(p, 1);
+	}
+	ao_delay(AO_MS_TO_TICKS(50));
+	for (p = 0; p < AO_PYRO_NUM; p++) {
+		if (fire & (1 << p)) {
+			ao_pyro_pin_set(p, 0);
+			ao_config.pyro[p].fired = 1;
+			ao_pyro_fired |= (1 << p);
+		}
+	}
+	ao_delay(AO_MS_TO_TICKS(50));
+}
+
 static uint8_t
 ao_pyro_check(void)
 {
@@ -219,21 +239,8 @@ ao_pyro_check(void)
 		fire |= (1 << p);
 	}
 
-	if (fire) {
-		for (p = 0; p < AO_PYRO_NUM; p++) {
-			if (fire & (1 << p))
-				ao_pyro_pin_set(p, 1);
-		}
-		ao_delay(AO_MS_TO_TICKS(50));
-		for (p = 0; p < AO_PYRO_NUM; p++) {
-			if (fire & (1 << p)) {
-				ao_pyro_pin_set(p, 0);
-				ao_config.pyro[p].fired = 1;
-				ao_pyro_fired |= (1 << p);
-			}
-		}
-		ao_delay(AO_MS_TO_TICKS(50));
-	}
+	if (fire)
+		ao_pyro_pins_fire(fire);
 
 	return any_waiting;
 }
@@ -444,7 +451,7 @@ ao_pyro_manual(void)
 	ao_cmd_decimal();
 	if (ao_cmd_lex_i < 0 || AO_PYRO_NUM <= ao_cmd_lex_i)
 		return;
-	ao_pyro_fire(ao_cmd_lex_i);
+	ao_pyro_pins_fire(1 << ao_cmd_lex_i);
 
 }