From 54634e92634f73a6d9111833adf58214cb4278c3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 14 Apr 2023 19:42:50 +1000 Subject: [PATCH] Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417) --- .../1up60rgb/keymaps/iso/keymap.c | 2 +- .../1up60rgb/keymaps/tsangan/keymap.c | 2 +- .../sweet16/keymaps/dlaroe/keymap.c | 2 +- .../hid_liber/keymaps/bakageta/keymap.c | 2 +- keyboards/contra/keymaps/maxr1998/keymap.c | 2 +- keyboards/contra/keymaps/ryanm101/keymap.c | 2 +- .../deltasplit75/keymaps/itsaferbie/config.h | 8 -- .../deltasplit75/keymaps/mbsurfer/config.h | 8 -- .../deltasplit75/keymaps/mbsurfer/keymap.c | 4 +- .../deltasplit75/keymaps/protosplit/config.h | 8 -- .../scrabblepad/keymaps/random/keymap.c | 2 +- keyboards/ergodox_ez/keymaps/rmw/keymap.c | 2 +- .../gergoplex/keymaps/colemak-dhm/keymap.c | 2 +- .../twig/twig50/keymaps/default/keymap.c | 2 +- keyboards/handwired/xealous/rules.mk | 1 - .../keebio/chocopad/keymaps/khord/keymap.c | 2 +- keyboards/keebio/iris/keymaps/krusli/keymap.c | 4 +- .../nyquist/keymaps/danielhklein/config.h | 4 - keyboards/lets_split/keymaps/adam/config.h | 4 +- keyboards/lets_split/keymaps/fabian/config.h | 11 -- .../keymaps/heartrobotninja/config.h | 10 -- keyboards/lets_split/keymaps/mjt/config.h | 11 -- keyboards/lets_split/keymaps/piemod/rules.mk | 1 - keyboards/lets_split/keymaps/zer09/keymap.c | 22 ++- keyboards/lets_split/keymaps/zer09/keymap.h | 32 ----- .../massdrop/alt/keymaps/pregame/keymap.c | 40 +++++- .../massdrop/alt/keymaps/pregame/keymap.h | 58 -------- .../massdrop/ctrl/keymaps/endgame/keymap.c | 96 ++++++++++++- .../massdrop/ctrl/keymaps/endgame/keymap.h | 99 -------------- .../ctrl/keymaps/matthewrobo/keymap.c | 67 ++++++++- .../ctrl/keymaps/matthewrobo/keymap.h | 86 ------------ .../massdrop/ctrl/keymaps/xanimos/keymap.c | 108 ++++++++++++++- .../massdrop/ctrl/keymaps/xanimos/keymap.h | 129 ------------------ keyboards/mehkee96/keymaps/johann/keymap.c | 2 +- keyboards/mt/mt980/keymaps/walker/keymap.c | 2 +- keyboards/orthodox/keymaps/oscillope/rules.mk | 1 - keyboards/planck/keymaps/ishtob/keymap.c | 7 - keyboards/planck/keymaps/mitch/rules.mk | 2 - keyboards/planck/keymaps/piemod/rules.mk | 2 - .../woodkeys/meira/keymaps/cole/keymap.c | 2 +- .../meira/keymaps/grahampheath/keymap.c | 4 +- .../woodkeys/meira/keymaps/takmiya/keymap.c | 3 +- keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c | 3 +- users/ishtob/ishtob.h | 2 +- users/zer09/zer09.h | 2 +- 45 files changed, 349 insertions(+), 516 deletions(-) delete mode 100644 keyboards/lets_split/keymaps/zer09/keymap.h delete mode 100644 keyboards/massdrop/alt/keymaps/pregame/keymap.h delete mode 100644 keyboards/massdrop/ctrl/keymaps/endgame/keymap.h delete mode 100644 keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.h delete mode 100644 keyboards/massdrop/ctrl/keymaps/xanimos/keymap.h diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c index b67de0b0c2..fd6087a238 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c @@ -1,4 +1,4 @@ -#include "1up60rgb.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c index c8b2f84b72..a45947de54 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c @@ -1,4 +1,4 @@ -#include "1up60rgb.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c index d3b6ef0378..5305d0ad05 100644 --- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c +++ b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c @@ -1,4 +1,4 @@ -#include "sweet16.h" +#include QMK_KEYBOARD_H enum layers { num, diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c index b86d578d33..414b7beb64 100755 --- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c +++ b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "hid_liber.h" +#include QMK_KEYBOARD_H // Helpful defines #define FN_CAPS LT(_FL, KC_CAPS) diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c index b169ce3238..8a56c60746 100644 --- a/keyboards/contra/keymaps/maxr1998/keymap.c +++ b/keyboards/contra/keymaps/maxr1998/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "contra.h" +#include QMK_KEYBOARD_H #include "keymap_german.h" enum contra_layers { diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c index ff33043632..76cbdc7ff8 100644 --- a/keyboards/contra/keymaps/ryanm101/keymap.c +++ b/keyboards/contra/keymaps/ryanm101/keymap.c @@ -1,4 +1,4 @@ -#include "contra.h" +#include QMK_KEYBOARD_H #include "action_layer.h" extern keymap_config_t keymap_config; diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/config.h b/keyboards/deltasplit75/keymaps/itsaferbie/config.h index 288b1acb8b..32605799a8 100644 --- a/keyboards/deltasplit75/keymaps/itsaferbie/config.h +++ b/keyboards/deltasplit75/keymaps/itsaferbie/config.h @@ -20,14 +20,6 @@ along with this program. If not, see . // #define MASTER_RIGHT // #define EE_HANDS - -#ifdef SUBPROJECT_v2 - #include "../../v2/config.h" -#endif -#ifdef SUBPROJECT_protosplit - #include "../../protosplit/config.h" -#endif - #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/config.h b/keyboards/deltasplit75/keymaps/mbsurfer/config.h index 2a2e4ece9f..3e79f43ed0 100644 --- a/keyboards/deltasplit75/keymaps/mbsurfer/config.h +++ b/keyboards/deltasplit75/keymaps/mbsurfer/config.h @@ -19,11 +19,3 @@ along with this program. If not, see . #define MASTER_LEFT // #define MASTER_RIGHT // #define EE_HANDS - - -#ifdef SUBPROJECT_v2 - #include "../../v2/config.h" -#endif -#ifdef SUBPROJECT_protosplit - #include "../../protosplit/config.h" -#endif diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c index 345e4168cf..e5c9ecc582 100644 --- a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c +++ b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c @@ -1,6 +1,4 @@ -#include "deltasplit75.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; diff --git a/keyboards/deltasplit75/keymaps/protosplit/config.h b/keyboards/deltasplit75/keymaps/protosplit/config.h index 2a2e4ece9f..3e79f43ed0 100644 --- a/keyboards/deltasplit75/keymaps/protosplit/config.h +++ b/keyboards/deltasplit75/keymaps/protosplit/config.h @@ -19,11 +19,3 @@ along with this program. If not, see