From 4a08e298d65aeb591ef68f27c49af68d75a85290 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 20 Jul 2012 12:23:24 -0700
Subject: [PATCH] Make telepyro build again

Make the ICP3 rpm counter use in ao_adc_avr.c optional

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/avr/ao_adc_avr.c       | 2 ++
 src/avr/ao_pins.h          | 2 ++
 src/telepyro-v0.1/Makefile | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/avr/ao_adc_avr.c b/src/avr/ao_adc_avr.c
index 4896b015..739a6d4a 100644
--- a/src/avr/ao_adc_avr.c
+++ b/src/avr/ao_adc_avr.c
@@ -97,8 +97,10 @@ ISR(ADC_vect)
 	if (++ao_adc_channel < NUM_ADC - 1)
 		ao_adc_start();
 	else {
+#if HAS_ICP3_COUNT
 		/* steal last adc channel for pwm input */
 		ao_data_ring[ao_data_head].adc.adc[ao_adc_channel] = ao_icp3_count;
+#endif
 		ADCSRA = ADCSRA_INIT;
 		ao_data_ring[ao_data_head].tick = ao_time();
 		ao_data_head = ao_data_ring_next(ao_data_head);
diff --git a/src/avr/ao_pins.h b/src/avr/ao_pins.h
index bc423ff7..0f49db0b 100644
--- a/src/avr/ao_pins.h
+++ b/src/avr/ao_pins.h
@@ -47,6 +47,7 @@
 	#define AVR_VCC_5V	       	0
 	#define AVR_VCC_3V3		1
 	#define AVR_CLOCK		8000000UL
+	#define HAS_ICP3_COUNT		1
 
 	#define SPI_CS_PORT		PORTE
 	#define SPI_CS_DIR		DDRE
@@ -81,6 +82,7 @@
 	#define IS_COMPANION		1
 	#define HAS_ORIENT		0
 	#define ao_storage_pos_t	uint16_t
+	#define HAS_ICP3_COUNT		0
 
 	#define AVR_VCC_5V	       	0
 	#define AVR_VCC_3V3		1
diff --git a/src/telepyro-v0.1/Makefile b/src/telepyro-v0.1/Makefile
index 2ccd565f..6743ba66 100644
--- a/src/telepyro-v0.1/Makefile
+++ b/src/telepyro-v0.1/Makefile
@@ -96,7 +96,7 @@ ao_product.o: ao_product.c ao_product.h
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f $(OBJ) $(PROG) $(PROG).hex
 	rm -f ao_product.h
 
 install:
-- 
2.30.2