X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_ignite.c;h=e9d04dcce4ba848641e73d9fbfa06f5bac3d04e5;hb=HEAD;hp=d197239a991e60db1ce9d90b38b8611335e4b184;hpb=6550585af6d80306d037661be66004ccf8d09013;p=fw%2Faltos

diff --git a/src/kernel/ao_ignite.c b/src/kernel/ao_ignite.c
index d197239a..9e6df199 100644
--- a/src/kernel/ao_ignite.c
+++ b/src/kernel/ao_ignite.c
@@ -18,9 +18,7 @@
 
 #include "ao.h"
 #include <ao_data.h>
-#if AO_PYRO_NUM
 #include <ao_pyro.h>
-#endif
 
 #if HAS_IGNITE
 struct ao_ignition ao_ignition[2];
@@ -55,12 +53,7 @@ ao_igniter_status(enum ao_igniter igniter)
 		value = AO_SENSE_MAIN(&packet);
 		break;
 	}
-	if (value < AO_IGNITER_OPEN)
-		return ao_igniter_open;
-	else if (value > AO_IGNITER_CLOSED)
-		return ao_igniter_ready;
-	else
-		return ao_igniter_unknown;
+	return ao_igniter_check(value, AO_SENSE_PBATT(&packet));
 }
 
 #define AO_IGNITER_SET_DROGUE(v)	ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
@@ -82,6 +75,9 @@ ao_igniter_fire(enum ao_igniter igniter, bool wait)
 		ao_ignition[igniter].fired = 1;
 		switch (igniter) {
 		case ao_igniter_drogue:
+			if (wait && ao_config.apogee_delay &&
+			    ao_config.ignite_mode != AO_IGNITE_MODE_MAIN)
+				ao_delay(AO_SEC_TO_TICKS(ao_config.apogee_delay));
 			AO_IGNITER_SET_DROGUE(1);
 			ao_delay(AO_IGNITER_FIRE_TIME);
 			AO_IGNITER_SET_DROGUE(0);