diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-27 14:35:08 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-06-27 14:35:08 -0400 |
| commit | ea7590c8940bc85f8a83bd42b1e01bc1431c104b (patch) | |
| tree | f3c2b71269e6ff64dd3c427d0f8a7e27f2900201 | |
| parent | 9f5b4e1d7a37f873acbc19b8385964121566653e (diff) | |
| download | qmk_firmware-ea7590c8940bc85f8a83bd42b1e01bc1431c104b.tar.gz qmk_firmware-ea7590c8940bc85f8a83bd42b1e01bc1431c104b.zip | |
add new arguements, docs
| -rw-r--r-- | docs/modding_your_keyboard.md | 2 | ||||
| -rw-r--r-- | keyboards/planck/config.h | 1 | ||||
| -rw-r--r-- | keyboards/preonic/config.h | 1 | ||||
| -rw-r--r-- | quantum/audio/audio.c | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/docs/modding_your_keyboard.md b/docs/modding_your_keyboard.md index 2429570f53..44e6e6e72a 100644 --- a/docs/modding_your_keyboard.md +++ b/docs/modding_your_keyboard.md @@ -1,7 +1,7 @@ ## Audio output from a speaker -Your keyboard can make sounds! If you've got a Planck, Preonic, or basically any keyboard that allows access to the C6 port, you can hook up a simple speaker and make it beep. You can use those beeps to indicate layer transitions, modifiers, special keys, or just to play some funky 8bit tunes. +Your keyboard can make sounds! If you've got a Planck, Preonic, or basically any keyboard that allows access to the C6 or B5 port (`#define C6_AUDIO` and `#define B5_AUDIO`), you can hook up a simple speaker and make it beep. You can use those beeps to indicate layer transitions, modifiers, special keys, or just to play some funky 8bit tunes. The audio code lives in [quantum/audio/audio.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/audio/audio.h) and in the other files in the audio directory. It's enabled by default on the Planck [stock keymap](https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/default/keymap.c). Here are the important bits: diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index 5cf96bb88c..c86f8491ee 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -37,6 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define UNUSED_PINS #define AUDIO_VOICES +#define C6_AUDIO #define BACKLIGHT_PIN B7 diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 239c29ebf9..8aa88b7f0d 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -38,6 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define UNUSED_PINS #define AUDIO_VOICES +#define C6_AUDIO #define BACKLIGHT_PIN B7 diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c index 04f3460033..3192d500f5 100644 --- a/quantum/audio/audio.c +++ b/quantum/audio/audio.c @@ -271,12 +271,13 @@ float vibrato(float average_freq) { #ifdef C6_AUDIO ISR(TIMER3_COMPA_vect) { - float freq, freq_alt = 0; + float freq; if (playing_note) { if (voices > 0) { #ifdef B5_AUDIO + float freq_alt = 0; if (voices > 1) { if (polyphony_rate == 0) { if (glissando) { |