X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco.c;h=91a0593ff0dace703def84d427941d41b4c0ece3;hb=abac6c59d6b004d52a7b782865d2d987732cd61e;hp=6c192537be7400167d0ebbb460406687d9590c59;hpb=0ae116dd8779fd0594d443a735e7b6834ea9b713;p=fw%2Faltos

diff --git a/src/drivers/ao_lco.c b/src/drivers/ao_lco.c
index 6c192537..91a0593f 100644
--- a/src/drivers/ao_lco.c
+++ b/src/drivers/ao_lco.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,6 +23,9 @@
 #include <ao_quadrature.h>
 #include <ao_lco_func.h>
 #include <ao_radio_cmac.h>
+#if HAS_ADC_SINGLE
+#include <ao_adc_single.h>
+#endif
 
 #define DEBUG	1
 
@@ -639,6 +643,37 @@ ao_lco_arm_warn(void)
 	}
 }
 
+/*
+ * Light up everything for a second at power on to let the user
+ * visually inspect the system for correct operation
+ */
+static void
+ao_lco_display_test()
+{
+	ao_mutex_get(&ao_lco_display_mutex);
+	ao_seven_segment_set(AO_LCO_PAD_DIGIT, 8 | 0x10);
+	ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, 8 | 0x10);
+	ao_seven_segment_set(AO_LCO_BOX_DIGIT_10, 8 | 0x10);
+	ao_mutex_put(&ao_lco_display_mutex);
+	ao_led_on(LEDS_AVAILABLE);
+	ao_delay(AO_MS_TO_TICKS(1000));
+	ao_led_off(LEDS_AVAILABLE);
+}
+
+#if HAS_ADC_SINGLE
+static void
+ao_lco_batt_voltage(void)
+{
+	struct ao_adc	packet;
+	int16_t		decivolt;
+
+	ao_adc_single_get(&packet);
+	decivolt = ao_battery_decivolt(packet.v_batt);
+	ao_lco_set_voltage(decivolt);
+	ao_delay(AO_MS_TO_TICKS(1000));
+}
+#endif
+
 static struct ao_task ao_lco_input_task;
 static struct ao_task ao_lco_monitor_task;
 static struct ao_task ao_lco_arm_warn_task;
@@ -650,6 +685,10 @@ ao_lco_monitor(void)
 	uint16_t		delay;
 	uint8_t			box;
 
+	ao_lco_display_test();
+#if HAS_ADC_SINGLE
+	ao_lco_batt_voltage();
+#endif
 	ao_lco_search();
 	ao_add_task(&ao_lco_input_task, ao_lco_input, "lco input");
 	ao_add_task(&ao_lco_arm_warn_task, ao_lco_arm_warn, "lco arm warn");
@@ -660,7 +699,7 @@ ao_lco_monitor(void)
 		       ao_lco_armed, ao_lco_firing);
 
 		if (ao_lco_armed && ao_lco_firing) {
-			ao_lco_ignite();
+			ao_lco_ignite(AO_PAD_FIRE);
 		} else {
 			ao_lco_update();
 			if (ao_lco_armed) {