From a07c2a137708f8e2b6e1440d386569b97d613cc5 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 22 Jan 2021 19:32:10 +0000 Subject: [PATCH] Remove QMK_KEYBOARD_CONFIG_H (#11576) --- build_keyboard.mk | 2 +- keyboards/contra/keymaps/losinggeneration/config.h | 6 +----- keyboards/ergodash/rev1/keymaps/333fred/config.h | 2 -- keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h | 7 +------ .../keebio/levinson/keymaps/losinggeneration/config.h | 7 +------ .../keebio/nyquist/keymaps/losinggeneration/config.h | 7 +------ keyboards/keebio/viterbi/keymaps/mike808/config.h | 7 +------ keyboards/pearl/keymaps/cijanzen/config.h | 8 +------- layouts/community/60_ansi/talljoe-ansi/config.h | 2 -- layouts/community/60_hhkb/talljoe-hhkb/config.h | 2 -- layouts/community/60_iso/unxmaal/config.h | 7 +------ layouts/community/ergodox/333fred/config.h | 2 -- layouts/community/ergodox/adam/config.h | 2 +- layouts/community/ergodox/albert/config.h | 7 +------ layouts/community/ergodox/algernon/config.h | 7 +------ layouts/community/ergodox/berfarah/config.h | 6 +----- layouts/community/ergodox/issmirnov/config.h | 2 +- layouts/community/ergodox/jackhumbert/config.h | 7 +------ layouts/community/ergodox/kejadlen/config.h | 7 +------ layouts/community/ergodox/supercoder/config.h | 7 +------ layouts/community/ergodox/townk_osx/config.h | 6 +----- layouts/community/ergodox/videck/config.h | 7 +------ layouts/community/ergodox/win10_writers-block/config.h | 7 +------ layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h | 7 +------ layouts/community/ortho_4x12/crs/config.h | 7 +------ layouts/community/ortho_4x12/ergodoxish/config.h | 7 +------ layouts/community/tkl_ansi/talljoe-tkl/config.h | 2 -- 27 files changed, 22 insertions(+), 125 deletions(-) diff --git a/build_keyboard.mk b/build_keyboard.mk index 79fe336b48b13acf106330592114663e085193e8..28ba97bbc8059256d5c6c434a84e8179b96b9857 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -379,7 +379,7 @@ ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H) OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT) $(KEYMAP_OUTPUT)_SRC := $(SRC) $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \ --DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH_1)/config.h\" \ +-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \ -DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \ -DQMK_SUBPROJECT -DQMK_SUBPROJECT_H -DQMK_SUBPROJECT_CONFIG_H $(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) diff --git a/keyboards/contra/keymaps/losinggeneration/config.h b/keyboards/contra/keymaps/losinggeneration/config.h index 759b1d9a000d1f7d4d97fa69f816cf21fa2540e3..4a64e977c9bf8a7f3d28179be17c2dedb70eea05 100644 --- a/keyboards/contra/keymaps/losinggeneration/config.h +++ b/keyboards/contra/keymaps/losinggeneration/config.h @@ -16,12 +16,8 @@ You should have received a copy of the GNU General Public License long with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H +#pragma once -#include QMK_KEYBOARD_CONFIG_H #define USE_MIT_LAYOUT #define TAPPING_TERM 250 - -#endif diff --git a/keyboards/ergodash/rev1/keymaps/333fred/config.h b/keyboards/ergodash/rev1/keymaps/333fred/config.h index b8f5e8c94843456450d54d292ea57397a0fc4ccf..a8ad1e4fe7739ab80bfcba89235ba214fbe4f3fa 100644 --- a/keyboards/ergodash/rev1/keymaps/333fred/config.h +++ b/keyboards/ergodash/rev1/keymaps/333fred/config.h @@ -22,8 +22,6 @@ #pragma once -#include QMK_KEYBOARD_CONFIG_H - #define USE_SERIAL #define MASTER_LEFT diff --git a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h index 701c2cf353f137d4aa5c557041b7af239e808099..c3c4a1b6973ea1ab963c4524c64065376dce5ef8 100644 --- a/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h +++ b/keyboards/handwired/not_so_minidox/keymaps/mtdjr/config.h @@ -1,10 +1,5 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #define SOLENOID_ENABLE #define SOLENOID_PIN F6 #define SOLENOID_ACTIVE true - -#endif diff --git a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h index 917c6a98ba0a54f2a96fddc71675adf234d1abbc..13023939eba9e578abbf7ed5036a331f23723c6c 100644 --- a/keyboards/keebio/levinson/keymaps/losinggeneration/config.h +++ b/keyboards/keebio/levinson/keymaps/losinggeneration/config.h @@ -16,10 +16,7 @@ You should have received a copy of the GNU General Public License long with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* Use I2C or Serial, not both */ @@ -38,5 +35,3 @@ long with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - -#endif diff --git a/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h index 330379447192aaf167348536f87ef0ec78302620..56cacd843eafd6f62cbe2b425aeeae158507616c 100644 --- a/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h +++ b/keyboards/keebio/nyquist/keymaps/losinggeneration/config.h @@ -16,10 +16,7 @@ You should have received a copy of the GNU General Public License long with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* Use I2C or Serial, not both */ @@ -31,5 +28,3 @@ long with this program. If not, see . #define MASTER_LEFT /* #define _MASTER_RIGHT */ /* #define EE_HANDS */ - -#endif diff --git a/keyboards/keebio/viterbi/keymaps/mike808/config.h b/keyboards/keebio/viterbi/keymaps/mike808/config.h index bfca915f24d85450d916214303e7cda92f33e6c2..95625ea670d55491f9cd447d256f8fe5b7468df3 100644 --- a/keyboards/keebio/viterbi/keymaps/mike808/config.h +++ b/keyboards/keebio/viterbi/keymaps/mike808/config.h @@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* Use I2C or Serial, not both */ @@ -39,5 +36,3 @@ along with this program. If not, see . #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - -#endif diff --git a/keyboards/pearl/keymaps/cijanzen/config.h b/keyboards/pearl/keymaps/cijanzen/config.h index b34fdad90a0aebfd81d2de7d7fab5ae4f046b51b..46e9b9f0af5142fb56b561ce7c7ef174659b5ba9 100644 --- a/keyboards/pearl/keymaps/cijanzen/config.h +++ b/keyboards/pearl/keymaps/cijanzen/config.h @@ -15,13 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #undef BACKLIGHT_LEVELS #define BACKLIGHT_LEVELS 3 - - -#endif diff --git a/layouts/community/60_ansi/talljoe-ansi/config.h b/layouts/community/60_ansi/talljoe-ansi/config.h index 79cc1900142bdbd999a20af2212419a8f52eb608..0c661f5689704746b44975047a8451aff27a9abe 100644 --- a/layouts/community/60_ansi/talljoe-ansi/config.h +++ b/layouts/community/60_ansi/talljoe-ansi/config.h @@ -16,8 +16,6 @@ #pragma once -#include QMK_KEYBOARD_CONFIG_H - #define ENABLE_GAME_LAYER #define TEMPLATE( \ diff --git a/layouts/community/60_hhkb/talljoe-hhkb/config.h b/layouts/community/60_hhkb/talljoe-hhkb/config.h index 0424fee1f31e017f637aa1118a8ee644f42e0cb3..4868890d45efd7b4d53f144910edd993f52d37e3 100644 --- a/layouts/community/60_hhkb/talljoe-hhkb/config.h +++ b/layouts/community/60_hhkb/talljoe-hhkb/config.h @@ -16,8 +16,6 @@ #pragma once -#include QMK_KEYBOARD_CONFIG_H - #define ENABLE_GAME_LAYER #define TEMPLATE( \ diff --git a/layouts/community/60_iso/unxmaal/config.h b/layouts/community/60_iso/unxmaal/config.h index 7a500b1bb56558bf0497565f25818ddba09b5f29..4a90186ee9bb5eaafae6808585f2f194b82d71c5 100644 --- a/layouts/community/60_iso/unxmaal/config.h +++ b/layouts/community/60_iso/unxmaal/config.h @@ -15,10 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef KEYMAP_CONFIG_H -#define KEYMAP_CONFIG_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #ifndef RGB_DI_PIN #define RGB_DI_PIN F4 @@ -28,5 +25,3 @@ along with this program. If not, see . #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #endif - -#endif diff --git a/layouts/community/ergodox/333fred/config.h b/layouts/community/ergodox/333fred/config.h index 0509ddbbb9be39832f991f30464339c413e74e20..00ed747817519405834ba074c56e2e8b671377ea 100644 --- a/layouts/community/ergodox/333fred/config.h +++ b/layouts/community/ergodox/333fred/config.h @@ -22,7 +22,5 @@ #pragma once -#include QMK_KEYBOARD_CONFIG_H - #undef TAPPING_TERM #define TAPPING_TERM 200 diff --git a/layouts/community/ergodox/adam/config.h b/layouts/community/ergodox/adam/config.h index 1a8fddb50685c2fe802a2847ed3dfa2b7863c948..62e82d8b2bf6137422f57e50e7b0455dd0ddb632 100644 --- a/layouts/community/ergodox/adam/config.h +++ b/layouts/community/ergodox/adam/config.h @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_CONFIG_H +#pragma once #undef TAPPING_TERM #define TAPPING_TERM 300 //At 500 some bad logic takes hold diff --git a/layouts/community/ergodox/albert/config.h b/layouts/community/ergodox/albert/config.h index 0c6231fbbf523e65cb460d63765f825cb4b72ea6..f0f524b3060fb01acd1dc70443042ceccefc5732 100644 --- a/layouts/community/ergodox/albert/config.h +++ b/layouts/community/ergodox/albert/config.h @@ -1,12 +1,7 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* using UK layout for space-cadet-shift */ #define LSPO_KEY KC_9 #define RSPC_KEY KC_0 #define LEADER_TIMEOUT 800 // leader key sequence timeout in millis - -#endif diff --git a/layouts/community/ergodox/algernon/config.h b/layouts/community/ergodox/algernon/config.h index 8c115e21a069f2fb9cd9ec39ce9fe77db2b66580..583c3911f18f1f9d2e9c676ae614d2a832cf68ac 100644 --- a/layouts/community/ergodox/algernon/config.h +++ b/layouts/community/ergodox/algernon/config.h @@ -1,7 +1,4 @@ -#ifndef CONFIG_ALGERNON_H -#define CONFIG_ALGERNON_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #undef MOUSEKEY_TIME_TO_MAX #undef MOUSEKEY_MAX_SPEED @@ -23,5 +20,3 @@ #undef LEADER_TIMEOUT #define LEADER_TIMEOUT 1000 - -#endif diff --git a/layouts/community/ergodox/berfarah/config.h b/layouts/community/ergodox/berfarah/config.h index 4acefdecc78084684edca6434f24522616c8bb20..0acb95b85f753561010c6a6ec2ee14cd0ddc0ad0 100644 --- a/layouts/community/ergodox/berfarah/config.h +++ b/layouts/community/ergodox/berfarah/config.h @@ -1,7 +1,4 @@ -#ifndef CONFIG_BERFARAH_H -#define CONFIG_BERFARAH_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #undef TAPPING_TERM #define TAPPING_TERM 150 @@ -10,4 +7,3 @@ #define RGBLIGHT_EFFECT_BREATHE_MAX 150 #undef IGNORE_MOD_TAP_INTERRUPT -#endif diff --git a/layouts/community/ergodox/issmirnov/config.h b/layouts/community/ergodox/issmirnov/config.h index fe62a7d1dff06a655d8ecc0faefdcace5602f7f7..32f7aeccc1d49cfe46f7f61459b1aee10252441d 100644 --- a/layouts/community/ergodox/issmirnov/config.h +++ b/layouts/community/ergodox/issmirnov/config.h @@ -1,3 +1,3 @@ // Reference: https://beta.docs.qmk.fm/reference/config-options // and https://github.com/qmk/qmk_firmware/blob/master/docs/config_options.md -#include QMK_KEYBOARD_CONFIG_H +#pragma once diff --git a/layouts/community/ergodox/jackhumbert/config.h b/layouts/community/ergodox/jackhumbert/config.h index 04bbed611a641a5c3d75d30e38666aae4175b27e..0aca0d691748618ec958c10219c37c212964790e 100644 --- a/layouts/community/ergodox/jackhumbert/config.h +++ b/layouts/community/ergodox/jackhumbert/config.h @@ -1,7 +1,4 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* ws2812 RGB LED */ #define RGB_DI_PIN D7 @@ -13,5 +10,3 @@ #define RGB_MIDI #define RGBW_BB_TWI - -#endif \ No newline at end of file diff --git a/layouts/community/ergodox/kejadlen/config.h b/layouts/community/ergodox/kejadlen/config.h index 9e076dead12a6ec1cbacce1feb49fc4869b89673..4e554e8a1a5a354a0ac53a317c83a12ee09e1f1d 100644 --- a/layouts/community/ergodox/kejadlen/config.h +++ b/layouts/community/ergodox/kejadlen/config.h @@ -1,11 +1,6 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #define FORCE_NKRO #undef TAPPING_TERM #undef IGNORE_MOD_TAP_INTERRUPT - -#endif diff --git a/layouts/community/ergodox/supercoder/config.h b/layouts/community/ergodox/supercoder/config.h index 8c191a87c51f26f51204d0ae99a1cacbc513eec3..0212a4bcf5cfd8bd49db9a60e2da2a085d8313bf 100644 --- a/layouts/community/ergodox/supercoder/config.h +++ b/layouts/community/ergodox/supercoder/config.h @@ -1,9 +1,4 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H 1 - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #undef LOCKING_SUPPORT_ENABLE #undef LOCKING_RESYNC_ENABLE - -#endif diff --git a/layouts/community/ergodox/townk_osx/config.h b/layouts/community/ergodox/townk_osx/config.h index 59b3188dfb6f5fc6514dbaca46a4f1c7da9ff1a9..c817dadf5024d40ae575adf172543b43fe4e790f 100644 --- a/layouts/community/ergodox/townk_osx/config.h +++ b/layouts/community/ergodox/townk_osx/config.h @@ -16,10 +16,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once -#include QMK_KEYBOARD_CONFIG_H /* * Feature disable options * These options are also useful to firmware size reduction. @@ -40,5 +38,3 @@ along with this program. If not, see . //#define DEBUG_MATRIX_SCAN_RATE #define ONESHOT_TAP_TOGGLE 2 #define ONESHOT_TIMEOUT 3000 - -#endif diff --git a/layouts/community/ergodox/videck/config.h b/layouts/community/ergodox/videck/config.h index b18b7fa9a9f65628bbc9b1d5dc12ff8b3f3f1b8b..e44dcd37c859228480d12dc1c733ca9003531660 100644 --- a/layouts/community/ergodox/videck/config.h +++ b/layouts/community/ergodox/videck/config.h @@ -1,7 +1,4 @@ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #ifndef NO_DEBUG #define NO_DEBUG @@ -9,5 +6,3 @@ #ifndef NO_PRINT #define NO_PRINT #endif - -#endif diff --git a/layouts/community/ergodox/win10_writers-block/config.h b/layouts/community/ergodox/win10_writers-block/config.h index b0b4a1ebb969370b48f1af916f930f40f6cce251..ca75f83aabeea7be6e81f012cde35ebf1bfbf472 100644 --- a/layouts/community/ergodox/win10_writers-block/config.h +++ b/layouts/community/ergodox/win10_writers-block/config.h @@ -1,7 +1,4 @@ -#ifndef KEYBOARDS_ERGODOX_CONFIG_H_ -#define KEYBOARDS_ERGODOX_CONFIG_H_ - -#include QMK_KEYBOARD_CONFIG_H +#pragma once #undef MOUSEKEY_DELAY #undef MOUSEKEY_INTERVAL @@ -31,5 +28,3 @@ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \ ) - -#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */ diff --git a/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h b/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h index 3c3d9b8858c3cc3402fb70001d808f3174456f32..33e93420395cde6d86ee482583da2cfb90d7aa1a 100644 --- a/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h +++ b/layouts/community/ortho_4x12/colemak_mod_dh_wide/config.h @@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* Use I2C or Serial, not both */ @@ -33,5 +30,3 @@ along with this program. If not, see . #define MASTER_LEFT // #define _MASTER_RIGHT // #define EE_HANDS - -#endif \ No newline at end of file diff --git a/layouts/community/ortho_4x12/crs/config.h b/layouts/community/ortho_4x12/crs/config.h index 3c3d9b8858c3cc3402fb70001d808f3174456f32..33e93420395cde6d86ee482583da2cfb90d7aa1a 100644 --- a/layouts/community/ortho_4x12/crs/config.h +++ b/layouts/community/ortho_4x12/crs/config.h @@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* Use I2C or Serial, not both */ @@ -33,5 +30,3 @@ along with this program. If not, see . #define MASTER_LEFT // #define _MASTER_RIGHT // #define EE_HANDS - -#endif \ No newline at end of file diff --git a/layouts/community/ortho_4x12/ergodoxish/config.h b/layouts/community/ortho_4x12/ergodoxish/config.h index 3c3d9b8858c3cc3402fb70001d808f3174456f32..33e93420395cde6d86ee482583da2cfb90d7aa1a 100644 --- a/layouts/community/ortho_4x12/ergodoxish/config.h +++ b/layouts/community/ortho_4x12/ergodoxish/config.h @@ -18,10 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include QMK_KEYBOARD_CONFIG_H +#pragma once /* Use I2C or Serial, not both */ @@ -33,5 +30,3 @@ along with this program. If not, see . #define MASTER_LEFT // #define _MASTER_RIGHT // #define EE_HANDS - -#endif \ No newline at end of file diff --git a/layouts/community/tkl_ansi/talljoe-tkl/config.h b/layouts/community/tkl_ansi/talljoe-tkl/config.h index 15869ed0b6350680de78546752bd14cd8f29d517..8433461044a2611c6646b191d55af0d98be46ed9 100644 --- a/layouts/community/tkl_ansi/talljoe-tkl/config.h +++ b/layouts/community/tkl_ansi/talljoe-tkl/config.h @@ -16,8 +16,6 @@ #pragma once -#include QMK_KEYBOARD_CONFIG_H - #define ENABLE_GAME_LAYER #define TEMPLATE_TKL(\