diff --git a/keyboards/mkbd65/README.md b/keyboards/mkbd65/README.md
index 08852e8fc2..045589252f 100644
--- a/keyboards/mkbd65/README.md
+++ b/keyboards/mkbd65/README.md
@@ -1,7 +1,7 @@
-# mkbd65
-
+# mkbd65
+
A mobile keyboard addon for modern smartphones.
- Keyboard Maintainer: [XenGi](https://xengi.de)
@@ -14,4 +14,11 @@ Make example for this keyboard (after setting up your build environment):
make mkbd65:default
```
+Available layouts:
+
+ - ansi (default)
+ - iso (upright `Enter` key)
+
+_Don't forget to connect the correct solder joints on the PCB to switch the layout._
+
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).
diff --git a/keyboards/mkbd65/config.h b/keyboards/mkbd65/config.h
index 704fe8f4dc..6b4e2fbe05 100644
--- a/keyboards/mkbd65/config.h
+++ b/keyboards/mkbd65/config.h
@@ -1,5 +1,5 @@
/*
-Copyright 2018 XenGi
+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
@@ -20,8 +20,8 @@ along with this program. If not, see .
#include "config_common.h"
/* USB Device descriptor parameter */
-#define VENDOR_ID 0xDEAD
-#define PRODUCT_ID 0xBEAF
+#define VENDOR_ID 0x1209
+#define PRODUCT_ID 0x4803
#define DEVICE_VER 0x0001
#define MANUFACTURER XenGi
#define PRODUCT mkbd65
@@ -29,7 +29,7 @@ along with this program. If not, see .
/* key matrix size */
#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
+#define MATRIX_COLS 13
/*
* Keyboard Matrix Assignments
@@ -41,16 +41,17 @@ along with this program. If not, see .
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
-#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 }
-#define MATRIX_COL_PINS { D5, C7, C6, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-#define UNUSED_PINS { E6, F0, F1, F4, F5, F6, F7 }
+#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 COL2ROW
+#define DIODE_DIRECTION ROW2COL
-#define BACKLIGHT_PIN B6
+#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
diff --git a/keyboards/mkbd65/info.json b/keyboards/mkbd65/info.json
index a63e1f9a43..dd4edfcd06 100644
--- a/keyboards/mkbd65/info.json
+++ b/keyboards/mkbd65/info.json
@@ -1,6 +1,6 @@
{
"keyboard_name": "MKBD65",
- "url": "https://gitlab.com/xengi/mkbd65",
+ "url": "https://gitlab.com/mkbd65",
"maintainer": "XenGi",
"width": 12,
"height": 5,
diff --git a/keyboards/mkbd65/keymaps/default/README.md b/keyboards/mkbd65/keymaps/ansi/README.md
similarity index 52%
rename from keyboards/mkbd65/keymaps/default/README.md
rename to keyboards/mkbd65/keymaps/ansi/README.md
index 2f7e9c220f..00feeefc77 100644
--- a/keyboards/mkbd65/keymaps/default/README.md
+++ b/keyboards/mkbd65/keymaps/ansi/README.md
@@ -1,52 +1,54 @@
-# The default keymap for mkbd65
+# The ANSI keymap for mkbd65
+
+This is the default layout.
```
0: no mod
-╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╗
-║ ESC║ 1 ║ 2 ║ 3 ║ 4 ║ 5 ║ 6 ║ 7 ║ 8 ║ 9 ║ 0 ║BKSP║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ q ║ w ║ e ║ r ║ t ║ y ║ u ║ i ║ o ║ p ║ [ ║ ] ║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ a ║ s ║ d ║ f ║ g ║ h ║ j ║ k ║ l ║ ; ║ ' ║ RET║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ z ║ x ║ c ║ v ║ b ║ n ║ m ║ , ║ . ║ / ║ ▲ ║SHFT║
-╠════╬════╬════╬════╬════╬════╩════╬════╬════╬════╬════╬════╣
-║CTRL║ FN ║SHFT║ ALT║ \ ║ SPACE ║ - ║ = ║ ◀ ║ ▼ ║ ▶ ║
-╚════╩════╩════╩════╩════╩═════════╩════╩════╩════╩════╩════╝
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ Esc║ 1 ║ 2 ║ 3 ║ 4 ║ 5 ║ 6 ║ 7 ║ 8 ║ 9 ║ 0 ║Backspace║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ q ║ w ║ e ║ r ║ t ║ y ║ u ║ i ║ o ║ p ║ [ ║ ] ║ \ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ a ║ s ║ d ║ f ║ g ║ h ║ j ║ k ║ l ║ ; ║ ' ║ Return ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬═════════╣
+║ z ║ x ║ c ║ v ║ b ║ n ║ m ║ , ║ . ║ / ║ ▲ ║ Shift ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║ Fn ║Shft║AltG║ Space ║ - ║ = ║ ◀ ║ ▼ ║ ▶ ║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
1: mod shift
-╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╗
-║ ~ ║ ! ║ @ ║ # ║ $ ║ % ║ ^ ║ & ║ * ║ ( ║ ) ║BKSP║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ Q ║ W ║ E ║ R ║ T ║ Y ║ U ║ I ║ O ║ P ║ { ║ } ║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ A ║ S ║ D ║ F ║ G ║ H ║ J ║ K ║ L ║ : ║ " ║ RET║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ Z ║ X ║ C ║ V ║ B ║ N ║ M ║ < ║ > ║ ? ║ ▲ ║░░░░║
-╠════╬════╬════╬════╬════╬════╩════╬════╬════╬════╬════╬════╣
-║CTRL║ FN ║░░░░║ ALT║ | ║ SPACE ║ _ ║ + ║ ◀ ║ ▼ ║ ▶ ║
-╚════╩════╩════╩════╩════╩═════════╩════╩════╩════╩════╩════╝
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ ~ ║ ! ║ @ ║ # ║ $ ║ % ║ ^ ║ & ║ * ║ ( ║ ) ║Backspace║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ Q ║ W ║ E ║ R ║ T ║ Y ║ U ║ I ║ O ║ P ║ { ║ } ║ | ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ A ║ S ║ D ║ F ║ G ║ H ║ J ║ K ║ L ║ : ║ " ║ Return ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬═════════╣
+║ Z ║ X ║ C ║ V ║ B ║ N ║ M ║ < ║ > ║ ? ║ ▲ ║░░░░░░░░░║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║ Fn ║░░░░║AltG║ Space ║ _ ║ + ║ ◀ ║ ▼ ║ ▶ ║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
2: mod alt
-╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╗
-║ ║ ¹ ║ ² ║ ³ ║ ║ € ║ ║ ║ ║ ║ ║BKSP║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ ä ║ ║ ║ ║ ║ ü ║ ║ ║ ║ ö ║ « ║ » ║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ ║ ß ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ RET║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ ║ ║ ║ ║ ║ ║ µ ║ ║ ║ ¿ ║ ▲ ║SHFT║
-╠════╬════╬════╬════╬════╬════╩════╬════╬════╬════╬════╬════╣
-║CTRL║ FN ║SHFT║░░░░║ ║ SPACE ║ ║ ║ ◀ ║ ▼ ║ ▶ ║
-╚════╩════╩════╩════╩════╩═════════╩════╩════╩════╩════╩════╝
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ ║ ¹ ║ ² ║ ³ ║ ║ € ║ ║ ║ ║ ║ ║Backspace║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ ä ║ ║ ║ ║ ║ ü ║ ║ ║ ║ ö ║ « ║ » ║ ¬ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ ║ ß ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ Return ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬═════════╣
+║ ║ ║ ║ ║ ║ ║ µ ║ ║ ║ ¿ ║ ▲ ║ Shift ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║ Fn ║Shft║░░░░║ Space ║ ║ ║ ◀ ║ ▼ ║ ▶ ║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
3: mod fn
-╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╗
-║ Esc║ F1 ║ F2 ║ F3 ║ F4 ║ F5 ║ F6 ║ F7 ║ F8 ║ F9 ║ F10║ Del║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ F11║ F12║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║SUPR║
-╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣
-║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║PgUp║SHFT║
-╠════╬════╬════╬════╬════╬════╩════╬════╬════╬════╬════╬════╣
-║CTRL║░░░░║SHFT║ ALT║ ║ Tab ║ ║ ` ║Pos1║PgDn║ End║
-╚════╩════╩════╩════╩════╩═════════╩════╩════╩════╩════╩════╝
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ Esc║ F1 ║ F2 ║ F3 ║ F4 ║ F5 ║ F6 ║ F7 ║ F8 ║ F9 ║ F10║ Delete ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ F11║ F12║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ Super ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬═════════╣
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║PgUp║ Shift ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║░░░░║Shft║AltG║ Tab ║ ║ ` ║Pos1║PgDn║ End║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
```
diff --git a/keyboards/mkbd65/keymaps/default/config.h b/keyboards/mkbd65/keymaps/ansi/config.h
similarity index 96%
rename from keyboards/mkbd65/keymaps/default/config.h
rename to keyboards/mkbd65/keymaps/ansi/config.h
index d08c67c094..b0d0727509 100644
--- a/keyboards/mkbd65/keymaps/default/config.h
+++ b/keyboards/mkbd65/keymaps/ansi/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 XenGi
+/* 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
diff --git a/keyboards/mkbd65/keymaps/ansi/keymap.c b/keyboards/mkbd65/keymaps/ansi/keymap.c
new file mode 100644
index 0000000000..4b7b3520a4
--- /dev/null
+++ b/keyboards/mkbd65/keymaps/ansi/keymap.c
@@ -0,0 +1,45 @@
+/* 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 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, KC_RALT, 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,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_LGUI,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
+ _______, _______, _______, _______, 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/default b/keyboards/mkbd65/keymaps/default
new file mode 120000
index 0000000000..44ad4f4f7e
--- /dev/null
+++ b/keyboards/mkbd65/keymaps/default
@@ -0,0 +1 @@
+ansi
\ No newline at end of file
diff --git a/keyboards/mkbd65/keymaps/iso/README.md b/keyboards/mkbd65/keymaps/iso/README.md
new file mode 100644
index 0000000000..d08f8c1b9e
--- /dev/null
+++ b/keyboards/mkbd65/keymaps/iso/README.md
@@ -0,0 +1,54 @@
+# The iso-like keymap for mkbd65
+
+It's actually just ANSI but with an upright `Enter` key.
+
+```
+0: no mod
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ Esc║ 1 ║ 2 ║ 3 ║ 4 ║ 5 ║ 6 ║ 7 ║ 8 ║ 9 ║ 0 ║Backspace║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ q ║ w ║ e ║ r ║ t ║ y ║ u ║ i ║ o ║ p ║ [ ║ ] ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣ Ret║
+║ a ║ s ║ d ║ f ║ g ║ h ║ j ║ k ║ l ║ ; ║ ' ║ \ ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ z ║ x ║ c ║ v ║ b ║ n ║ m ║ , ║ . ║ / ║ ▲ ║ Shift ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║ Fn ║Shft║AltG║ SPACE ║ - ║ = ║ ◀ ║ ▼ ║ ▶ ║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+1: mod shift
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ ~ ║ ! ║ @ ║ # ║ $ ║ % ║ ^ ║ & ║ * ║ ( ║ ) ║Backspace║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ Q ║ W ║ E ║ R ║ T ║ Y ║ U ║ I ║ O ║ P ║ { ║ } ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣ Ret║
+║ A ║ S ║ D ║ F ║ G ║ H ║ J ║ K ║ L ║ : ║ " ║ | ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ Z ║ X ║ C ║ V ║ B ║ N ║ M ║ < ║ > ║ ? ║ ▲ ║░░░░░░░░░║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║ Fn ║░░░░║AltG║ SPACE ║ _ ║ + ║ ◀ ║ ▼ ║ ▶ ║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+2: mod alt
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ ║ ¹ ║ ² ║ ³ ║ ║ € ║ ║ ║ ║ ║ ║Backspace║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ ä ║ ║ ║ ║ ║ ü ║ ║ ║ ║ ö ║ « ║ » ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣ Ret║
+║ ║ ß ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ¬ ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ ║ ║ ║ ║ ║ ║ µ ║ ║ ║ ¿ ║ ▲ ║ Shift ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║ Fn ║Shft║░░░░║ SPACE ║ ║ ║ ◀ ║ ▼ ║ ▶ ║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+3: mod fn
+╔════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦════╦═════════╗
+║ Esc║ F1 ║ F2 ║ F3 ║ F4 ║ F5 ║ F6 ║ F7 ║ F8 ║ F9 ║ F10║ Delete ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╦════╣
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ F11║ F12║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╣Supr║
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║
+╠════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╬════╩════╣
+║ ║ ║ ║ ║ ║ ║ ║ ║ ║ ║PgUp║ Shift ║
+╠════╬════╬════╬════╬════╩════╩════╬════╬════╬════╬════╬════╦════╣
+║Ctrl║░░░░║Shft║AltG║ Tab ║ ║ ` ║Pos1║PgDn║ End║Ctrl║
+╚════╩════╩════╩════╩══════════════╩════╩════╩════╩════╩════╩════╝
+```
diff --git a/keyboards/mkbd65/keymaps/iso/config.h b/keyboards/mkbd65/keymaps/iso/config.h
new file mode 100644
index 0000000000..b0d0727509
--- /dev/null
+++ b/keyboards/mkbd65/keymaps/iso/config.h
@@ -0,0 +1,19 @@
+/* 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/default/keymap.c b/keyboards/mkbd65/keymaps/iso/keymap.c
similarity index 78%
rename from keyboards/mkbd65/keymaps/default/keymap.c
rename to keyboards/mkbd65/keymaps/iso/keymap.c
index f57e6871fb..155a2b205b 100644
--- a/keyboards/mkbd65/keymaps/default/keymap.c
+++ b/keyboards/mkbd65/keymaps/iso/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 XenGi
+/* 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
@@ -17,20 +17,20 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT( /* Base layer */
+ [0] = LAYOUT_ISO( /* 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_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, 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, KC_RALT, KC_BSLS, KC_SPC, KC_MINS, KC_EQL, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, MO(1), KC_LSFT, KC_RALT, KC_SPC, KC_MINS, KC_EQL, KC_LEFT, KC_DOWN, KC_RGHT, KC_RCTL,
),
- [1] = LAYOUT( /* Function layer */
+ [1] = LAYOUT_ISO( /* 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_F11, KC_F12,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, KC_LGUI,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_GRV, _______, KC_LGUI,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
- _______, _______, _______, _______, _______, KC_TAB, _______, _______, KC_HOME, KC_PGDN, KC_END
+ _______, _______, _______, _______, KC_TAB, _______, _______, KC_HOME, KC_PGDN, KC_END, _______,
),
};
diff --git a/keyboards/mkbd65/mkbd65.c b/keyboards/mkbd65/mkbd65.c
index ab03178a44..fae93a8ea5 100644
--- a/keyboards/mkbd65/mkbd65.c
+++ b/keyboards/mkbd65/mkbd65.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 XenGi
+/* 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
diff --git a/keyboards/mkbd65/mkbd65.h b/keyboards/mkbd65/mkbd65.h
index b9437d02b3..1a53cad69f 100644
--- a/keyboards/mkbd65/mkbd65.h
+++ b/keyboards/mkbd65/mkbd65.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 XenGi
+/* 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
@@ -18,19 +18,19 @@
#include "quantum.h"
-/* LAYOUT
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┼───┤
- * │ │ │ │ │ │ 2.0U │ │ │ │ │ │
- * └───┴───┴───┴───┴───┴───────┴───┴───┴───┴───┴───┘
- * This a shortcut to help you visually see your layout.
+/* LAYOUT_ANSI
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┬───┤
+ * │ │ │ │ │ │ │ │ │ │ │ │ │ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┤
+ * │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───────┤
+ * │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
+ * ├───┼───┼───┼───┼───┴───┴───┼───┼───┼───┼───┼───┬───┤
+ * │ │ │ │ │ 3.0U │ │ │ │ │ │ │
+ * └───┴───┴───┴───┴───────────┴───┴───┴───┴───┴───┴───┘
+ * 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.
@@ -38,19 +38,47 @@
* 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, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, \
- K40, K41, K42, K43, K44, K45, K47, K48, K49, K410, K411 \
+#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, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, \
+ K40, K41, K42, K43, K44, K47, K48, K49, K410, K411, K412 \
) \
{ \
- { 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 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311 }, \
- { K40, K41, K42, K43, K44, K45, KC_NO, K47, K48, K49, K410, K411 } \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, KC_NO }, \
+ { 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, KC_NO }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, KC_NO }, \
+ { K40, K41, K42, K43, K44, KC_NO, KC_NO, K47, K48, K49, K410, K411, K412 } \
+}
+
+/* LAYOUT_ISO
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┬───┤
+ * │ │ │ │ │ │ │ │ │ │ │ │ │ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ │
+ * │ │ │ │ │ │ │ │ │ │ │ │ │ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┤
+ * │ │ │ │ │ │ │ │ │ │ │ │ 2.0U │
+ * ├───┼───┼───┼───┼───┴───┴───┼───┼───┼───┼───┼───┬───┤
+ * │ │ │ │ │ 3.0U │ │ │ │ │ │ │
+ * └───┴───┴───┴───┴───────────┴───┴───┴───┴───┴───┴───┘
+ */
+#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, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, \
+ K40, K41, K42, K43, K44, K47, K48, K49, K410, K411, K412 \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, KC_NO }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, KC_NO }, \
+ { 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, KC_NO }, \
+ { K40, K41, K42, K43, K44, KC_NO, KC_NO, K47, K48, K49, K410, K411, K412 } \
}
#endif