From 69b710a5da6de9be079db59d7c4f80c0f2027a5f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 17 Jun 2018 00:23:05 -0700 Subject: [PATCH] altos: Add quadrature debouncing and make ADC optional for LCO boxes Signed-off-by: Keith Packard --- src/drivers/ao_lco.c | 7 ++++--- src/telelco-v0.2/ao_pins.h | 1 + src/telelco-v0.3/ao_pins.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/drivers/ao_lco.c b/src/drivers/ao_lco.c index f0f518aa..91a0593f 100644 --- a/src/drivers/ao_lco.c +++ b/src/drivers/ao_lco.c @@ -26,9 +26,6 @@ #if HAS_ADC_SINGLE #include #endif -#if HAS_ADC -#include -#endif #define DEBUG 1 @@ -663,6 +660,7 @@ ao_lco_display_test() ao_led_off(LEDS_AVAILABLE); } +#if HAS_ADC_SINGLE static void ao_lco_batt_voltage(void) { @@ -674,6 +672,7 @@ ao_lco_batt_voltage(void) 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; @@ -687,7 +686,9 @@ ao_lco_monitor(void) 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"); diff --git a/src/telelco-v0.2/ao_pins.h b/src/telelco-v0.2/ao_pins.h index b90fca8b..f0da4fe4 100644 --- a/src/telelco-v0.2/ao_pins.h +++ b/src/telelco-v0.2/ao_pins.h @@ -253,6 +253,7 @@ #define AO_QUADRATURE_1_B 0 #define AO_QUADRATURE_BOX 1 +#define AO_QUADRATURE_DEBOUNCE 10 /* * Buttons diff --git a/src/telelco-v0.3/ao_pins.h b/src/telelco-v0.3/ao_pins.h index 6fd897a0..6023739c 100644 --- a/src/telelco-v0.3/ao_pins.h +++ b/src/telelco-v0.3/ao_pins.h @@ -252,6 +252,7 @@ #define AO_QUADRATURE_1_B 0 #define AO_QUADRATURE_BOX 1 +#define AO_QUADRATURE_DEBOUNCE 10 /* * Buttons -- 2.30.2