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

data/mappings/keyboard_aliases.hjson

@@ -330,7 +330,34 @@
         "target": "keycapsss/plaid_pad/rev1"
     },
     "kudox": {
-        "target": "kudox/rev1"
+        "target": "kumaokobo/kudox/rev1"
+    },
+    "kudox/columner": {
+        "target": "kumaokobo/kudox/columner"
+    },
+    "kudox/rev1": {
+        "target": "kumaokobo/kudox/rev1"
+    },
+    "kudox/rev2": {
+        "target": "kumaokobo/kudox/rev2"
+    },
+    "kudox/rev3": {
+        "target": "kumaokobo/kudox/rev3"
+    },
+    "kudox_full": {
+        "target": "kumaokobo/kudox_full/rev1"
+    },
+    "kudox_full/rev1": {
+        "target": "kumaokobo/kudox_full/rev1"
+    },
+    "kudox_game": {
+        "target": "kumaokobo/kudox_game/rev1"
+    },
+    "kudox_game/rev1": {
+        "target": "kumaokobo/kudox_game/rev1"
+    },
+    "kudox_game/rev2": {
+        "target": "kumaokobo/kudox_game/rev2"
     },
     "kyria": {
         "target": "splitkb/kyria"
@@ -452,6 +479,15 @@
     "minim": {
         "target": "matthewdias/minim"
     },
+    "mnk1800s": {
+        "target": "monokei/mnk1800s"
+    },
+    "mnk50": {
+        "target": "monokei/mnk50"
+    },
+    "mnk75": {
+        "target": "monokei/mnk75"
+    },
     "model01": {
         "target": "keyboardio/model01"
     },
@@ -494,6 +530,15 @@
     "peiorisboards/ixora": {
         "target": "coarse/ixora"
     },
+    "pico": {
+        "target": "kumaokobo/pico/65keys"
+    },
+    "pico/65keys": {
+        "target": "kumaokobo/pico/65keys"
+    },
+    "pico/70keys": {
+        "target": "kumaokobo/pico/70keys"
+    },
     "plaid": {
         "target": "dm9records/plaid"
     },
@@ -807,6 +852,12 @@
     "eggman": {
         "target": "qpockets/eggman"
     },
+    "enter67": {
+        "target": "kezewa/enter67"
+    },
+    "enter80": {
+        "target": "kezewa/enter80"
+    },
     "ergo42": {
         "target": "biacco42/ergo42"
     },
@@ -924,6 +975,12 @@
     "keychron/q4": {
         "target": "keychron/q4/ansi/v1"
     }
+    "kmac": {
+        "target": "kbdmania/kmac"
+    }
+    "kmac_pad": {
+        "target": "kbdmania/kmac_pad"
+    }
     "kprepublic/bm40hsrgb": {
         "target": "kprepublic/bm40hsrgb/rev1"
     },
@@ -1017,6 +1074,9 @@
     "melody96": {
         "target": "ymdk/melody96"
     },
+    "miniaxe": {
+        "target": "kagizaraya/miniaxe"
+    },
     "minidox/rev1": {
         "target": "maple_computing/minidox/rev1"
     },

keyboards/miniaxe/readme.md → keyboards/kagizaraya/miniaxe/readme.md

@@ -11,6 +11,6 @@ Hardware Availability: [@ka2hiro](https://twitter.com/ka2hiro)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make miniaxe:default:dfu
+    make kagizaraya/miniaxe: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/kmac/readme.md → keyboards/kbdmania/kmac/readme.md

@@ -4,11 +4,11 @@ A Korean custom keyboard designed by Byungho Kim and the KBDMania community.
 
 Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul)  
 Hardware Supported: KMAC & KMAC 2  
-Hardware Availability: http://www.kbdmania.net/xe/news/5232321
+Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kmac:default
+    make kbdmania/kmac: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/kmac_pad/readme.md → keyboards/kbdmania/kmac_pad/readme.md

@@ -7,15 +7,15 @@ It can be used independently, but can also be used by connecting with KMAC keybo
 
 * Keyboard Maintainer: [talsu](https://github.com/talsu)
 * Hardware Supported: KMAC PAD
-* Hardware Availability: http://www.kbdmania.net/xe/news/5232321
+* Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kmac_pad:default
+    make kbdmania/kmac_pad:default
     
 Flashing example for this keyboard:
 
-    make kmac_pad:default:flash
+    make kbdmania/kmac_pad:default:flash
 
 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/enter67/readme.md → keyboards/kezewa/enter67/readme.md

@@ -6,14 +6,15 @@
 
 * Keyboard Maintainer: https://github.com/LXF-YZP
 * Hardware Supported: enter67 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
 
 Make example for this keyboard (after setting up your build environment):
     
-    make enter67:default
+    make kezewa/enter67:default
     
 Flashing example for this keyboard:
 
-    make enter67:default:flash
+    make kezewa/enter67:default:flash
     
 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).
 
@@ -23,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/enter80/readme.md → keyboards/kezewa/enter80/readme.md

@@ -6,6 +6,7 @@
 
 * Keyboard Maintainer: https://github.com/LXF-YZP
 * Hardware Supported: enter80 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
 
 Make example for this keyboard (after setting up your build environment):
     

keyboards/kudox/columner/keymaps/default/keymap.c → keyboards/kumaokobo/kudox/columner/keymaps/default/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.

keyboards/kudox/columner/keymaps/via/keymap.c → keyboards/kumaokobo/kudox/columner/keymaps/via/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.

keyboards/kudox/columner/readme.md → keyboards/kumaokobo/kudox/columner/readme.md

@@ -14,14 +14,14 @@
 Make example for this keyboard (after setting up your build environment):
 
 ```sh
-make kudox/columner:default
+make kumaokobo/kudox/columner:default
 ```
 
 
 Example of flashing this keyboard:
 
 ```sh
-make kudox/columner:default:flash
+make kumaokobo/kudox/columner:default:flash
 ```
 
 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/kudox/readme.md → keyboards/kumaokobo/kudox/readme.md

@@ -14,14 +14,14 @@
 Make example for this keyboard (after setting up your build environment):
 
 ```sh
-make kudox/rev3:default
+make kumaokobo/kudox/rev3:default
 ```
 
 
 Example of flashing this keyboard:
 
 ```sh
-make kudox/rev3:default:flash
+make kumaokobo/kudox/rev3:default:flash
 ```
 
 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/kudox/rev1/keymaps/default/keymap.c → keyboards/kumaokobo/kudox/rev1/keymaps/default/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.

keyboards/kudox/rev1/keymaps/jis/keymap.c → keyboards/kumaokobo/kudox/rev1/keymaps/jis/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 

keyboards/kudox/rev1/keymaps/x1/keymap.c → keyboards/kumaokobo/kudox/rev1/keymaps/x1/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.

keyboards/kudox/rev2/keymaps/default/keymap.c → keyboards/kumaokobo/kudox/rev2/keymaps/default/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.

keyboards/kudox/rev2/keymaps/jis/keymap.c → keyboards/kumaokobo/kudox/rev2/keymaps/jis/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 

keyboards/kudox/rev3/keymaps/default/keymap.c → keyboards/kumaokobo/kudox/rev3/keymaps/default/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.

keyboards/kudox/rev3/keymaps/jis/keymap.c → keyboards/kumaokobo/kudox/rev3/keymaps/jis/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 

keyboards/kudox/rev3/keymaps/via/keymap.c → keyboards/kumaokobo/kudox/rev3/keymaps/via/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.

keyboards/kudox_full/readme.md → keyboards/kumaokobo/kudox_full/readme.md

@@ -22,11 +22,11 @@ Enter the bootloader in 3 ways:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kudox_full/rev1:default
+    make kumaokobo/kudox_full/rev1:default
 
 
 Flashing example for this keyboard:
 
-    make kudox_full/rev1:default:flash
+    make kumaokobo/kudox_full/rev1:default:flash
 
 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/kudox_game/keymaps/default/keymap.c → keyboards/kumaokobo/kudox_game/keymaps/default/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.

keyboards/kudox_game/keymaps/via/keymap.c → keyboards/kumaokobo/kudox_game/keymaps/via/keymap.c

@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.