Merge remote-tracking branch 'origin/develop' into xap

2023-04-14 09:43:30 +00:00 · 2023-04-14 09:43:30 +00:00 · 5fc365d4aa
commit 5fc365d4aa
parent cd2fe7704d 54634e9263
45 changed files with 349 additions and 516 deletions
--- 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] = {

--- 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] = {

--- 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,
--- 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 <http://www.gnu.org/licenses/>.
 */
-#include "hid_liber.h"
+#include QMK_KEYBOARD_H

 // Helpful defines
 #define FN_CAPS LT(_FL, KC_CAPS)
--- 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 <http://www.gnu.org/licenses/>.
 */

-#include "contra.h"
+#include QMK_KEYBOARD_H
 #include "keymap_german.h"

 enum contra_layers {
--- 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;
--- 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 <http://www.gnu.org/licenses/>.
 // #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
--- 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 <http://www.gnu.org/licenses/>.
 #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
--- 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;

--- 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 <http://www.gnu.org/licenses/>.
 #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
--- a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
+++ b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c
@ -1,4 +1,4 @@
-#include "scrabblepad.h"
+#include QMK_KEYBOARD_H
 #include <stdlib.h>

 static uint16_t keystroke;
--- a/keyboards/ergodox_ez/keymaps/rmw/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rmw/keymap.c
@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include QMK_KEYBOARD_H
 #include "version.h"

 #define LONGPRESS_DELAY 180
--- a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
+++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
@ -3,7 +3,7 @@
 * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
 */

-#include "gergoplex.h"
+#include QMK_KEYBOARD_H
 #include "g/keymap_combo.h"

 enum {
--- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
+++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
@ -1,7 +1,7 @@
 // Copyright 2022 Takeshi Noda (nodatk@gmail.com)
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include "twig50.h"
+#include QMK_KEYBOARD_H

 #define LAL_NCV  LALT_T(KC_LNG2)
 #define RAL_CNV  RALT_T(KC_LNG1)
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes          # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SPLIT_KEYBOARD = yes        # Use shared split_common code
-SUBPROJECT_rev1 = yes

 SRC += matrix.c
 DEBOUNCE_TYPE = sym_eager_pk
--- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c
+++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c
@ -1,4 +1,4 @@
-#include "chocopad.h"
+#include QMK_KEYBOARD_H

 #define _BASE 0
 #define _FN1 1
--- a/keyboards/keebio/iris/keymaps/krusli/keymap.c
+++ b/keyboards/keebio/iris/keymaps/krusli/keymap.c
@ -1,6 +1,4 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H

 extern keymap_config_t keymap_config;

--- a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
+++ b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h
@ -18,7 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define TAPPING_TERM 150
 #define EE_HANDS
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@ -21,15 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H

-#include "../../config.h"
-
 /* Select hand configuration */

 // #define MASTER_LEFT
 // #define MASTER_RIGHT
 #define EE_HANDS

-#ifdef SUBPROJECT_rev2
+#ifdef KEYBOARD_lets_split_rev2
    /* RGB Underglow */
    #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/lets_split/keymaps/fabian/config.h
+++ b/keyboards/lets_split/keymaps/fabian/config.h
@ -19,14 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "../../rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-	#include "../../rev2fliphalf/config.h"
-#endif
--- a/Show more
+++ b/Show more