diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-27 15:28:13 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-06-27 15:28:13 -0400 |
| commit | 7d28a417c035b66529d7f6d49479fe4c22737134 (patch) | |
| tree | 915375855e8a8d667f2071391dc56a390db52854 | |
| parent | ea7590c8940bc85f8a83bd42b1e01bc1431c104b (diff) | |
| download | qmk_firmware-7d28a417c035b66529d7f6d49479fe4c22737134.tar.gz qmk_firmware-7d28a417c035b66529d7f6d49479fe4c22737134.zip | |
don't let timer1 exist without b5 being enabled
| -rw-r--r-- | keyboards/atomic/keymaps/pvc/config.h | 2 | ||||
| -rw-r--r-- | quantum/audio/audio.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/atomic/keymaps/pvc/config.h b/keyboards/atomic/keymaps/pvc/config.h index 18a7253f2..ea5821ee7 100644 --- a/keyboards/atomic/keymaps/pvc/config.h +++ b/keyboards/atomic/keymaps/pvc/config.h | |||
| @@ -49,6 +49,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 49 | #define BACKLIGHT_PIN B7 | 49 | #define BACKLIGHT_PIN B7 |
| 50 | #define BACKLIGHT_BREATHING | 50 | #define BACKLIGHT_BREATHING |
| 51 | 51 | ||
| 52 | #define C6_AUDIO | ||
| 53 | |||
| 52 | /* COL2ROW or ROW2COL */ | 54 | /* COL2ROW or ROW2COL */ |
| 53 | #define DIODE_DIRECTION COL2ROW | 55 | #define DIODE_DIRECTION COL2ROW |
| 54 | 56 | ||
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c index 3192d500f..c924f2bd5 100644 --- a/quantum/audio/audio.c +++ b/quantum/audio/audio.c | |||
| @@ -442,6 +442,7 @@ ISR(TIMER3_COMPA_vect) | |||
| 442 | } | 442 | } |
| 443 | #endif | 443 | #endif |
| 444 | 444 | ||
| 445 | #ifdef B5_AUDIO | ||
| 445 | ISR(TIMER1_COMPA_vect) | 446 | ISR(TIMER1_COMPA_vect) |
| 446 | { | 447 | { |
| 447 | #if defined(B5_AUDIO) && !defined(C6_AUDIO) | 448 | #if defined(B5_AUDIO) && !defined(C6_AUDIO) |
| @@ -572,6 +573,7 @@ ISR(TIMER1_COMPA_vect) | |||
| 572 | } | 573 | } |
| 573 | #endif | 574 | #endif |
| 574 | } | 575 | } |
| 576 | #endif | ||
| 575 | 577 | ||
| 576 | void play_note(float freq, int vol) { | 578 | void play_note(float freq, int vol) { |
| 577 | 579 | ||
