diff options
| author | Drashna Jael're <drashna@live.com> | 2021-09-24 12:21:32 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-09-24 12:21:32 -0700 |
| commit | 675c5a5e12f5c5efe59a0d0b30b17a41a398c74e (patch) | |
| tree | 43850408dbd4afef92b26b16137e62548a8048fe /keyboards/planck | |
| parent | fcb7c7b04fc822e04ac0d2ba9ba8d2483d838b80 (diff) | |
| parent | 4493a05b74d8852222faa776d140233745114c53 (diff) | |
| download | qmk_firmware-675c5a5e12f5c5efe59a0d0b30b17a41a398c74e.tar.gz qmk_firmware-675c5a5e12f5c5efe59a0d0b30b17a41a398c74e.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/planck')
| -rw-r--r-- | keyboards/planck/keymaps/default/config.h | 27 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/default/keymap.c | 2 |
2 files changed, 21 insertions, 8 deletions
diff --git a/keyboards/planck/keymaps/default/config.h b/keyboards/planck/keymaps/default/config.h index 9020d2b9f8..464b7b29f8 100644 --- a/keyboards/planck/keymaps/default/config.h +++ b/keyboards/planck/keymaps/default/config.h @@ -1,13 +1,27 @@ +/* Copyright 2015-2021 Jack Humbert + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #pragma once #ifdef AUDIO_ENABLE - #define STARTUP_SONG SONG(PLANCK_SOUND) - // #define STARTUP_SONG SONG(NO_SOUND) +# define STARTUP_SONG SONG(PLANCK_SOUND) +// #define STARTUP_SONG SONG(NO_SOUND) - #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ - SONG(COLEMAK_SOUND), \ - SONG(DVORAK_SOUND) \ - } +# define DEFAULT_LAYER_SONGS \ + { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) } #endif /* @@ -33,4 +47,3 @@ // Most tactile encoders have detents every 4 stages #define ENCODER_RESOLUTION 4 - diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c index 9a6e1189b6..7c787e0366 100644 --- a/keyboards/planck/keymaps/default/keymap.c +++ b/keyboards/planck/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Jack Humbert +/* Copyright 2015-2021 Jack Humbert * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |