X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_ignite.c;h=693b7c7aaeb17e3dc384852bc46204ed546fa156;hb=e80fa6de4ccc5c4851eab9fb941f9282d2e3eb16;hp=d4aef153a6e25cfecf246c8f63fe798508a5c773;hpb=a00aff5ee93ea9763b5c0466fcecc823cad135ef;p=fw%2Faltos

diff --git a/src/core/ao_ignite.c b/src/core/ao_ignite.c
index d4aef153..693b7c7a 100644
--- a/src/core/ao_ignite.c
+++ b/src/core/ao_ignite.c
@@ -21,10 +21,12 @@
 __xdata struct ao_ignition ao_ignition[2];
 
 void
-ao_ignite(enum ao_igniter igniter) __critical
+ao_ignite(enum ao_igniter igniter)
 {
+	cli();
 	ao_ignition[igniter].request = 1;
 	ao_wakeup(&ao_ignition);
+	sei();
 }
 
 #ifndef AO_SENSE_DROGUE
@@ -39,12 +41,12 @@ ao_igniter_status(enum ao_igniter igniter)
 	__pdata int16_t value;
 	__pdata uint8_t request, firing, fired;
 
-	__critical {
+	ao_arch_critical(
 		ao_data_get(&packet);
 		request = ao_ignition[igniter].request;
 		fired = ao_ignition[igniter].fired;
 		firing = ao_ignition[igniter].firing;
-	}
+		);
 	if (firing || (request && !fired))
 		return ao_igniter_active;
 
@@ -79,11 +81,8 @@ ao_igniter_status(enum ao_igniter igniter)
 #endif
 
 void
-ao_igniter_fire(enum ao_igniter igniter) __critical
+ao_igniter_fire(enum ao_igniter igniter)
 {
-#ifndef MEGAMETRUM
-	ao_mutex_get(&ao_radio_mutex);
-#endif
 	ao_ignition[igniter].firing = 1;
 	switch(ao_config.ignite_mode) {
 	case AO_IGNITE_MODE_DUAL:
@@ -128,9 +127,6 @@ ao_igniter_fire(enum ao_igniter igniter) __critical
 		break;
 	}
 	ao_ignition[igniter].firing = 0;
-#ifndef MEGAMETRUM
-	ao_mutex_put(&ao_radio_mutex);
-#endif
 }
 
 void
@@ -201,8 +197,8 @@ __xdata struct ao_task ao_igniter_task;
 void
 ao_ignite_set_pins(void)
 {
-	ao_enable_output(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, 0);
-	ao_enable_output(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, 0);
+	ao_enable_output(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, 0);
+	ao_enable_output(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, 0);
 }
 
 void