diff options
| author | Keith Packard <keithp@keithp.com> | 2010-01-09 01:29:41 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-01-09 01:29:41 -0800 |
| commit | a0d4c1b06d27e850d233f8ddf8fe32912bf0ec8f (patch) | |
| tree | 299020991ad44d6e7b45f2b11509b98818deae22 /src | |
| parent | dc8d18736239b14c2ec48a40a01515912c5c25e6 (diff) | |
Remove green LED and temp sensor from v0.2 code
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ao_adc.c | 8 | ||||
| -rw-r--r-- | src/ao_telemetrum.c | 2 |
2 files changed, 7 insertions, 3 deletions
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(); |