aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/planck/keymaps/default/config.h27
-rw-r--r--keyboards/planck/keymaps/default/keymap.c2
-rw-r--r--keyboards/preonic/keymaps/default/config.h26
-rw-r--r--keyboards/preonic/keymaps/default/keymap.c2
4 files changed, 42 insertions, 15 deletions
diff --git a/keyboards/planck/keymaps/default/config.h b/keyboards/planck/keymaps/default/config.h
index 9020d2b9f..464b7b29f 100644
--- a/keyboards/planck/keymaps/default/config.h
+++ b/keyboards/planck/keymaps/default/config.h
@@ -1,13 +1,27 @@
1/* Copyright 2015-2021 Jack Humbert
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1#pragma once 17#pragma once
2 18
3#ifdef AUDIO_ENABLE 19#ifdef AUDIO_ENABLE
4 #define STARTUP_SONG SONG(PLANCK_SOUND) 20# define STARTUP_SONG SONG(PLANCK_SOUND)
5 // #define STARTUP_SONG SONG(NO_SOUND) 21// #define STARTUP_SONG SONG(NO_SOUND)
6 22
7 #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ 23# define DEFAULT_LAYER_SONGS \
8 SONG(COLEMAK_SOUND), \ 24 { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
9 SONG(DVORAK_SOUND) \
10 }
11#endif 25#endif
12 26
13/* 27/*
@@ -33,4 +47,3 @@
33 47
34// Most tactile encoders have detents every 4 stages 48// Most tactile encoders have detents every 4 stages
35#define ENCODER_RESOLUTION 4 49#define ENCODER_RESOLUTION 4
36
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 9a6e1189b..7c787e036 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
1/* Copyright 2015-2017 Jack Humbert 1/* Copyright 2015-2021 Jack Humbert
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/preonic/keymaps/default/config.h b/keyboards/preonic/keymaps/default/config.h
index 37858350a..8756e5012 100644
--- a/keyboards/preonic/keymaps/default/config.h
+++ b/keyboards/preonic/keymaps/default/config.h
@@ -1,13 +1,27 @@
1/* Copyright 2015-2021 Jack Humbert
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
1#pragma once 17#pragma once
2 18
3#ifdef AUDIO_ENABLE 19#ifdef AUDIO_ENABLE
4 #define STARTUP_SONG SONG(PREONIC_SOUND) 20# define STARTUP_SONG SONG(PREONIC_SOUND)
5 // #define STARTUP_SONG SONG(NO_SOUND) 21// #define STARTUP_SONG SONG(NO_SOUND)
6 22
7 #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ 23# define DEFAULT_LAYER_SONGS \
8 SONG(COLEMAK_SOUND), \ 24 { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
9 SONG(DVORAK_SOUND) \
10 }
11#endif 25#endif
12 26
13#define MUSIC_MASK (keycode != KC_NO) 27#define MUSIC_MASK (keycode != KC_NO)
diff --git a/keyboards/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c
index 3a82f7151..f99a6953c 100644
--- a/keyboards/preonic/keymaps/default/keymap.c
+++ b/keyboards/preonic/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
1/* Copyright 2015-2017 Jack Humbert 1/* Copyright 2015-2021 Jack Humbert
2 * 2 *
3 * This program is free software: you can redistribute it and/or modify 3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 4 * it under the terms of the GNU General Public License as published by