From 7ab6a57edf7a78f4e06c3004ea719b0b3fd3c460 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 6 May 2020 22:44:34 -0700 Subject: [PATCH] altos: Make beep reporting of igniters work with just pyro channels Just shuffle code around to allow no apogee/main but some pyro channels and still make beeps. Signed-off-by: Keith Packard --- src/easytimer-v1/ao_pins.h | 2 +- src/kernel/ao_report.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/easytimer-v1/ao_pins.h b/src/easytimer-v1/ao_pins.h index 593119b9..3ceb49f3 100644 --- a/src/easytimer-v1/ao_pins.h +++ b/src/easytimer-v1/ao_pins.h @@ -118,7 +118,7 @@ */ #define HAS_IGNITE 0 -#define HAS_IGNITE_REPORT 0 +#define HAS_IGNITE_REPORT 1 #define AO_PYRO_NUM 2 #define AO_SENSE_PYRO(p,n) ((p)->adc.sense[n]) diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c index 75f0fcb2..26604d1a 100644 --- a/src/kernel/ao_report.c +++ b/src/kernel/ao_report.c @@ -190,6 +190,7 @@ ao_report_battery(void) #endif #if HAS_IGNITE_REPORT +#if HAS_IGNITE static uint8_t ao_report_igniter_ready(enum ao_igniter igniter) { @@ -202,12 +203,14 @@ ao_report_igniter(void) return (ao_report_igniter_ready(ao_igniter_drogue) | (ao_report_igniter_ready(ao_igniter_main) << 1)); } +#endif static void ao_report_continuity(void) { + uint8_t c; #if HAS_IGNITE - uint8_t c = ao_report_igniter(); + c = ao_report_igniter(); if (c) { while (c--) { high(AO_MS_TO_TICKS(25)); -- 2.47.2