summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-09-01 00:15:02 -0500
committerKeith Packard <keithp@keithp.com>2012-09-01 00:15:02 -0500
commit3ccc4a13e3f76bec864d61b0cdfd57c76c6baadb (patch)
treed559ab47dceb6c7e458df3ded972699fc5b8e900 /src
parent8c743857525eff778d067068356dec486b9fefa2 (diff)
Revert "Timer 3 working with slower clock and all 16 bits."
PWM bits not suitable for master This reverts commit 49b1ff4c614d24977b33cd17b583acc87acff476.
Diffstat (limited to 'src')
-rw-r--r--src/avr/ao_pwmin.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/avr/ao_pwmin.c b/src/avr/ao_pwmin.c
index edcb1636..4d96404d 100644
--- a/src/avr/ao_pwmin.c
+++ b/src/avr/ao_pwmin.c
@@ -25,8 +25,6 @@
* project payload developed at Challenger Middle School.
*/
-volatile __data uint16_t ao_tick3_count;
-
static void
ao_pwmin_display(void) __reentrant
{
@@ -34,19 +32,10 @@ ao_pwmin_display(void) __reentrant
uint8_t hi = TCNT1H;
uint16_t value = (hi <<8) | lo;
- uint8_t lo3 = TCNT3L;
- uint8_t hi3 = TCNT3H;
- uint16_t value3 = (hi3 <<8) | lo3;
-
/* now display the value we read */
- printf("timer 1: %5u %2x %2x\n", value, hi, lo);
- printf("timer 3: %5u %2x %2x\n", value3, hi3, lo3);
+ printf("timer 1: %5u", value);
}
-ISR(TIMER3_COMPA_vect)
-{
- ++ao_tick3_count;
-}
__code struct ao_cmds ao_pwmin_cmds[] = {
{ ao_pwmin_display, "p\0PWM input" },
@@ -57,18 +46,6 @@ void
ao_pwmin_init(void)
{
/* do hardware setup here */
- TCCR3A = ((0 << WGM31) | /* normal mode, OCR3A */
- (0 << WGM30)); /* normal mode, OCR3A */
- TCCR3B = ((0 << ICNC3) | /* no input capture noise canceler */
- (0 << ICES3) | /* input capture on falling edge (don't care) */
- (0 << WGM33) | /* normal mode, OCR3A */
- (0 << WGM32) | /* normal mode, OCR3A */
- (4 << CS30)); /* clk/256 from prescaler */
-
- OCR3A = 1250; /* 8MHz clock */
-
- TIMSK3 = (1 << OCIE3A); /* Interrupt on compare match */
-
/* set the spike filter bit in the TCCR3B register */
ao_cmd_register(&ao_pwmin_cmds[0]);