X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_ignite.c;h=692460d0c0feefd3a7f7da5904324d3dbd4beeff;hp=71c99a614352d928aaa34d5e4d9dd863c18e66b8;hb=d0c0dec140b8fa847704c9a22a39d254445188b9;hpb=6ff8e55581ca85b9cc892806a2481d57a65e8bae

diff --git a/src/kernel/ao_ignite.c b/src/kernel/ao_ignite.c
index 71c99a61..692460d0 100644
--- a/src/kernel/ao_ignite.c
+++ b/src/kernel/ao_ignite.c
@@ -25,15 +25,6 @@
 #if HAS_IGNITE
 struct ao_ignition ao_ignition[2];
 
-void
-ao_ignite(enum ao_igniter igniter)
-{
-	ao_arch_block_interrupts();
-	ao_ignition[igniter].request = 1;
-	ao_wakeup(&ao_ignition);
-	ao_arch_release_interrupts();
-}
-
 #ifndef AO_SENSE_DROGUE
 #define AO_SENSE_DROGUE(p)	((p)->adc.sense_d)
 #define AO_SENSE_MAIN(p)	((p)->adc.sense_m)
@@ -86,73 +77,56 @@ ao_igniter_status(enum ao_igniter igniter)
 static void
 ao_igniter_fire(enum ao_igniter igniter)
 {
-	ao_ignition[igniter].firing = 1;
-	switch(ao_config.ignite_mode) {
-	case AO_IGNITE_MODE_DUAL:
-		switch (igniter) {
-		case ao_igniter_drogue:
-			AO_IGNITER_SET_DROGUE(1);
-			ao_delay(AO_IGNITER_FIRE_TIME);
-			AO_IGNITER_SET_DROGUE(0);
-			break;
-		case ao_igniter_main:
-			AO_IGNITER_SET_MAIN(1);
-			ao_delay(AO_IGNITER_FIRE_TIME);
-			AO_IGNITER_SET_MAIN(0);
-			break;
-		}
-		break;
-	case AO_IGNITE_MODE_APOGEE:
+	if (!ao_ignition[igniter].fired) {
+		ao_ignition[igniter].firing = 1;
+		ao_ignition[igniter].fired = 1;
 		switch (igniter) {
 		case ao_igniter_drogue:
 			AO_IGNITER_SET_DROGUE(1);
 			ao_delay(AO_IGNITER_FIRE_TIME);
 			AO_IGNITER_SET_DROGUE(0);
-			ao_delay(AO_IGNITER_CHARGE_TIME);
-			AO_IGNITER_SET_MAIN(1);
-			ao_delay(AO_IGNITER_FIRE_TIME);
-			AO_IGNITER_SET_MAIN(0);
 			break;
-		default:
-			break;
-		}
-		break;
-	case AO_IGNITE_MODE_MAIN:
-		switch (igniter) {
 		case ao_igniter_main:
-			AO_IGNITER_SET_DROGUE(1);
-			ao_delay(AO_IGNITER_FIRE_TIME);
-			AO_IGNITER_SET_DROGUE(0);
-			ao_delay(AO_IGNITER_CHARGE_TIME);
 			AO_IGNITER_SET_MAIN(1);
 			ao_delay(AO_IGNITER_FIRE_TIME);
 			AO_IGNITER_SET_MAIN(0);
 			break;
-		default:
-			break;
 		}
-		break;
+		ao_ignition[igniter].firing = 0;
+		ao_delay(AO_IGNITER_CHARGE_TIME);
 	}
-	ao_ignition[igniter].firing = 0;
 }
 
 static void
 ao_igniter(void)
 {
-	enum ao_igniter igniter;
-
 	ao_config_get();
 	for (;;) {
-		ao_sleep(&ao_ignition);
-		for (igniter = ao_igniter_drogue; igniter <= ao_igniter_main; igniter++) {
-			if (ao_ignition[igniter].request && !ao_ignition[igniter].fired) {
-				if (igniter == ao_igniter_drogue && ao_config.apogee_delay)
-					ao_delay(AO_SEC_TO_TICKS(ao_config.apogee_delay));
-
-				ao_igniter_fire(igniter);
-				ao_delay(AO_IGNITER_CHARGE_TIME);
-				ao_ignition[igniter].fired = 1;
+		/* Wait for flight state change */
+		ao_sleep(&ao_flight_state);
+
+		/* Fire any igniters that are supposed to be triggered
+		 * in this new state
+		 */
+		switch(ao_config.ignite_mode) {
+		case AO_IGNITE_MODE_DUAL:
+			if (ao_flight_drogue <= ao_flight_state && ao_flight_state < ao_flight_landed)
+				ao_igniter_fire(ao_igniter_drogue);
+			if (ao_flight_main <= ao_flight_state && ao_flight_state < ao_flight_landed)
+				ao_igniter_fire(ao_igniter_main);
+			break;
+		case AO_IGNITE_MODE_APOGEE:
+			if (ao_flight_drogue <= ao_flight_state && ao_flight_state < ao_flight_landed) {
+				ao_igniter_fire(ao_igniter_drogue);
+				ao_igniter_fire(ao_igniter_main);
+			}
+			break;
+		case AO_IGNITE_MODE_MAIN:
+			if (ao_flight_main <= ao_flight_state && ao_flight_state < ao_flight_landed) {
+				ao_igniter_fire(ao_igniter_drogue);
+				ao_igniter_fire(ao_igniter_main);
 			}
+			break;
 		}
 	}
 }