diff --git a/keyboards/mkbd65/README.md b/keyboards/mkbd65/README.md
index f30b7c91ea..817bde28b3 100644
--- a/keyboards/mkbd65/README.md
+++ b/keyboards/mkbd65/README.md
@@ -11,16 +11,31 @@ A mobile keyboard addon for modern smartphones.
Flashing this keyboard with `en-us-intl` layout (after setting up your build environment):
```
-qmk flash -kb mkbd65 -km en-us-intl
+qmk flash -kb mkbd65:rev1 -km en-us-intl
```
Available layouts:
- en-us-intl (ansi)
- - de-de (iso)
+ - de (iso)
You can find community provided layouts here: https://gitlab.com/mkbd65/community
+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).
+
---
-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).
+Copyright 2023 XenGi mkbd65@xengi.de @XenGi
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
diff --git a/keyboards/mkbd65/config.h b/keyboards/mkbd65/config.h
index 8eff7c175d..4ac3a7eaf5 100644
--- a/keyboards/mkbd65/config.h
+++ b/keyboards/mkbd65/config.h
@@ -1,160 +1,13 @@
-/*
-Copyright 2022 XenGi
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-*/
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x1209
-#define PRODUCT_ID 0x4803
-#define DEVICE_VER 0x0002
-#define MANUFACTURER XenGi
-#define PRODUCT mkbd65 rev1
-#define DESCRIPTION Custom keyboard addon for smartphones
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
-*/
-#define MATRIX_COL_PINS { D4, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
-#define MATRIX_ROW_PINS { D5, D3, D2, D1, D0 }
-#define UNUSED_PINS { B3, B2, B1, B0, E6 }
-
-/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
-#define DIODE_DIRECTION ROW2COL
-
-/* (back)light configuration */
-#define BACKLIGHT_PIN B7
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 3
-#define BACKLIGHT_ON_STATE 1
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-// #define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-// #define LOCKING_RESYNC_ENABLE
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* key combination for magic key command */
-#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1 H
-//#define MAGIC_KEY_HELP2 SLASH
-//#define MAGIC_KEY_DEBUG D
-//#define MAGIC_KEY_DEBUG_MATRIX X
-//#define MAGIC_KEY_DEBUG_KBD K
-//#define MAGIC_KEY_DEBUG_MOUSE M
-//#define MAGIC_KEY_VERSION V
-//#define MAGIC_KEY_STATUS S
-//#define MAGIC_KEY_CONSOLE C
-//#define MAGIC_KEY_LAYER0_ALT1 ESC
-//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
-//#define MAGIC_KEY_LAYER0 0
-//#define MAGIC_KEY_LAYER1 1
-//#define MAGIC_KEY_LAYER2 2
-//#define MAGIC_KEY_LAYER3 3
-//#define MAGIC_KEY_LAYER4 4
-//#define MAGIC_KEY_LAYER5 5
-//#define MAGIC_KEY_LAYER6 6
-//#define MAGIC_KEY_LAYER7 7
-//#define MAGIC_KEY_LAYER8 8
-//#define MAGIC_KEY_LAYER9 9
-//#define MAGIC_KEY_BOOTLOADER PAUSE
-//#define MAGIC_KEY_LOCK CAPS
-//#define MAGIC_KEY_EEPROM E
-//#define MAGIC_KEY_NKRO N
-//#define MAGIC_KEY_SLEEP_LED Z
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
+// disable debugging
//#define NO_DEBUG
-
-/* disable print */
+// disable printing/debugging using hid_listen
//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
+// disable tap dance and other tapping features
//#define NO_ACTION_TAPPING
+// disable one-shot modifiers
//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/mkbd65/info.json b/keyboards/mkbd65/info.json
new file mode 100644
index 0000000000..aea164d043
--- /dev/null
+++ b/keyboards/mkbd65/info.json
@@ -0,0 +1,20 @@
+{
+ "keyboard_name": "mkbd65",
+ "manufacturer": "XenGi",
+ "url": "https://mkbd65.xengi.de",
+ "maintainer": "XenGi",
+ "author": ["XenGi"],
+ "usb": {
+ "vid": "0x1209",
+ "pid": "0x4803"
+ },
+ "debounce": 5,
+ "diode_direction": "ROW2COL",
+ "bootmagic": {
+ "enabled": true,
+ "matrix": [0, 0]
+ },
+ "tags": ["mobile", "65%"],
+ "description": "A mobile keyboard addon for modern smartphones. Fits any smartphones within some minimal size requirements. Supports any keyboard layout you want, as long as it doesn't need more keys.",
+ "short": "A mobile keyboard addon for modern smartphones."
+}
diff --git a/keyboards/mkbd65/keymaps/ansi/README.md b/keyboards/mkbd65/keymaps/ansi/README.md
index b394d98f2c..96e8f7bb14 100644
--- a/keyboards/mkbd65/keymaps/ansi/README.md
+++ b/keyboards/mkbd65/keymaps/ansi/README.md
@@ -1,4 +1,4 @@
-# The English US International keymap for mkbd65 by XenGi
+# The English US International keymap for mkbd65 rev0 by XenGi
This is the default layout for the mkbd65 keyboard. You can use it as a reference for other layouts.
diff --git a/keyboards/mkbd65/keymaps/ansi/config.h b/keyboards/mkbd65/keymaps/ansi/config.h
deleted file mode 100644
index b0d0727509..0000000000
--- a/keyboards/mkbd65/keymaps/ansi/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 XenGi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-// place overrides here
diff --git a/keyboards/mkbd65/keymaps/ansi/keymap.c b/keyboards/mkbd65/keymaps/ansi/keymap.c
index 972410b3dd..ddda2b83bc 100644
--- a/keyboards/mkbd65/keymaps/ansi/keymap.c
+++ b/keyboards/mkbd65/keymaps/ansi/keymap.c
@@ -1,45 +1,22 @@
-/* Copyright 2022 XenGi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_ANSI( /* Base layer */
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT,
- KC_LCTL, MO(1), KC_LSFT, OSM(MOD_RALT), KC_SPC, KC_MINS, KC_EQL, KC_LEFT, KC_DOWN, KC_RGHT, KC_RCTL
+ [0] = LAYOUT( /* Base layer */
+ KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC,
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, KC_RSFT,
+ KC_LCTL, MO(1), KC_LSFT, OSM(MOD_RALT), KC_SPC, KC_SPC, KC_SPC, KC_MINS, KC_EQL, KC_LEFT, KC_DOWN, KC_RGHT, KC_RCTL
),
- [1] = LAYOUT_ANSI( /* Function layer */
- RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,
+ [1] = LAYOUT( /* Function layer */
+ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_DEL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, KC_APP,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_GRV, KC_LGUI,
- _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PGUP, _______,
- _______, _______, _______, _______, KC_TAB, _______, _______, KC_HOME, KC_PGDN, KC_END, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_GRV, KC_LGUI, KC_LGUI,
+ _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PGUP, _______, _______,
+ _______, _______, _______, _______, KC_TAB, KC_TAB, KC_TAB, _______, _______, KC_HOME, KC_PGDN, KC_END, _______
)
};
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-void led_set_user(uint8_t usb_led) {
-}
-
diff --git a/keyboards/mkbd65/keymaps/de/README.md b/keyboards/mkbd65/keymaps/de/README.md
new file mode 100644
index 0000000000..f5c29d8e85
--- /dev/null
+++ b/keyboards/mkbd65/keymaps/de/README.md
@@ -0,0 +1,56 @@
+# The German keymap for mkbd65 rev1 by XenGi
+
+This is the german layout for the mkbd65 keyboard. You can use it as a reference for other ISO based layouts.
+
+This is the key matrix (no label means the key from layer 0 will be used):
+
+```
+0: no mod
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ Esc║ 1 ║ 2 ║ 3 ║ 4 ║ 5 ║ 6 ║ 7 ║ 8 ║ 9 ║ 0 ║Backspace║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ q ║ w ║ e ║ r ║ t ║ z ║ u ║ i ║ o ║ p ║ ü ║ + ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣ Ret║
+║ a ║ s ║ d ║ f ║ g ║ h ║ j ║ k ║ l ║ ö ║ ä ║ # ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
+║ y ║ x ║ c ║ v ║ b ║ n ║ m ║ , ║ . ║ - ║ ▲ ║ < ║Shft║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╬════╣
+║Ctrl║ Fn ║Shft║AltG║ Space ║ ß ║ ´ ║ ◀ ║ ▼ ║ ▶ ║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+1: mod shift
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ ° ║ ! ║ " ║ § ║ $ ║ % ║ & ║ / ║ ( ║ ) ║ = ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ Q ║ W ║ E ║ R ║ T ║ Y ║ U ║ I ║ O ║ P ║ Ü ║ * ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣ ║
+║ A ║ S ║ D ║ F ║ G ║ H ║ J ║ K ║ L ║ Ö ║ Ä ║ ' ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
+║ Z ║ X ║ C ║ V ║ B ║ N ║ M ║ ; ║ : ║ _ ║ ║ > ║░░░░║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╬════╣
+║ ║ ║░░░░║ ║ ║ ? ║ ` ║ ║ ║ ║ ║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+2: mod altgr
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ ║ ¹ ║ ² ║ ³ ║ ║ ║ ║ { ║ [ ║ ] ║ } ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ @ ║ ║ € ║ ║ ║ ║ ║ ║ ║ ║ ║ ~ ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣ ║
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
+║ ║ ║ ║ ║ ║ ║ µ ║ ║ ║ ║ ║ | ║ ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╬════╣
+║ ║ ║ ║░░░░║ ║ \ ║ ║ ║ ║ ║ ║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+3: mod fn
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ Esc║ F1 ║ F2 ║ F3 ║ F4 ║ F5 ║ F6 ║ F7 ║ F8 ║ F9 ║ F10║ Delete ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ F11║ F12║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣Supr║
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ^ ║ ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║PgUp║ ║ ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╬════╣
+║ ║░░░░║ ║ ║ Tab ║ ║ ║Pos1║PgDn║ End║ ║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+```
diff --git a/keyboards/mkbd65/keymaps/de/keymap.c b/keyboards/mkbd65/keymaps/de/keymap.c
new file mode 100644
index 0000000000..1246f1e8bc
--- /dev/null
+++ b/keyboards/mkbd65/keymaps/de/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "keymap_german.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT( /* Base layer */
+ KC_GESC, DE_1, DE_2, DE_3, DE_4, DE_5, DE_6, DE_7, DE_8, DE_9, DE_0, KC_BSPC, KC_BSPC,
+ DE_Q, DE_W, DE_E, DE_R, DE_T, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA, DE_PLUS, KC_ENT,
+ DE_A, DE_S, DE_D, DE_F, DE_G, DE_H, DE_J, DE_K, DE_L, DE_ODIA, DE_ADIA, DE_HASH, KC_ENT,
+ DE_Y, DE_X, DE_C, DE_V, DE_B, DE_N, DE_M, DE_COMM, DE_DOT, DE_MINS, KC_UP, DE_LABK, KC_RSFT,
+ KC_LCTL, MO(1), KC_LSFT, OSM(MOD_RALT), KC_SPC, KC_SPC, KC_SPC, DE_SS, DE_ACUT, KC_LEFT, KC_DOWN, KC_RGHT, KC_RCTL
+ ),
+
+ [1] = LAYOUT( /* Function layer */
+ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, KC_DEL,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, KC_APP,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_GRV, KC_LGUI, KC_LGUI,
+ _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PGUP, _______, _______,
+ _______, _______, _______, _______, KC_TAB, KC_TAB, KC_TAB, _______, _______, KC_HOME, KC_PGDN, KC_END, _______
+ )
+};
diff --git a/keyboards/mkbd65/keymaps/default b/keyboards/mkbd65/keymaps/en-us-intl
similarity index 100%
rename from keyboards/mkbd65/keymaps/default
rename to keyboards/mkbd65/keymaps/en-us-intl
diff --git a/keyboards/mkbd65/keymaps/iso/README.md b/keyboards/mkbd65/keymaps/iso/README.md
index d08f8c1b9e..beb5cc2783 100644
--- a/keyboards/mkbd65/keymaps/iso/README.md
+++ b/keyboards/mkbd65/keymaps/iso/README.md
@@ -1,4 +1,4 @@
-# The iso-like keymap for mkbd65
+# The iso-like keymap for mkbd65 rev0
It's actually just ANSI but with an upright `Enter` key.
diff --git a/keyboards/mkbd65/keymaps/iso/config.h b/keyboards/mkbd65/keymaps/iso/config.h
deleted file mode 100644
index b0d0727509..0000000000
--- a/keyboards/mkbd65/keymaps/iso/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 XenGi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-// place overrides here
diff --git a/keyboards/mkbd65/keymaps/iso/keymap.c b/keyboards/mkbd65/keymaps/iso/keymap.c
index eff19b0c4f..2b59ffd0cf 100644
--- a/keyboards/mkbd65/keymaps/iso/keymap.c
+++ b/keyboards/mkbd65/keymaps/iso/keymap.c
@@ -1,18 +1,5 @@
-/* Copyright 2022 XenGi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
@@ -33,13 +20,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, KC_TAB, _______, _______, KC_HOME, KC_PGDN, KC_END, _______,
),
};
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-void led_set_user(uint8_t usb_led) {
-}
-
diff --git a/keyboards/mkbd65/mkbd65.c b/keyboards/mkbd65/mkbd65.c
deleted file mode 100644
index fae93a8ea5..0000000000
--- a/keyboards/mkbd65/mkbd65.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2022 XenGi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-#include "mkbd65.h"
-
-void matrix_init_kb(void) {
- // put your keyboard start-up code here
- // runs once when the firmware starts up
-
- matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
- // put your looping keyboard code here
- // runs every cycle (a lot)
-
- matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
- // put your per-action keyboard code here
- // runs for every action, just before processing by the firmware
-
- return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
- // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
- led_set_user(usb_led);
-}
diff --git a/keyboards/mkbd65/rev0/info.json b/keyboards/mkbd65/rev0/info.json
new file mode 100644
index 0000000000..cea5523e84
--- /dev/null
+++ b/keyboards/mkbd65/rev0/info.json
@@ -0,0 +1,147 @@
+{
+ "usb": {
+ "device_version": "0.0.0"
+ },
+ "layouts": {
+ "LAYOUT_ansi": {
+ "layout": [
+ {"x": 0, "y": 0, "label": "Esc", "matrix": [0, 0]},
+ {"x": 1, "y": 0, "label": "1", "matrix": [0, 1]},
+ {"x": 2, "y": 0, "label": "2", "matrix": [0, 2]},
+ {"x": 3, "y": 0, "label": "3", "matrix": [0, 3]},
+ {"x": 4, "y": 0, "label": "4", "matrix": [0, 4]},
+ {"x": 5, "y": 0, "label": "5", "matrix": [0, 5]},
+ {"x": 6, "y": 0, "label": "6", "matrix": [0, 6]},
+ {"x": 7, "y": 0, "label": "7", "matrix": [0, 7]},
+ {"x": 8, "y": 0, "label": "8", "matrix": [0, 8]},
+ {"x": 9, "y": 0, "label": "9", "matrix": [0, 9]},
+ {"x": 10, "y": 0, "label": "0", "matrix": [0, 10]},
+ {"x": 11, "y": 0, "w": 2, "label": "Backspace", "matrix": [0, 11]},
+
+ {"x": 0, "y": 1, "label": "Q", "matrix": [1, 0]},
+ {"x": 1, "y": 1, "label": "W", "matrix": [1, 1]},
+ {"x": 2, "y": 1, "label": "E", "matrix": [1, 2]},
+ {"x": 3, "y": 1, "label": "R", "matrix": [1, 3]},
+ {"x": 4, "y": 1, "label": "T", "matrix": [1, 4]},
+ {"x": 5, "y": 1, "label": "Y", "matrix": [1, 5]},
+ {"x": 6, "y": 1, "label": "U", "matrix": [1, 6]},
+ {"x": 7, "y": 1, "label": "I", "matrix": [1, 7]},
+ {"x": 8, "y": 1, "label": "O", "matrix": [1, 8]},
+ {"x": 9, "y": 1, "label": "P", "matrix": [1, 9]},
+ {"x": 10, "y": 1, "label": "[", "matrix": [1, 10]},
+ {"x": 11, "y": 1, "label": "]", "matrix": [1, 11]},
+ {"x": 12, "y": 1, "label": "\\", "matrix": [1, 12]},
+
+ {"x": 0, "y": 2, "label": "A", "matrix": [2, 0]},
+ {"x": 1, "y": 2, "label": "S", "matrix": [2, 1]},
+ {"x": 2, "y": 2, "label": "D", "matrix": [2, 2]},
+ {"x": 3, "y": 2, "label": "F", "matrix": [2, 3]},
+ {"x": 4, "y": 2, "label": "G", "matrix": [2, 4]},
+ {"x": 5, "y": 2, "label": "H", "matrix": [2, 5]},
+ {"x": 6, "y": 2, "label": "J", "matrix": [2, 6]},
+ {"x": 7, "y": 2, "label": "K", "matrix": [2, 7]},
+ {"x": 8, "y": 2, "label": "L", "matrix": [2, 8]},
+ {"x": 9, "y": 2, "label": ";", "matrix": [2, 9]},
+ {"x": 10, "y": 2, "label": "'", "matrix": [2, 10]},
+ {"x": 11, "y": 2, "w": 2, "label": "Enter", "matrix": [2, 11]},
+
+ {"x": 0, "y": 3, "label": "Z", "matrix": [3, 0]},
+ {"x": 1, "y": 3, "label": "X", "matrix": [3, 1]},
+ {"x": 2, "y": 3, "label": "C", "matrix": [3, 2]},
+ {"x": 3, "y": 3, "label": "V", "matrix": [3, 3]},
+ {"x": 4, "y": 3, "label": "B", "matrix": [3, 4]},
+ {"x": 5, "y": 3, "label": "N", "matrix": [3, 5]},
+ {"x": 6, "y": 3, "label": "M", "matrix": [3, 6]},
+ {"x": 7, "y": 3, "label": ",", "matrix": [3, 7]},
+ {"x": 8, "y": 3, "label": ".", "matrix": [3, 8]},
+ {"x": 9, "y": 3, "label": "/", "matrix": [3, 9]},
+ {"x": 10, "y": 3, "label": "Up", "matrix": [3, 10]},
+ {"x": 11, "y": 3, "w": 2, "label": "RShift", "matrix": [3, 11]},
+
+ {"x": 0, "y": 4, "label": "LCtrl", "matrix": [4, 0]},
+ {"x": 1, "y": 4, "label": "LShift", "matrix": [4, 1]},
+ {"x": 2, "y": 4, "label": "Fn", "matrix": [4, 2]},
+ {"x": 3, "y": 4, "label": "AltGr", "matrix": [4, 3]},
+ {"x": 4, "y": 4, "w": 3, "label": "Space", "matrix": [4, 4]},
+ {"x": 7, "y": 4, "label": "-", "matrix": [4, 7]},
+ {"x": 8, "y": 4, "label": "=", "matrix": [4, 8]},
+ {"x": 9, "y": 4, "label": "Left", "matrix": [4, 9]},
+ {"x": 10, "y": 4, "label": "Down", "matrix": [4, 10]},
+ {"x": 11, "y": 4, "label": "Right", "matrix": [4, 11]},
+ {"x": 12, "y": 4, "label": "RCtrl", "matrix": [4, 12]}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"x": 0, "y": 0, "label": "Esc", "matrix": [0, 0]},
+ {"x": 1, "y": 0, "label": "1", "matrix": [0, 1]},
+ {"x": 2, "y": 0, "label": "2", "matrix": [0, 2]},
+ {"x": 3, "y": 0, "label": "3", "matrix": [0, 3]},
+ {"x": 4, "y": 0, "label": "4", "matrix": [0, 4]},
+ {"x": 5, "y": 0, "label": "5", "matrix": [0, 5]},
+ {"x": 6, "y": 0, "label": "6", "matrix": [0, 6]},
+ {"x": 7, "y": 0, "label": "7", "matrix": [0, 7]},
+ {"x": 8, "y": 0, "label": "8", "matrix": [0, 8]},
+ {"x": 9, "y": 0, "label": "9", "matrix": [0, 9]},
+ {"x": 10, "y": 0, "label": "0", "matrix": [0, 10]},
+ {"x": 11, "y": 0, "w": 2, "label": "Backspace", "matrix": [0, 11]},
+
+ {"x": 0, "y": 1, "label": "Q", "matrix": [1, 0]},
+ {"x": 1, "y": 1, "label": "W", "matrix": [1, 1]},
+ {"x": 2, "y": 1, "label": "E", "matrix": [1, 2]},
+ {"x": 3, "y": 1, "label": "R", "matrix": [1, 3]},
+ {"x": 4, "y": 1, "label": "T", "matrix": [1, 4]},
+ {"x": 5, "y": 1, "label": "Y", "matrix": [1, 5]},
+ {"x": 6, "y": 1, "label": "U", "matrix": [1, 6]},
+ {"x": 7, "y": 1, "label": "I", "matrix": [1, 7]},
+ {"x": 8, "y": 1, "label": "O", "matrix": [1, 8]},
+ {"x": 9, "y": 1, "label": "P", "matrix": [1, 9]},
+ {"x": 10, "y": 1, "label": "[", "matrix": [1, 10]},
+ {"x": 11, "y": 1, "label": "]", "matrix": [1, 11]},
+
+ {"x": 0, "y": 2, "label": "A", "matrix": [2, 0]},
+ {"x": 1, "y": 2, "label": "S", "matrix": [2, 1]},
+ {"x": 2, "y": 2, "label": "D", "matrix": [2, 2]},
+ {"x": 3, "y": 2, "label": "F", "matrix": [2, 3]},
+ {"x": 4, "y": 2, "label": "G", "matrix": [2, 4]},
+ {"x": 5, "y": 2, "label": "H", "matrix": [2, 5]},
+ {"x": 6, "y": 2, "label": "J", "matrix": [2, 6]},
+ {"x": 7, "y": 2, "label": "K", "matrix": [2, 7]},
+ {"x": 8, "y": 2, "label": "L", "matrix": [2, 8]},
+ {"x": 9, "y": 2, "label": ";", "matrix": [2, 9]},
+ {"x": 10, "y": 2, "label": "'", "matrix": [2, 10]},
+ {"x": 11, "y": 2, "label": "\\", "matrix": [2, 11]},
+ {"x": 12, "y": 2, "h": 2, "label": "Enter", "matrix": [2, 12]},
+
+ {"x": 0, "y": 3, "label": "Z", "matrix": [3, 0]},
+ {"x": 1, "y": 3, "label": "X", "matrix": [3, 1]},
+ {"x": 2, "y": 3, "label": "C", "matrix": [3, 2]},
+ {"x": 3, "y": 3, "label": "V", "matrix": [3, 3]},
+ {"x": 4, "y": 3, "label": "B", "matrix": [3, 4]},
+ {"x": 5, "y": 3, "label": "N", "matrix": [3, 5]},
+ {"x": 6, "y": 3, "label": "M", "matrix": [3, 6]},
+ {"x": 7, "y": 3, "label": ",", "matrix": [3, 7]},
+ {"x": 8, "y": 3, "label": ".", "matrix": [3, 8]},
+ {"x": 9, "y": 3, "label": "/", "matrix": [3, 9]},
+ {"x": 10, "y": 3, "label": "Up", "matrix": [3, 10]},
+ {"x": 11, "y": 3, "w": 2, "label": "RShift", "matrix": [3, 11]},
+
+ {"x": 0, "y": 4, "label": "LCtrl", "matrix": [4, 0]},
+ {"x": 1, "y": 4, "label": "LShift", "matrix": [4, 1]},
+ {"x": 2, "y": 4, "label": "Fn", "matrix": [4, 2]},
+ {"x": 3, "y": 4, "label": "AltGr", "matrix": [4, 3]},
+ {"x": 4, "y": 4, "w": 3, "label": "Space", "matrix": [4, 4]},
+ {"x": 7, "y": 4, "label": "-", "matrix": [4, 7]},
+ {"x": 8, "y": 4, "label": "=", "matrix": [4, 8]},
+ {"x": 9, "y": 4, "label": "Left", "matrix": [4, 9]},
+ {"x": 10, "y": 4, "label": "Down", "matrix": [4, 10]},
+ {"x": 11, "y": 4, "label": "Right", "matrix": [4, 11]},
+ {"x": 12, "y": 4, "label": "RCtrl", "matrix": [4, 12]}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "cols": ["D4", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["D5", "D3", "D2", "D1", "D0"]
+ }
+}
diff --git a/keyboards/mkbd65/rev0/mkbd65.c b/keyboards/mkbd65/rev0/mkbd65.c
new file mode 100644
index 0000000000..baca6508d4
--- /dev/null
+++ b/keyboards/mkbd65/rev0/mkbd65.c
@@ -0,0 +1,4 @@
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "mkbd65.h"
diff --git a/keyboards/mkbd65/mkbd65.h b/keyboards/mkbd65/rev0/mkbd65.h
similarity index 65%
rename from keyboards/mkbd65/mkbd65.h
rename to keyboards/mkbd65/rev0/mkbd65.h
index 1a53cad69f..aae0d388fa 100644
--- a/keyboards/mkbd65/mkbd65.h
+++ b/keyboards/mkbd65/rev0/mkbd65.h
@@ -1,24 +1,12 @@
-/* Copyright 2022 XenGi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#ifndef MKBD65_H
#define MKBD65_H
#include "quantum.h"
-/* LAYOUT_ANSI
+/* LAYOUT_ansi
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
* │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┬───┤
@@ -38,7 +26,7 @@
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
-#define LAYOUT_ANSI( \
+#define LAYOUT_ansi( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, \
@@ -53,20 +41,20 @@
{ K40, K41, K42, K43, K44, KC_NO, KC_NO, K47, K48, K49, K410, K411, K412 } \
}
-/* LAYOUT_ISO
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┬───┤
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ │
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┤
- * │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
- * ├───┼───┼───┼───┼───┴───┴───┼───┼───┼───┼───┼───┬───┤
- * │ │ │ │ │ 3.0U │ │ │ │ │ │ │
- * └───┴───┴───┴───┴───────────┴───┴───┴───┴───┴───┴───┘
+/* LAYOUT_iso
+ * ╔═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══════╗
+ * ║ │ │ │ │ │ │ │ │ │ │ │ 2.0U ║
+ * ╟───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┬───╢
+ * ║ │ │ │ │ │ │ │ │ │ │ │ │ ║
+ * ╟───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ ║
+ * ║ │ │ │ │ │ │ │ │ │ │ │ │ ║
+ * ╟───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───╢
+ * ║ │ │ │ │ │ │ │ │ │ │ │ 2.0U ║
+ * ╟───┼───┼───┼───┼───┴───┴───┼───┼───┼───┼───┼───┬───╢
+ * ║ │ │ │ │ 3.0U │ │ │ │ │ │ ║
+ * ╚═══╧═══╧═══╧═══╧═══════════╧═══╧═══╧═══╧═══╧═══╧═══╝
*/
-#define LAYOUT_ISO( \
+#define LAYOUT_iso( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \
diff --git a/keyboards/mkbd65/rev0/rules.mk b/keyboards/mkbd65/rev0/rules.mk
new file mode 100644
index 0000000000..94d4ac53b6
--- /dev/null
+++ b/keyboards/mkbd65/rev0/rules.mk
@@ -0,0 +1,9 @@
+# A list of layouts this keyboard supports.
+LAYOUTS = ansi iso
+
+MCU = atmega32u4
+F_CPU = 16000000
+ARCH = AVR8
+F_USB = $(F_CPU)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+BOOTLOADER = atmel-dfu
diff --git a/keyboards/mkbd65/rev1/info.json b/keyboards/mkbd65/rev1/info.json
new file mode 100644
index 0000000000..276775db17
--- /dev/null
+++ b/keyboards/mkbd65/rev1/info.json
@@ -0,0 +1,157 @@
+{
+ "usb": {
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_en-us-intl": {
+ "layout": [
+ {"x": 0, "y": 0, "label": "Esc", "matrix": [0, 0]},
+ {"x": 1, "y": 0, "label": "1", "matrix": [0, 1]},
+ {"x": 2, "y": 0, "label": "2", "matrix": [0, 2]},
+ {"x": 3, "y": 0, "label": "3", "matrix": [0, 3]},
+ {"x": 4, "y": 0, "label": "4", "matrix": [0, 4]},
+ {"x": 5, "y": 0, "label": "5", "matrix": [0, 5]},
+ {"x": 6, "y": 0, "label": "6", "matrix": [0, 6]},
+ {"x": 7, "y": 0, "label": "7", "matrix": [0, 7]},
+ {"x": 8, "y": 0, "label": "8", "matrix": [0, 8]},
+ {"x": 9, "y": 0, "label": "9", "matrix": [0, 9]},
+ {"x": 10, "y": 0, "label": "0", "matrix": [0, 10]},
+ {"x": 11, "y": 0, "label": "Backspace", "matrix": [0, 11]},
+ {"x": 12, "y": 0, "label": "Backspace", "matrix": [0, 12]},
+
+ {"x": 0, "y": 1, "label": "Q", "matrix": [1, 0]},
+ {"x": 1, "y": 1, "label": "W", "matrix": [1, 1]},
+ {"x": 2, "y": 1, "label": "E", "matrix": [1, 2]},
+ {"x": 3, "y": 1, "label": "R", "matrix": [1, 3]},
+ {"x": 4, "y": 1, "label": "T", "matrix": [1, 4]},
+ {"x": 5, "y": 1, "label": "Y", "matrix": [1, 5]},
+ {"x": 6, "y": 1, "label": "U", "matrix": [1, 6]},
+ {"x": 7, "y": 1, "label": "I", "matrix": [1, 7]},
+ {"x": 8, "y": 1, "label": "O", "matrix": [1, 8]},
+ {"x": 9, "y": 1, "label": "P", "matrix": [1, 9]},
+ {"x": 10, "y": 1, "label": "[", "matrix": [1, 10]},
+ {"x": 11, "y": 1, "label": "]", "matrix": [1, 11]},
+ {"x": 12, "y": 1, "label": "\\", "matrix": [1, 12]},
+
+ {"x": 0, "y": 2, "label": "A", "matrix": [2, 0]},
+ {"x": 1, "y": 2, "label": "S", "matrix": [2, 1]},
+ {"x": 2, "y": 2, "label": "D", "matrix": [2, 2]},
+ {"x": 3, "y": 2, "label": "F", "matrix": [2, 3]},
+ {"x": 4, "y": 2, "label": "G", "matrix": [2, 4]},
+ {"x": 5, "y": 2, "label": "H", "matrix": [2, 5]},
+ {"x": 6, "y": 2, "label": "J", "matrix": [2, 6]},
+ {"x": 7, "y": 2, "label": "K", "matrix": [2, 7]},
+ {"x": 8, "y": 2, "label": "L", "matrix": [2, 8]},
+ {"x": 9, "y": 2, "label": ";", "matrix": [2, 9]},
+ {"x": 10, "y": 2, "label": "'", "matrix": [2, 10]},
+ {"x": 11, "y": 2, "label": "Enter", "matrix": [2, 11]},
+ {"x": 12, "y": 2, "label": "Enter", "matrix": [2, 12]},
+
+ {"x": 0, "y": 3, "label": "Z", "matrix": [3, 0]},
+ {"x": 1, "y": 3, "label": "X", "matrix": [3, 1]},
+ {"x": 2, "y": 3, "label": "C", "matrix": [3, 2]},
+ {"x": 3, "y": 3, "label": "V", "matrix": [3, 3]},
+ {"x": 4, "y": 3, "label": "B", "matrix": [3, 4]},
+ {"x": 5, "y": 3, "label": "N", "matrix": [3, 5]},
+ {"x": 6, "y": 3, "label": "M", "matrix": [3, 6]},
+ {"x": 7, "y": 3, "label": ",", "matrix": [3, 7]},
+ {"x": 8, "y": 3, "label": ".", "matrix": [3, 8]},
+ {"x": 9, "y": 3, "label": "/", "matrix": [3, 9]},
+ {"x": 10, "y": 3, "label": "Up", "matrix": [3, 10]},
+ {"x": 11, "y": 3, "label": "RShift", "matrix": [3, 11]},
+ {"x": 12, "y": 3, "label": "RShift", "matrix": [3, 12]},
+
+ {"x": 0, "y": 4, "label": "LCtrl", "matrix": [4, 0]},
+ {"x": 1, "y": 4, "label": "LShift", "matrix": [4, 1]},
+ {"x": 2, "y": 4, "label": "Fn", "matrix": [4, 2]},
+ {"x": 3, "y": 4, "label": "AltGr", "matrix": [4, 3]},
+ {"x": 4, "y": 4, "label": "Space", "matrix": [4, 4]},
+ {"x": 5, "y": 4, "label": "Space", "matrix": [4, 5]},
+ {"x": 6, "y": 4, "label": "Space", "matrix": [4, 6]},
+ {"x": 7, "y": 4, "label": "-", "matrix": [4, 7]},
+ {"x": 8, "y": 4, "label": "=", "matrix": [4, 8]},
+ {"x": 9, "y": 4, "label": "Left", "matrix": [4, 9]},
+ {"x": 10, "y": 4, "label": "Down", "matrix": [4, 10]},
+ {"x": 11, "y": 4, "label": "Right", "matrix": [4, 11]},
+ {"x": 12, "y": 4, "label": "RCtrl", "matrix": [4, 12]}
+ ]
+ },
+ "LAYOUT_de": {
+ "layout": [
+ {"x": 0, "y": 0, "label": "Esc", "matrix": [0, 0]},
+ {"x": 1, "y": 0, "label": "1", "matrix": [0, 1]},
+ {"x": 2, "y": 0, "label": "2", "matrix": [0, 2]},
+ {"x": 3, "y": 0, "label": "3", "matrix": [0, 3]},
+ {"x": 4, "y": 0, "label": "4", "matrix": [0, 4]},
+ {"x": 5, "y": 0, "label": "5", "matrix": [0, 5]},
+ {"x": 6, "y": 0, "label": "6", "matrix": [0, 6]},
+ {"x": 7, "y": 0, "label": "7", "matrix": [0, 7]},
+ {"x": 8, "y": 0, "label": "8", "matrix": [0, 8]},
+ {"x": 9, "y": 0, "label": "9", "matrix": [0, 9]},
+ {"x": 10, "y": 0, "label": "0", "matrix": [0, 10]},
+ {"x": 11, "y": 0, "label": "Backspace", "matrix": [0, 11]},
+ {"x": 12, "y": 0, "label": "Backspace", "matrix": [0, 12]},
+
+ {"x": 0, "y": 1, "label": "Q", "matrix": [1, 0]},
+ {"x": 1, "y": 1, "label": "W", "matrix": [1, 1]},
+ {"x": 2, "y": 1, "label": "E", "matrix": [1, 2]},
+ {"x": 3, "y": 1, "label": "R", "matrix": [1, 3]},
+ {"x": 4, "y": 1, "label": "T", "matrix": [1, 4]},
+ {"x": 5, "y": 1, "label": "Z", "matrix": [1, 5]},
+ {"x": 6, "y": 1, "label": "U", "matrix": [1, 6]},
+ {"x": 7, "y": 1, "label": "I", "matrix": [1, 7]},
+ {"x": 8, "y": 1, "label": "O", "matrix": [1, 8]},
+ {"x": 9, "y": 1, "label": "P", "matrix": [1, 9]},
+ {"x": 10, "y": 1, "label": "Ü", "matrix": [1, 10]},
+ {"x": 11, "y": 1, "label": "+", "matrix": [1, 11]},
+ {"x": 12, "y": 1, "label": "Enter", "matrix": [1, 12]},
+
+ {"x": 0, "y": 2, "label": "A", "matrix": [2, 0]},
+ {"x": 1, "y": 2, "label": "S", "matrix": [2, 1]},
+ {"x": 2, "y": 2, "label": "D", "matrix": [2, 2]},
+ {"x": 3, "y": 2, "label": "F", "matrix": [2, 3]},
+ {"x": 4, "y": 2, "label": "G", "matrix": [2, 4]},
+ {"x": 5, "y": 2, "label": "H", "matrix": [2, 5]},
+ {"x": 6, "y": 2, "label": "J", "matrix": [2, 6]},
+ {"x": 7, "y": 2, "label": "K", "matrix": [2, 7]},
+ {"x": 8, "y": 2, "label": "L", "matrix": [2, 8]},
+ {"x": 9, "y": 2, "label": "Ö", "matrix": [2, 9]},
+ {"x": 10, "y": 2, "label": "Ä", "matrix": [2, 10]},
+ {"x": 11, "y": 2, "label": "#", "matrix": [2, 11]},
+ {"x": 12, "y": 2, "label": "Enter", "matrix": [2, 12]},
+
+ {"x": 0, "y": 3, "label": "Y", "matrix": [3, 0]},
+ {"x": 1, "y": 3, "label": "X", "matrix": [3, 1]},
+ {"x": 2, "y": 3, "label": "C", "matrix": [3, 2]},
+ {"x": 3, "y": 3, "label": "V", "matrix": [3, 3]},
+ {"x": 4, "y": 3, "label": "B", "matrix": [3, 4]},
+ {"x": 5, "y": 3, "label": "N", "matrix": [3, 5]},
+ {"x": 6, "y": 3, "label": "M", "matrix": [3, 6]},
+ {"x": 7, "y": 3, "label": ",", "matrix": [3, 7]},
+ {"x": 8, "y": 3, "label": ".", "matrix": [3, 8]},
+ {"x": 9, "y": 3, "label": "-", "matrix": [3, 9]},
+ {"x": 10, "y": 3, "label": "Up", "matrix": [3, 10]},
+ {"x": 11, "y": 3, "label": "<", "matrix": [3, 11]},
+ {"x": 12, "y": 3, "label": "RShift", "matrix": [3, 12]},
+
+ {"x": 0, "y": 4, "label": "LCtrl", "matrix": [4, 0]},
+ {"x": 1, "y": 4, "label": "LShift", "matrix": [4, 1]},
+ {"x": 2, "y": 4, "label": "Fn", "matrix": [4, 2]},
+ {"x": 3, "y": 4, "label": "AltGr", "matrix": [4, 3]},
+ {"x": 4, "y": 4, "label": "Space", "matrix": [4, 4]},
+ {"x": 5, "y": 4, "label": "Space", "matrix": [4, 5]},
+ {"x": 6, "y": 4, "label": "Space", "matrix": [4, 6]},
+ {"x": 7, "y": 4, "label": "ß", "matrix": [4, 7]},
+ {"x": 8, "y": 4, "label": "´", "matrix": [4, 8]},
+ {"x": 9, "y": 4, "label": "Left", "matrix": [4, 9]},
+ {"x": 10, "y": 4, "label": "Down", "matrix": [4, 10]},
+ {"x": 11, "y": 4, "label": "Right", "matrix": [4, 11]},
+ {"x": 12, "y": 4, "label": "RCtrl", "matrix": [4, 12]}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "cols": [],
+ "rows": []
+ }
+}
diff --git a/keyboards/mkbd65/rev1/mkbd65.c b/keyboards/mkbd65/rev1/mkbd65.c
new file mode 100644
index 0000000000..baca6508d4
--- /dev/null
+++ b/keyboards/mkbd65/rev1/mkbd65.c
@@ -0,0 +1,4 @@
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "mkbd65.h"
diff --git a/keyboards/mkbd65/rev1/mkbd65.h b/keyboards/mkbd65/rev1/mkbd65.h
new file mode 100644
index 0000000000..0e4293dd98
--- /dev/null
+++ b/keyboards/mkbd65/rev1/mkbd65.h
@@ -0,0 +1,42 @@
+// Copyright 2023 XenGi (@XenGi)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#ifndef MKBD65_H
+#define MKBD65_H
+
+#include "quantum.h"
+
+/* LAYOUT
+ * ╔═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╤═══╗
+ * ║ │ │ │ │ │ │ │ │ │ │ │ │ ║
+ * ╟───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───╢
+ * ║ │ │ │ │ │ │ │ │ │ │ │ │ ║
+ * ╟───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───╢
+ * ║ │ │ │ │ │ │ │ │ │ │ │ │ ║
+ * ╟───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───╢
+ * ║ │ │ │ │ │ │ │ │ │ │ │ │ ║
+ * ╟───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───╢
+ * ║ │ │ │ │ │ │ │ │ │ │ │ │ ║
+ * ╚═══╧═══╧═══╧═══╧═══╧═══╧═══╧═══╧═══╧═══╧═══╧═══╧═══╝
+ * This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410, K411, K412 \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212 }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312 }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K410, K411, K412 } \
+}
diff --git a/keyboards/mkbd65/rev1/rules.mk b/keyboards/mkbd65/rev1/rules.mk
new file mode 100644
index 0000000000..84345ec0aa
--- /dev/null
+++ b/keyboards/mkbd65/rev1/rules.mk
@@ -0,0 +1,3 @@
+# A list of layouts this keyboard supports.
+LAYOUTS = en-us-intl de
+
\ No newline at end of file
diff --git a/keyboards/mkbd65/rules.mk b/keyboards/mkbd65/rules.mk
index a6bdd38bae..8e66f2e4d8 100644
--- a/keyboards/mkbd65/rules.mk
+++ b/keyboards/mkbd65/rules.mk
@@ -1,80 +1,7 @@
-# MCU name
-MCU = atmega32u4
+DEFAULT_FOLDER = rev1
+# Enables Link Time Optimization (LTO) when compiling the keyboard. This makes the process take longer, but it can
+# significantly reduce the compiled size (and since the firmware is small, the added time is not noticeable).
+LTO_ENABLE = 1
-# Processor frequency.
-# This will define a symbol, F_CPU, in all source code files equal to the
-# processor frequency in Hz. You can then use this symbol in your source code to
-# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-# automatically to create a 32-bit value in your source code.
-#
-# This will be an integer division of F_USB below, as it is sourced by
-# F_USB after it has run through any CPU prescalers. Note that this value
-# does not *change* the processor frequency - it should merely be updated to
-# reflect the processor speed set externally so that the code can use accurate
-# software delays.
-F_CPU = 16000000
-
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-# This will define a symbol, F_USB, in all source code files equal to the
-# input clock frequency (before any prescaling is performed) in Hz. This value may
-# differ from F_CPU if prescaling is used on the latter, and is required as the
-# raw input clock is fed directly to the PLL sections of the AVR for high speed
-# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-# at the end, this will be done automatically to create a 32-bit value in your
-# source code.
-#
-# If no clock division is performed on the input clock inside the AVR (via the
-# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-
-# Bootloader selection
-# Teensy halfkay
-# Pro Micro caterina
-# Atmel DFU atmel-dfu
-# LUFA DFU lufa-dfu
-# QMK DFU qmk-dfu
-# atmega32a bootloadHID
-BOOTLOADER = atmel-dfu
-
-
-# If you don't know the bootloader type, then you can specify the
-# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
-# Teensy halfKay 512
-# Teensy++ halfKay 1024
-# Atmel DFU loader 4096
-# LUFA bootloader 4096
-# USBaspLoader 2048
-# OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = no # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = yes # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality on B7 by default
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-MIDI_ENABLE = no # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE = no # Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no # Audio output on port C6
-FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
+BOOTMAGIC_ENABLE = 1
+EXTRAKEY_ENABLE = 1