Skip to content

Commit 2ff83c3

Browse files
zvecrzvecr
authored
Remove QMK_KEYBOARD_CONFIG_H (qmk#11576)
1 parent 024f5cc commit 2ff83c3

File tree

20 files changed

+16
-87
lines changed

20 files changed

+16
-87
lines changed

‎build_keyboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
379379
OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
380380
$(KEYMAP_OUTPUT)_SRC := $(SRC)
381381
$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \
382-
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH_1)/config.h\" \
382+
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \
383383
-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
384384
-DQMK_SUBPROJECT -DQMK_SUBPROJECT_H -DQMK_SUBPROJECT_CONFIG_H
385385
$(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS)

‎layouts/community/60_ansi/talljoe-ansi/config.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#pragma once
1818

19-
#include QMK_KEYBOARD_CONFIG_H
20-
2119
#define ENABLE_GAME_LAYER
2220

2321
#define TEMPLATE( \

‎layouts/community/60_hhkb/talljoe-hhkb/config.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#pragma once
1818

19-
#include QMK_KEYBOARD_CONFIG_H
20-
2119
#define ENABLE_GAME_LAYER
2220

2321
#define TEMPLATE( \

‎layouts/community/60_iso/unxmaal/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License
1515
along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
#ifndef KEYMAP_CONFIG_H
19-
#define KEYMAP_CONFIG_H
20-
21-
#include QMK_KEYBOARD_CONFIG_H
18+
#pragma once
2219

2320
#ifndef RGB_DI_PIN
2421
#define RGB_DI_PIN F4
@@ -28,5 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2825
#define RGBLIGHT_SAT_STEP 8
2926
#define RGBLIGHT_VAL_STEP 8
3027
#endif
31-
32-
#endif

‎layouts/community/ergodox/333fred/config.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,5 @@
2222

2323
#pragma once
2424

25-
#include QMK_KEYBOARD_CONFIG_H
26-
2725
#undef TAPPING_TERM
2826
#define TAPPING_TERM 200

‎layouts/community/ergodox/adam/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
22

33
#undef TAPPING_TERM
44
#define TAPPING_TERM 300 //At 500 some bad logic takes hold

‎layouts/community/ergodox/albert/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
#ifndef CONFIG_USER_H
2-
#define CONFIG_USER_H
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
/* using UK layout for space-cadet-shift */
74
#define LSPO_KEY KC_9
85
#define RSPC_KEY KC_0
96

107
#define LEADER_TIMEOUT 800 // leader key sequence timeout in millis
11-
12-
#endif

‎layouts/community/ergodox/algernon/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#ifndef CONFIG_ALGERNON_H
2-
#define CONFIG_ALGERNON_H
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
#undef MOUSEKEY_TIME_TO_MAX
74
#undef MOUSEKEY_MAX_SPEED
@@ -23,5 +20,3 @@
2320

2421
#undef LEADER_TIMEOUT
2522
#define LEADER_TIMEOUT 1000
26-
27-
#endif

‎layouts/community/ergodox/berfarah/config.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#ifndef CONFIG_BERFARAH_H
2-
#define CONFIG_BERFARAH_H
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
#undef TAPPING_TERM
74
#define TAPPING_TERM 150
@@ -10,4 +7,3 @@
107
#define RGBLIGHT_EFFECT_BREATHE_MAX 150
118

129
#undef IGNORE_MOD_TAP_INTERRUPT
13-
#endif

‎layouts/community/ergodox/issmirnov/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Reference: https://beta.docs.qmk.fm/reference/config-options
22
// and https://github.com/qmk/qmk_firmware/blob/master/docs/config_options.md
3-
#include QMK_KEYBOARD_CONFIG_H
3+
#pragma once

‎layouts/community/ergodox/jackhumbert/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#ifndef CONFIG_USER_H
2-
#define CONFIG_USER_H
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
/* ws2812 RGB LED */
74
#define RGB_DI_PIN D7
@@ -13,5 +10,3 @@
1310

1411
#define RGB_MIDI
1512
#define RGBW_BB_TWI
16-
17-
#endif

‎layouts/community/ergodox/kejadlen/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
#ifndef CONFIG_USER_H
2-
#define CONFIG_USER_H
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
#define FORCE_NKRO
74

85
#undef TAPPING_TERM
96
#undef IGNORE_MOD_TAP_INTERRUPT
10-
11-
#endif

‎layouts/community/ergodox/supercoder/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
#ifndef CONFIG_USER_H
2-
#define CONFIG_USER_H 1
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
#undef LOCKING_SUPPORT_ENABLE
74
#undef LOCKING_RESYNC_ENABLE
8-
9-
#endif

‎layouts/community/ergodox/townk_osx/config.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ You should have received a copy of the GNU General Public License
1616
along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#ifndef CONFIG_H
20-
#define CONFIG_H
19+
#pragma once
2120

22-
#include QMK_KEYBOARD_CONFIG_H
2321
/*
2422
* Feature disable options
2523
* These options are also useful to firmware size reduction.
@@ -40,5 +38,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
4038
//#define DEBUG_MATRIX_SCAN_RATE
4139
#define ONESHOT_TAP_TOGGLE 2
4240
#define ONESHOT_TIMEOUT 3000
43-
44-
#endif

‎layouts/community/ergodox/videck/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
#ifndef CONFIG_USER_H
2-
#define CONFIG_USER_H
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
#ifndef NO_DEBUG
74
#define NO_DEBUG
85
#endif
96
#ifndef NO_PRINT
107
#define NO_PRINT
118
#endif
12-
13-
#endif

‎layouts/community/ergodox/win10_writers-block/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#ifndef KEYBOARDS_ERGODOX_CONFIG_H_
2-
#define KEYBOARDS_ERGODOX_CONFIG_H_
3-
4-
#include QMK_KEYBOARD_CONFIG_H
1+
#pragma once
52

63
#undef MOUSEKEY_DELAY
74
#undef MOUSEKEY_INTERVAL
@@ -31,5 +28,3 @@
3128
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
3229
get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
3330
)
34-
35-
#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */

‎layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
2020

21-
#ifndef CONFIG_USER_H
22-
#define CONFIG_USER_H
23-
24-
#include QMK_KEYBOARD_CONFIG_H
21+
#pragma once
2522

2623
/* Use I2C or Serial, not both */
2724

@@ -33,5 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3330
#define MASTER_LEFT
3431
// #define _MASTER_RIGHT
3532
// #define EE_HANDS
36-
37-
#endif

‎layouts/community/ortho_4x12/crs/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
2020

21-
#ifndef CONFIG_USER_H
22-
#define CONFIG_USER_H
23-
24-
#include QMK_KEYBOARD_CONFIG_H
21+
#pragma once
2522

2623
/* Use I2C or Serial, not both */
2724

@@ -33,5 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3330
#define MASTER_LEFT
3431
// #define _MASTER_RIGHT
3532
// #define EE_HANDS
36-
37-
#endif

‎layouts/community/ortho_4x12/ergodoxish/config.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License
1818
along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
2020

21-
#ifndef CONFIG_USER_H
22-
#define CONFIG_USER_H
23-
24-
#include QMK_KEYBOARD_CONFIG_H
21+
#pragma once
2522

2623
/* Use I2C or Serial, not both */
2724

@@ -33,5 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3330
#define MASTER_LEFT
3431
// #define _MASTER_RIGHT
3532
// #define EE_HANDS
36-
37-
#endif

‎layouts/community/tkl_ansi/talljoe-tkl/config.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#pragma once
1818

19-
#include QMK_KEYBOARD_CONFIG_H
20-
2119
#define ENABLE_GAME_LAYER
2220

2321
#define TEMPLATE_TKL(\

0 commit comments

Comments
 (0)