diff options
| author | walkerstop <walkerstop@gmail.com> | 2018-04-13 09:53:29 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-04-13 09:53:29 +0200 |
| commit | 530dd446cb7bbff7b7f9a8075726bfbb4eb9a2a3 (patch) | |
| tree | e7e9428ebcd79271453f1ac54e68a4326cddeb66 /quantum | |
| parent | 22215a0e920a237faabdfa1b8826cd110ab20c3b (diff) | |
| download | qmk_firmware-530dd446cb7bbff7b7f9a8075726bfbb4eb9a2a3.tar.gz qmk_firmware-530dd446cb7bbff7b7f9a8075726bfbb4eb9a2a3.tar.xz | |
Fix incorrect port direction setting in my previous pull request for pins B5, B6, B7 (#2739)
* Added support for audio using pins C4, C5, B6, B7
* Fixed bug where port direction wasn't set correctly for B5, B6, B7 audio ports
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/audio/audio.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c index 3c6d18c4f..c948a60d6 100644 --- a/quantum/audio/audio.c +++ b/quantum/audio/audio.c @@ -76,7 +76,7 @@ #if defined(B5_AUDIO) #define BPIN_AUDIO - #define BPIN_SET_DIRECTION DDRC |= _BV(PORTB5); + #define BPIN_SET_DIRECTION DDRB |= _BV(PORTB5); #define INIT_AUDIO_COUNTER_1 TCCR1A = (0 << COM1A1) | (0 << COM1A0) | (1 << WGM11) | (0 << WGM10); #define ENABLE_AUDIO_COUNTER_1_ISR TIMSK1 |= _BV(OCIE1A) #define DISABLE_AUDIO_COUNTER_1_ISR TIMSK1 &= ~_BV(OCIE1A) @@ -88,7 +88,7 @@ #endif #if defined(B6_AUDIO) #define BPIN_AUDIO - #define BPIN_SET_DIRECTION DDRC |= _BV(PORTB6); + #define BPIN_SET_DIRECTION DDRB |= _BV(PORTB6); #define INIT_AUDIO_COUNTER_1 TCCR1A = (0 << COM1B1) | (0 << COM1B0) | (1 << WGM11) | (0 << WGM10); #define ENABLE_AUDIO_COUNTER_1_ISR TIMSK1 |= _BV(OCIE1B) #define DISABLE_AUDIO_COUNTER_1_ISR TIMSK1 &= ~_BV(OCIE1B) @@ -100,7 +100,7 @@ #endif #if defined(B7_AUDIO) #define BPIN_AUDIO - #define BPIN_SET_DIRECTION DDRC |= _BV(PORTB7); + #define BPIN_SET_DIRECTION DDRB |= _BV(PORTB7); #define INIT_AUDIO_COUNTER_1 TCCR1A = (0 << COM1C1) | (0 << COM1C0) | (1 << WGM11) | (0 << WGM10); #define ENABLE_AUDIO_COUNTER_1_ISR TIMSK1 |= _BV(OCIE1C) #define DISABLE_AUDIO_COUNTER_1_ISR TIMSK1 &= ~_BV(OCIE1C) @@ -187,16 +187,11 @@ void audio_init() // Set audio ports as output #ifdef CPIN_AUDIO CPIN_SET_DIRECTION + DISABLE_AUDIO_COUNTER_3_ISR; #endif #ifdef BPIN_AUDIO BPIN_SET_DIRECTION - #endif - - #ifdef CPIN_AUDIO - DISABLE_AUDIO_COUNTER_3_ISR; - #endif - #ifdef BPIN_AUDIO - DISABLE_AUDIO_COUNTER_1_ISR; + DISABLE_AUDIO_COUNTER_1_ISR; #endif // TCCR3A / TCCR3B: Timer/Counter #3 Control Registers TCCR3A/TCCR3B, TCCR1A/TCCR1B |