X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_ignite.c;h=e9d04dcce4ba848641e73d9fbfa06f5bac3d04e5;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hp=5f41c552edec554e2d03aa529f068ea7c7282711;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;p=fw%2Faltos

diff --git a/src/kernel/ao_ignite.c b/src/kernel/ao_ignite.c
index 5f41c552..e9d04dcc 100644
--- a/src/kernel/ao_ignite.c
+++ b/src/kernel/ao_ignite.c
@@ -72,10 +72,8 @@ ao_igniter_status(enum ao_igniter igniter)
 		return ao_igniter_unknown;
 }
 
-#ifndef AO_IGNITER_SET_DROGUE
-#define AO_IGNITER_SET_DROGUE(v)	AO_IGNITER_DROGUE = (v)
-#define AO_IGNITER_SET_MAIN(v)		AO_IGNITER_MAIN = (v)
-#endif
+#define AO_IGNITER_SET_DROGUE(v)	ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
+#define AO_IGNITER_SET_MAIN(v)		ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
 
 #ifndef AO_IGNITER_FIRE_TIME
 #define AO_IGNITER_FIRE_TIME		AO_MS_TO_TICKS(50)
@@ -85,7 +83,7 @@ ao_igniter_status(enum ao_igniter igniter)
 #define AO_IGNITER_CHARGE_TIME		AO_MS_TO_TICKS(2000)
 #endif
 
-void
+static void
 ao_igniter_fire(enum ao_igniter igniter)
 {
 	ao_ignition[igniter].firing = 1;
@@ -138,7 +136,7 @@ ao_igniter_fire(enum ao_igniter igniter)
 	ao_ignition[igniter].firing = 0;
 }
 
-void
+static void
 ao_igniter(void)
 {
 	enum ao_igniter igniter;
@@ -161,7 +159,7 @@ ao_igniter(void)
 
 #endif
 
-void
+static void
 ao_ignite_manual(void)
 {
 	ao_cmd_white();
@@ -192,7 +190,7 @@ const char * const ao_igniter_status_names[] = {
 };
 
 #if HAS_IGNITE
-void
+static void
 ao_ignite_print_status(enum ao_igniter igniter, const char *name) 
 {
 	enum ao_igniter_status status = ao_igniter_status(igniter);
@@ -202,7 +200,7 @@ ao_ignite_print_status(enum ao_igniter igniter, const char *name)
 }
 #endif
 
-void
+static void
 ao_ignite_test(void)
 {
 #if HAS_IGNITE
@@ -226,8 +224,8 @@ struct ao_task ao_igniter_task;
 void
 ao_ignite_set_pins(void)
 {
-	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);
+	ao_enable_output(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, 0);
+	ao_enable_output(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, 0);
 }
 #endif