[Keyboard] Move Keebio boards to own folder (#5109)

* Move boards into keebio folder

* Rename keymap

* Update BDN9 files

* Update BFO-9000 files

* Update Chocopad files

* Update Dilly files

* Update Fourier files, collapse rev1 into main

* Update Iris files

* Update Laplace files

* Update Levinson files, fix buswerks keymap

* Update Nyquist files

* Fix keymap issues

* Update Quefrency files

* Update Rorschach files

* Update TF68 files

* Update Viterbi files

* Update Viterbi files

* Update Wavelet files

* Reformat default layout

* Fix up default folder for Iris

* Remove already defined aliases

keyboards/dilly/keymaps/default/config.h

@@ -1,6 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#endif

keyboards/fourier/rev1/rev1.c

@@ -1,5 +0,0 @@
-#include "fourier.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};

keyboards/fourier/rev1/rev1.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "fourier.h"
-#include "quantum.h"
-
-#define LAYOUT( \
-	LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
-	LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
-	LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
-	LD1, LD2, LD3, LD4, LD5,      RD1,           RD4, RD5, RD6, RD7 \
-	) \
-	{ \
-		{ LA1, LA2, LA3, LA4, LA5, LA6, KC_NO}, \
-		{ LB1, LB2, LB3, LB4, LB5, LB6, KC_NO}, \
-		{ LC1, LC2, LC3, LC4, LC5, LC6, KC_NO}, \
-		{ LD1, LD2, LD3, LD4, LD5, KC_NO, KC_NO}, \
-		{ RA1, RA2, RA3, RA4, RA5, RA6, RA7}, \
-		{ RB1, RB2, RB3, RB4, RB5, KC_NO, RB7}, \
-		{ RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \
-		{ RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \
-	}

keyboards/keebio/bdn9/config.h

@@ -32,7 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 9
 
 /* Keyboard Matrix Assignments */
-#define NO_PIN (~0)
 #define MATRIX_ROW_PINS { NO_PIN }
 #define MATRIX_COL_PINS { D2, D4, F4, D7, B1, B3, E6, B4, B2 }
 

keyboards/keebio/bdn9/readme.md

@@ -10,6 +10,6 @@ Hardware Availability: [Keebio - BDN9](https://keeb.io/products/bdn9-3x3-9-key-m
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bdn9:default
+    make keebio/bdn9:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/keebio/bfo9000/config.h

@@ -16,13 +16,12 @@ 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
+#pragma once
-#define CONFIG_H
 
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1169
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    Keebio
@@ -48,7 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B4
-
 #define RGBLED_NUM 20    // Number of LEDs
 
 /*
@@ -68,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-#endif

keyboards/keebio/bfo9000/keymaps/andylikescandy6x18/keymap.c

@@ -9,11 +9,6 @@
 #define _RAISE 2
 #define _NAVIGATION 3
 
-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 //Switch Layouts
 #define SWBASE M(_BASE)
 #define SWQWERTY M(_QWERTY)

keyboards/keebio/bfo9000/keymaps/default/config.h

@@ -18,20 +18,10 @@ 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
+#pragma once
-#define CONFIG_USER_H
 
-#include "config_common.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 // #define USE_I2C
 
 /* Select hand configuration */
-
-#define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-
-#endif

keyboards/keebio/bfo9000/keymaps/default/keymap.c

@@ -2,10 +2,6 @@
 
 #define _BASE 0
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [_BASE] = LAYOUT( \

keyboards/keebio/bfo9000/readme.md

@@ -9,10 +9,10 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bfo9000:default
+    make keebio/bfo9000:default
 
 Example of flashing this keyboard:
 
-    make bfo9000:default:avrdude
+    make keebio/bfo9000:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.

keyboards/keebio/chocopad/README.md

@@ -9,6 +9,6 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chocopad:default
+    make keebio/chocopad:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.

keyboards/keebio/chocopad/chocopad.h

@@ -1,5 +1,4 @@
-#ifndef CHOCOPAD_H
+#pragma once
-#define CHOCOPAD_H
 
 #include "quantum.h"
 
@@ -28,5 +27,3 @@
         KC_##C1, KC_##C2, KC_##C3, KC_##C4, \
         KC_##D1, KC_##D2, KC_##D3, KC_##D4 \
     )
-
-#endif

keyboards/keebio/chocopad/config.h

@@ -4,7 +4,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1144
 #define DEVICE_VER      0x0100
 #define MANUFACTURER    Keebio
@@ -42,7 +42,6 @@
 #define RGBLIGHT_VAL_STEP 8
 #endif
 #define RGB_DI_PIN D3
-
 #define RGBLED_NUM 4
 
 #endif

keyboards/keebio/chocopad/keymaps/default/keymap.c

@@ -4,8 +4,6 @@
 #define _FN1 1
 #define _FN2 2
 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_BASE] = LAYOUT_ortho_4x4(

keyboards/keebio/chocopad/keymaps/khord/keymap.c

@@ -35,7 +35,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_BASE] = KC_KEYMAP(
+  [_BASE] = LAYOUT_kc(
   //,----+----+----+----.
       P7 , P8 , P9 ,BSPC,
   //|----+----+----+----|
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----'
   ),
 
-  [_FN1] = KC_KEYMAP(
+  [_FN1] = LAYOUT_kc(
   //,----+----+----+----.
      ESC ,MAC1,MAC2,DEL ,
   //|----+----+----+----|
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----'
   ),
 
-  [_FN2] = KC_KEYMAP(
+  [_FN2] = LAYOUT_kc(
   //,----+----+----+----.
      RST , XX , XX , XX ,
   //|----+----+----+----|

keyboards/keebio/dilly/README.md

@@ -9,6 +9,6 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dilly:default
+    make keebio/dilly:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.

keyboards/keebio/dilly/keymaps/bakingpy/config.h

@@ -0,0 +1,3 @@
+#pragma once
+
+#define TAPPING_TERM 150

keyboards/keebio/dilly/keymaps/bakingpy/keymap.c

@@ -0,0 +1,106 @@
+#include QMK_KEYBOARD_H
+
+extern keymap_config_t keymap_config;
+
+#define _BASE 0
+#define _FN1 1
+#define _FN2 2
+#define _FN3 3
+#define _FN4 4
+#define _FN5 5
+
+#define KC_ KC_TRNS
+
+// Tap-Hold keys
+#define KC_ASFT MT(MOD_LSFT, KC_A)
+#define KC_F_L3 LT(_FN3, KC_F)
+#define KC_ZCTL MT(MOD_LCTL, KC_Z)
+#define KC_XALT MT(MOD_LALT, KC_X)
+#define KC_CGUI MT(MOD_LGUI, KC_C)
+#define KC_V_L4 LT(_FN4, KC_V)
+#define KC_SPL2 LT(_FN2, KC_SPC)
+#define KC_B_L1 LT(_FN1, KC_B)
+#define KC_N_L5 LT(_FN5, KC_N)
+#define KC_MALT MT(MOD_RALT, KC_M)
+#define KC_BSCT MT(MOD_RCTL, KC_BSPC)
+#define KC_ENTS MT(MOD_RSFT, KC_ENT)
+#define KC_ESCS MT(MOD_RSFT, KC_ESC)
+#define KC_SCNS MT(MOD_RSFT, KC_SCLN)
+
+#define KC_GUIC LGUI(KC_C)
+
+#define KC_RST RESET
+#define KC_BL_S BL_STEP
+#define KC_DBUG DEBUG
+#define KC_RTOG RGB_TOG
+#define KC_RMOD RGB_MOD
+#define KC_RHUI RGB_HUI
+#define KC_RHUD RGB_HUD
+#define KC_RSAI RGB_SAI
+#define KC_RSAD RGB_SAD
+#define KC_RVAI RGB_VAI
+#define KC_RVAD RGB_VAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+      Q  , W  , E  , R  , T  , Y  , U  , I  , O  , P  ,
+  //|----+----+----+----+----+----+----+----+----+----|
+     ASFT, S  , D  ,F_L3, G  , H  , J  , K  , L  ,ESCS,
+  //|----+----+----+----+----+----+----+----+----+----|
+     ZCTL,XALT,CGUI,V_L4,SPL2,B_L1,N_L5,MALT,BSCT,ENTS
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN1] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+     EXLM, AT ,HASH,DLR ,PERC,CIRC,AMPR,ASTR,LPRN,RPRN,
+  //|----+----+----+----+----+----+----+----+----+----|
+      F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,    ,    ,BSPC,    ,    ,    ,    ,
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN2] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+      1  , 2  , 3  , 4  , 5  , 6  , 7  , 8  , 9  , 0  ,
+  //|----+----+----+----+----+----+----+----+----+----|
+     F11 ,F12 ,    ,    ,    ,LEFT,DOWN, UP ,RGHT,GRV ,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,    ,    ,    ,DEL ,    ,    ,    ,
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN3] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+         ,    ,    ,    ,    ,MINS,EQL ,LBRC,RBRC,BSLS,
+  //|----+----+----+----+----+----+----+----+----+----|
+     TAB ,    ,    ,    ,    ,COMM,DOT ,SLSH,SCLN,QUOT,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,    ,    ,BSPC,    ,LEFT,DOWN, UP ,RGHT
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN4] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+         ,    ,    ,    ,    ,UNDS,PLUS,LCBR,RCBR,PIPE,
+  //|----+----+----+----+----+----+----+----+----+----|
+     TAB ,    ,    ,    ,    , LT , GT ,QUES,COLN,DQUO,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,GUIC,    ,BSPC,    ,HOME,PGDN,PGUP,END
+  //`----+----+----+----+----+----+----+----+----+----'
+  ),
+
+  [_FN5] = LAYOUT_kc(
+  //,----+----+----+----+----+----+----+----+----+----.
+     RTOG,RMOD,    ,RST ,RHUI,RSAI,RVAI,    ,    ,    ,
+  //|----+----+----+----+----+----+----+----+----+----|
+         ,    ,DBUG,    ,RHUD,RSAD,RVAD,    ,    ,    ,
+  //|----+----+----+----+----+----+----+----+----+----|
+     BL_S,    ,GUIC,    ,    ,    ,    ,    ,    ,
+  //`----+----+----+----+----+----+----+----+----+----'
+  )
+
+};

keyboards/keebio/dilly/keymaps/default/config.h

@@ -0,0 +1 @@
+#pragma once

keyboards/keebio/dilly/keymaps/default/keymap.c

@@ -9,8 +9,6 @@ extern keymap_config_t keymap_config;
 #define _FN4 4
 #define _FN5 5
 
-#define _______ KC_TRNS
-
 // Tap-Hold keys
 #define KC_ASFT MT(MOD_LSFT, KC_A)
 #define KC_F_L3 LT(_FN3, KC_F)

keyboards/keebio/dilly/keymaps/delmo/keymap.c

@@ -10,7 +10,6 @@ extern keymap_config_t keymap_config;
 #define _FN5 5
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 // Tap-Hold keys
 //#define KC_ASFT MT(MOD_LSFT, KC_A)
@@ -103,4 +102,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //`----+----+----+----+----+----+----+----+----+----'
   )
 
-};
+};

keyboards/keebio/dilly/keymaps/pletcher/keymap.c

@@ -10,7 +10,6 @@ extern keymap_config_t keymap_config;
 #define _FN5 5
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 // Tap-Hold keys
 #define KC_F_L3 LT(_FN3, KC_F)

keyboards/keebio/fourier/config.h

@@ -18,6 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "config_common.h"
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xCB10
 #define PRODUCT_ID      0x1247

keyboards/keebio/fourier/fourier.h

@@ -6,6 +6,23 @@
 
 #include "quantum.h"
 
+#define LAYOUT( \
+    LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \
+    LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5,      RB7, \
+    LC1, LC2, LC3, LC4, LC5, LC6, RC1,      RC3, RC4, RC5, RC6, RC7, \
+    LD1, LD2, LD3, LD4, LD5,      RD1,           RD4, RD5, RD6, RD7 \
+    ) \
+    { \
+        { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO}, \
+        { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO}, \
+        { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO}, \
+        { LD1, LD2, LD3, LD4, LD5, KC_NO, KC_NO}, \
+        { RA1, RA2, RA3, RA4, RA5, RA6, RA7}, \
+        { RB1, RB2, RB3, RB4, RB5, KC_NO, RB7}, \
+        { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \
+        { RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \
+    }
+
 // Used to create a keymap using only KC_ prefixed keys
 #define LAYOUT_kc( \
     LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \

keyboards/keebio/fourier/keymaps/default/config.h

@@ -21,5 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* Use I2C or Serial, not both */
-#define USE_SERIAL
 // #define USE_I2C

keyboards/keebio/fourier/keymaps/default/keymap.c

@@ -14,15 +14,15 @@ enum custom_keycodes {
 
 #define KC_FN1 MO(_FN1)
 #define KC_FN2 MO(_FN2)
-#define KC_SPFN1 LT(_FN1, KC_SPACE)
+#define SPFN1 LT(_FN1, KC_SPACE)
-#define KC_BSFN2 LT(_FN2, KC_BSPC)
+#define BSFN2 LT(_FN2, KC_BSPC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
     KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  KC_BSPC,
     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,          KC_ENT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,             KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI, KC_FN1,  KC_SPFN1,         KC_BSFN2,                  KC_RGUI, KC_RALT, KC_FN2,  KC_RCTL
+    KC_LCTL, KC_LALT, KC_LGUI, KC_FN1,  SPFN1,            BSFN2,                     KC_RGUI, KC_RALT, KC_FN2,  KC_RCTL
   ),
 
   [_FN1] = LAYOUT(

keyboards/keebio/fourier/keymaps/jennetters/keymap.c

@@ -15,8 +15,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 MO(_FN1)
 #define KC_FN2 MO(_FN2)
 #define KC_SPFN1 LT(_FN1, KC_SPACE)
@@ -53,7 +51,7 @@ enum {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT( 
+[_BASE] = LAYOUT(
  // ,----+----+----+----+----+----|----+----+----+----+----+----+----.
  // |ESC | Q1 | W2 | E3 | R4 | T5 | Y6 | U7 | I8 | O9 | P0 | -[ | =] |
  // |----`----`----`----`----`----|----`----`----`----`----`----`----|
@@ -63,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // |-------`----`----`----`----`----|----`----`----`----`----`------|
  // | CTL | SYS| ALT | SP    SPACE | SPACE  | FN1 | CTL  | \  | ENT  |
  // `-----+----+-----+----+--------|--------+-----+------+----+------'
- 
+
   TD(ESC_GR), TD(Q_1), TD(W_2), TD(E_3), TD(R_4), TD(T_5), TD(Y_6), TD(U_7), TD(I_8), TD(O_9), TD(P_0),TD(MIN_LB),TD(EQL_RB), \
   KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCL_QUO), KC_BSPC, \
   KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, \
@@ -80,11 +78,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  // |-------`----`----`----`----`----|----`----`----`----`----`------|
  // |     |    |     |    |        |        |     |      |    |      |
  // `-----+----+-----+----+--------|--------+-----+------+----+------'
- 
+
    , , UP, , , , , , , , , , , \
    , LEFT, DOWN, RIGHT, , , , , , , QUOT, DEL, \
    , , , , , , , , , , NUBS, , \
-   , , , , , , , , , 
+   , , , , , , , , ,
   ),
 
   [_FN2] = LAYOUT_kc(
@@ -101,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    , , , , , , , , , , , , , \
    , , , , , , , , , , , , \
    , , , , , , , , , , , , \
-   , , , , , , , , ,   
+   , , , , , , , , ,
   )
 
 };
@@ -145,4 +143,4 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 [EQL_RB]  = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_RBRC), //Tap once for =, twice for ]/}
 [SCL_QUO] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_QUOT) //Tap once for ;, '/"
 // Other declarations would go here, separated by commas, if you have them
-};
+};

keyboards/keebio/fourier/keymaps/valgrahf/keymap.c

@@ -15,8 +15,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 LT(_FN1, KC_NO)
 #define KC_FN2 LT(_FN2, KC_NO)
 #define KC_SPFN LT(_FN1, KC_SPACE)

keyboards/keebio/fourier/keymaps/xyverz/keymap.c

@@ -17,8 +17,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_FN1 MO(_FN1)
 #define KC_FN2 MO(_FN2)
 #define KC_ESFN1 LT(_FN1, KC_ESC)
@@ -46,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----|----`----`----`----`----`--------|
     LSFT   ,SCLN, Q  , J  , K  , X  , B  , M  , W  , V  , Z  , RSFT ,
  //|-------`----`----`----`----`----|----`----`----`----`----`------|
-    LCTL ,LALT,LGUI ,FN2 ,  BSPC  ,   SPC  , FN1 ,RGUI ,RALT , RCTL 
+    LCTL ,LALT,LGUI ,FN2 ,  BSPC  ,   SPC  , FN1 ,RGUI ,RALT , RCTL
  //`-----+----+-----+----+--------|--------+-----+-----+-----+------'
   ),
 
@@ -58,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----|----`----`----`----`----`--------|
     RMOD   ,RHUD,RSAD,RVAD,VOLD,LCBR,RCBR,    ,    ,    , UP ,      ,
  //|-------`----`----`----`----`----|----`----`----`----`----`------|
-    RTOG ,    ,     ,    ,   DEL  ,  INS   ,     ,LEFT ,DOWN , RGHT 
+    RTOG ,    ,     ,    ,   DEL  ,  INS   ,     ,LEFT ,DOWN , RGHT
  //`-----+----+-----+----+--------|--------+-----+-----+-----+------'
   ),
 
@@ -70,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|-----`----`----`----`----`----|----`----`----`----`----`--------|
            ,    ,    ,DEL ,PGDN,END , F7 , F8 , F9 ,F10 ,F11 , F12  ,
  //|-------`----`----`----`----`----|----`----`----`----`----`------|
-         ,    ,     ,    ,  DEL   ,  INS   ,     ,     ,     ,      
+         ,    ,     ,    ,  DEL   ,  INS   ,     ,     ,     ,
  //`-----+----+-----+----+--------|--------+-----+-----+-----+------'
   )
 

keyboards/keebio/fourier/readme.md

@@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io/collections/frontpage/products/f
 
 Make example for this keyboard (after setting up your build environment):
 
-    make fourier/rev1:default
+    make keebio/fourier:default
 
 Example of flashing this keyboard:
 
-    make fourier/rev1:default:avrdude
+    make keebio/fourier:default:avrdude
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 

keyboards/keebio/fourier/rules.mk

@@ -58,11 +58,8 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
-SUBPROJECT_rev1 = yes
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = fourier/rev1

keyboards/keebio/iris/iris.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#ifdef KEYBOARD_iris_rev1
+#ifdef KEYBOARD_keebio_iris_rev1
     #include "rev1.h"
-#elif KEYBOARD_iris_rev1_led
+#elif KEYBOARD_keebio_iris_rev1_led
     #include "rev1_led.h"
-#elif KEYBOARD_iris_rev2
+#elif KEYBOARD_keebio_iris_rev2
     #include "rev2.h"
 #else
     #include "rev3.h"

keyboards/keebio/iris/keymaps/broswen/keymap.c

@@ -16,7 +16,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE
@@ -51,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
          , GRV,BSLS,UNDS, EQL,    ,    ,         ,    ,    ,    ,    ,    ,    ,
   //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                           ,    ,    ,             ,    , 
+                           ,    ,    ,             ,    ,
   //                  `----+----+----'        `----+----+----'
   ),
 

keyboards/keebio/iris/keymaps/dbroqua/keymap.c

@@ -14,7 +14,6 @@ enum custom_keycodes {
 };
 
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 
 #define KC_LOWR LOWER
 #define KC_RASE RAISE