diff options
27 files changed, 22 insertions, 125 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index 79fe336b48..28ba97bbc8 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 759b1d9a00..4a64e977c9 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 <http://www.gnu.org/licenses/>. */ -#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 b8f5e8c948..a8ad1e4fe7 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 701c2cf353..c3c4a1b697 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 917c6a98ba..13023939eb 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. #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 3303794471..56cacd843e 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. #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 bfca915f24..95625ea670 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. #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 b34fdad90a..46e9b9f0af 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 <http://www.gnu.org/licenses/>. */ -#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 79cc190014..0c661f5689 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 0424fee1f3..4868890d45 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 7a500b1bb5..4a90186ee9 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. #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 0509ddbbb9..00ed747817 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 1a8fddb506..62e82d8b2b 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 0c6231fbbf..f0f524b306 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 8c115e21a0..583c3911f1 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 4acefdecc7..0acb95b85f 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 fe62a7d1df..32f7aeccc1 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 04bbed611a..0aca0d6917 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 9e076dead1..4e554e8a1a 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 8c191a87c5..0212a4bcf5 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 59b3188dfb..c817dadf50 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. //#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 b18b7fa9a9..e44dcd37c8 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 b0b4a1ebb9..ca75f83aab 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 3c3d9b8858..33e9342039 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. #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 3c3d9b8858..33e9342039 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. #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 3c3d9b8858..33e9342039 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 <http://www.gnu.org/licenses/>. */ -#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 <http://www.gnu.org/licenses/>. #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 15869ed0b6..8433461044 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(\ |