From: Keith Packard <keithp@keithp.com>
Date: Sat, 9 Jan 2010 09:29:41 +0000 (-0800)
Subject: Remove green LED and temp sensor from v0.2 code
X-Git-Tag: debian/0.6+85+g82fdbfe~20
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=a0d4c1b06d27e850d233f8ddf8fe32912bf0ec8f

Remove green LED and temp sensor from v0.2 code

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/ao_adc.c b/src/ao_adc.c
index a8784667..b0bfceb1 100644
--- a/src/ao_adc.c
+++ b/src/ao_adc.c
@@ -51,7 +51,11 @@ ao_adc_isr(void) interrupt 1
 	a[1] = ADCH;
 	if (sequence < 5) {
 		/* start next channel conversion */
-		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+		sequence++;
+		/* skip channel 2, we don't have a temp sensor on v0.2 */
+		if (sequence == 2)
+			sequence++;
+		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
 	} else {
 		/* record this conversion series */
 		ao_adc_ring[ao_adc_head].tick = ao_time();
@@ -80,7 +84,7 @@ ao_adc_init(void)
 {
 	ADCCFG = ((1 << 0) |	/* acceleration */
 		  (1 << 1) |	/* pressure */
-		  (1 << 2) |	/* temperature */
+/*		  (1 << 2) |	  v0.1 temperature */
 		  (1 << 3) |	/* battery voltage */
 		  (1 << 4) |	/* drogue sense */
 		  (1 << 5));	/* main sense */
diff --git a/src/ao_telemetrum.c b/src/ao_telemetrum.c
index 990b0d77..0de3572a 100644
--- a/src/ao_telemetrum.c
+++ b/src/ao_telemetrum.c
@@ -30,7 +30,7 @@ main(void)
 	ao_clock_init();
 
 	/* Turn on the red LED until the system is stable */
-	ao_led_init(AO_LED_RED|AO_LED_GREEN);
+	ao_led_init(AO_LED_RED);
 	ao_led_on(AO_LED_RED);
 
 	ao_timer_init();