summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/winkeyless/bface/README.md (renamed from keyboards/bface/README.md)4
-rw-r--r--keyboards/winkeyless/bface/backlight_ps2avrGB.c (renamed from keyboards/bface/backlight_ps2avrGB.c)0
-rw-r--r--keyboards/winkeyless/bface/backlight_ps2avrGB.h (renamed from keyboards/bface/backlight_ps2avrGB.h)0
-rw-r--r--keyboards/winkeyless/bface/bface.c (renamed from keyboards/bface/bface.c)0
-rw-r--r--keyboards/winkeyless/bface/bface.h (renamed from keyboards/bface/bface.h)0
-rw-r--r--keyboards/winkeyless/bface/config.h (renamed from keyboards/bface/config.h)0
-rw-r--r--keyboards/winkeyless/bface/i2c.c (renamed from keyboards/bface/i2c.c)0
-rw-r--r--keyboards/winkeyless/bface/i2c.h (renamed from keyboards/bface/i2c.h)0
-rw-r--r--keyboards/winkeyless/bface/info.json (renamed from keyboards/bface/info.json)0
-rw-r--r--keyboards/winkeyless/bface/keymaps/default/keymap.c (renamed from keyboards/bface/keymaps/default/keymap.c)0
-rw-r--r--keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c (renamed from keyboards/bface/keymaps/kpeatt/keymap.c)0
-rw-r--r--keyboards/winkeyless/bface/keymaps/kpeatt/readme.md (renamed from keyboards/bface/keymaps/kpeatt/readme.md)0
-rw-r--r--keyboards/winkeyless/bface/matrix.c (renamed from keyboards/bface/matrix.c)0
-rwxr-xr-xkeyboards/winkeyless/bface/program (renamed from keyboards/bface/program)0
-rw-r--r--keyboards/winkeyless/bface/rules.mk (renamed from keyboards/bface/rules.mk)3
-rw-r--r--keyboards/winkeyless/bface/usbconfig.h (renamed from keyboards/bface/usbconfig.h)0
-rw-r--r--keyboards/winkeyless/bmini/bmini.c (renamed from keyboards/bmini/bmini.c)0
-rw-r--r--keyboards/winkeyless/bmini/bmini.h (renamed from keyboards/bmini/bmini.h)0
-rw-r--r--keyboards/winkeyless/bmini/config.h (renamed from keyboards/bmini/config.h)0
-rw-r--r--keyboards/winkeyless/bmini/i2c.c (renamed from keyboards/bmini/i2c.c)0
-rw-r--r--keyboards/winkeyless/bmini/i2c.h (renamed from keyboards/bmini/i2c.h)0
-rw-r--r--keyboards/winkeyless/bmini/info.json (renamed from keyboards/bmini/info.json)0
-rw-r--r--keyboards/winkeyless/bmini/keymaps/default/keymap.c (renamed from keyboards/bmini/keymaps/default/keymap.c)0
-rw-r--r--keyboards/winkeyless/bmini/matrix.c (renamed from keyboards/bmini/matrix.c)0
-rw-r--r--keyboards/winkeyless/bmini/readme.md (renamed from keyboards/bmini/readme.md)7
-rw-r--r--keyboards/winkeyless/bmini/rules.mk (renamed from keyboards/bmini/rules.mk)0
-rw-r--r--keyboards/winkeyless/bmini/usbconfig.h (renamed from keyboards/bmini/usbconfig.h)0
-rw-r--r--keyboards/winkeyless/bminiex/backlight.c (renamed from keyboards/bminiex/backlight.c)0
-rw-r--r--keyboards/winkeyless/bminiex/backlight_custom.h (renamed from keyboards/bminiex/backlight_custom.h)0
-rw-r--r--keyboards/winkeyless/bminiex/bminiex.c (renamed from keyboards/bminiex/bminiex.c)0
-rw-r--r--keyboards/winkeyless/bminiex/bminiex.h (renamed from keyboards/bminiex/bminiex.h)0
-rw-r--r--keyboards/winkeyless/bminiex/breathing_custom.h (renamed from keyboards/bminiex/breathing_custom.h)0
-rw-r--r--keyboards/winkeyless/bminiex/config.h (renamed from keyboards/bminiex/config.h)0
-rw-r--r--keyboards/winkeyless/bminiex/i2c.c (renamed from keyboards/bminiex/i2c.c)0
-rw-r--r--keyboards/winkeyless/bminiex/i2c.h (renamed from keyboards/bminiex/i2c.h)0
-rw-r--r--keyboards/winkeyless/bminiex/info.json (renamed from keyboards/bminiex/info.json)0
-rw-r--r--keyboards/winkeyless/bminiex/keymaps/ansi/keymap.c (renamed from keyboards/bminiex/keymaps/ansi/keymap.c)0
-rw-r--r--keyboards/winkeyless/bminiex/keymaps/ansi/readme.md (renamed from keyboards/bminiex/keymaps/ansi/readme.md)0
-rw-r--r--keyboards/winkeyless/bminiex/keymaps/default/keymap.c (renamed from keyboards/bminiex/keymaps/default/keymap.c)0
-rw-r--r--keyboards/winkeyless/bminiex/keymaps/iso/keymap.c (renamed from keyboards/bminiex/keymaps/iso/keymap.c)0
-rw-r--r--keyboards/winkeyless/bminiex/keymaps/iso/readme.md (renamed from keyboards/bminiex/keymaps/iso/readme.md)0
-rw-r--r--keyboards/winkeyless/bminiex/matrix.c (renamed from keyboards/bminiex/matrix.c)0
-rw-r--r--keyboards/winkeyless/bminiex/readme.md (renamed from keyboards/bminiex/readme.md)7
-rw-r--r--keyboards/winkeyless/bminiex/rules.mk (renamed from keyboards/bminiex/rules.mk)0
-rw-r--r--keyboards/winkeyless/bminiex/usbconfig.h (renamed from keyboards/bminiex/usbconfig.h)0
-rw-r--r--keyboards/winkeyless/readme.md7
-rw-r--r--layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c12
-rw-r--r--layouts/community/75_ansi/mechmerlin-75_ansi/readme.md3
-rw-r--r--layouts/default/75_iso/default_75_iso/keymap.c13
-rw-r--r--layouts/default/75_iso/layout.json6
-rw-r--r--layouts/default/75_iso/readme.md3
51 files changed, 46 insertions, 19 deletions
diff --git a/keyboards/bface/README.md b/keyboards/winkeyless/bface/README.md
index 0dac7caf30..f1789b04cf 100644
--- a/keyboards/bface/README.md
+++ b/keyboards/winkeyless/bface/README.md
@@ -8,7 +8,7 @@ Hardware Availability: [Winkeyless](https://winkeyless.kr/product/b-face-x2-pcb/
Make example for this keyboard (after setting up your build environment):
- make bface:default
+ make winkeyless/bface:default
Flashing
@@ -41,4 +41,4 @@ macOS:
5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file.
-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.
+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/bface/backlight_ps2avrGB.c b/keyboards/winkeyless/bface/backlight_ps2avrGB.c
index c0f6428407..c0f6428407 100644
--- a/keyboards/bface/backlight_ps2avrGB.c
+++ b/keyboards/winkeyless/bface/backlight_ps2avrGB.c
diff --git a/keyboards/bface/backlight_ps2avrGB.h b/keyboards/winkeyless/bface/backlight_ps2avrGB.h
index d5ca903993..d5ca903993 100644
--- a/keyboards/bface/backlight_ps2avrGB.h
+++ b/keyboards/winkeyless/bface/backlight_ps2avrGB.h
diff --git a/keyboards/bface/bface.c b/keyboards/winkeyless/bface/bface.c
index 8422a4a40b..8422a4a40b 100644
--- a/keyboards/bface/bface.c
+++ b/keyboards/winkeyless/bface/bface.c
diff --git a/keyboards/bface/bface.h b/keyboards/winkeyless/bface/bface.h
index 62d62f6953..62d62f6953 100644
--- a/keyboards/bface/bface.h
+++ b/keyboards/winkeyless/bface/bface.h
diff --git a/keyboards/bface/config.h b/keyboards/winkeyless/bface/config.h
index 11ac373c02..11ac373c02 100644
--- a/keyboards/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
diff --git a/keyboards/bface/i2c.c b/keyboards/winkeyless/bface/i2c.c
index c27f3e3d17..c27f3e3d17 100644
--- a/keyboards/bface/i2c.c
+++ b/keyboards/winkeyless/bface/i2c.c
diff --git a/keyboards/bface/i2c.h b/keyboards/winkeyless/bface/i2c.h
index 27c9d3d050..27c9d3d050 100644
--- a/keyboards/bface/i2c.h
+++ b/keyboards/winkeyless/bface/i2c.h
diff --git a/keyboards/bface/info.json b/keyboards/winkeyless/bface/info.json
index f5ecf173d3..f5ecf173d3 100644
--- a/keyboards/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
diff --git a/keyboards/bface/keymaps/default/keymap.c b/keyboards/winkeyless/bface/keymaps/default/keymap.c
index a3e9bc9577..a3e9bc9577 100644
--- a/keyboards/bface/keymaps/default/keymap.c
+++ b/keyboards/winkeyless/bface/keymaps/default/keymap.c
diff --git a/keyboards/bface/keymaps/kpeatt/keymap.c b/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
index 84de7872f4..84de7872f4 100644
--- a/keyboards/bface/keymaps/kpeatt/keymap.c
+++ b/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
diff --git a/keyboards/bface/keymaps/kpeatt/readme.md b/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md
index a7eef1e5fc..a7eef1e5fc 100644
--- a/keyboards/bface/keymaps/kpeatt/readme.md
+++ b/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md
diff --git a/keyboards/bface/matrix.c b/keyboards/winkeyless/bface/matrix.c
index b3761a63ca..b3761a63ca 100644
--- a/keyboards/bface/matrix.c
+++ b/keyboards/winkeyless/bface/matrix.c
diff --git a/keyboards/bface/program b/keyboards/winkeyless/bface/program
index 298e645477..298e645477 100755
--- a/keyboards/bface/program
+++ b/keyboards/winkeyless/bface/program
diff --git a/keyboards/bface/rules.mk b/keyboards/winkeyless/bface/rules.mk
index 95b6c8a97a..10331ef700 100644
--- a/keyboards/bface/rules.mk
+++ b/keyboards/winkeyless/bface/rules.mk
@@ -44,6 +44,5 @@ CUSTOM_MATRIX = yes
SRC = matrix.c i2c.c backlight_ps2avrGB.c
# programming options
-PROGRAM_CMD = ./keyboards/bface/program .build/$(TARGET).hex
+PROGRAM_CMD = ./keyboards/winkeyless/bface/program .build/$(TARGET).hex
-LAYOUTS = 60_ansi
diff --git a/keyboards/bface/usbconfig.h b/keyboards/winkeyless/bface/usbconfig.h
index f87922615b..f87922615b 100644
--- a/keyboards/bface/usbconfig.h
+++ b/keyboards/winkeyless/bface/usbconfig.h
diff --git a/keyboards/bmini/bmini.c b/keyboards/winkeyless/bmini/bmini.c
index 35800358cf..35800358cf 100644
--- a/keyboards/bmini/bmini.c
+++ b/keyboards/winkeyless/bmini/bmini.c
diff --git a/keyboards/bmini/bmini.h b/keyboards/winkeyless/bmini/bmini.h
index 7bdf66fd25..7bdf66fd25 100644
--- a/keyboards/bmini/bmini.h
+++ b/keyboards/winkeyless/bmini/bmini.h
diff --git a/keyboards/bmini/config.h b/keyboards/winkeyless/bmini/config.h
index 96acd9bf16..96acd9bf16 100644
--- a/keyboards/bmini/config.h
+++ b/keyboards/winkeyless/bmini/config.h
diff --git a/keyboards/bmini/i2c.c b/keyboards/winkeyless/bmini/i2c.c
index a4f9521352..a4f9521352 100644
--- a/keyboards/bmini/i2c.c
+++ b/keyboards/winkeyless/bmini/i2c.c
diff --git a/keyboards/bmini/i2c.h b/keyboards/winkeyless/bmini/i2c.h
index 93a69c94da..93a69c94da 100644
--- a/keyboards/bmini/i2c.h
+++ b/keyboards/winkeyless/bmini/i2c.h
diff --git a/keyboards/bmini/info.json b/keyboards/winkeyless/bmini/info.json
index ab4d01c023..ab4d01c023 100644
--- a/keyboards/bmini/info.json
+++ b/keyboards/winkeyless/bmini/info.json
diff --git a/keyboards/bmini/keymaps/default/keymap.c b/keyboards/winkeyless/bmini/keymaps/default/keymap.c
index 1f9e229812..1f9e229812 100644
--- a/keyboards/bmini/keymaps/default/keymap.c
+++ b/keyboards/winkeyless/bmini/keymaps/default/keymap.c
diff --git a/keyboards/bmini/matrix.c b/keyboards/winkeyless/bmini/matrix.c
index 57aa36b5ff..57aa36b5ff 100644
--- a/keyboards/bmini/matrix.c
+++ b/keyboards/winkeyless/bmini/matrix.c
diff --git a/keyboards/bmini/readme.md b/keyboards/winkeyless/bmini/readme.md
index 9c70262129..3401b97444 100644
--- a/keyboards/bmini/readme.md
+++ b/keyboards/winkeyless/bmini/readme.md
@@ -1,5 +1,4 @@
-B.mini
-========
+# B.mini
A 75% keyboard with RGB
@@ -9,7 +8,7 @@ Hardware Availability: http://winkeyless.kr/product/b-mini-x2-pcb/
Make example for this keyboard (after setting up your build environment):
- make bmini:default
+ make winkeyless/bmini:default
Flashing
@@ -41,4 +40,4 @@ macOS:
5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file.
-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.
+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/bmini/rules.mk b/keyboards/winkeyless/bmini/rules.mk
index 3d7bc0215d..3d7bc0215d 100644
--- a/keyboards/bmini/rules.mk
+++ b/keyboards/winkeyless/bmini/rules.mk
diff --git a/keyboards/bmini/usbconfig.h b/keyboards/winkeyless/bmini/usbconfig.h
index d2d848fcdc..d2d848fcdc 100644
--- a/keyboards/bmini/usbconfig.h
+++ b/keyboards/winkeyless/bmini/usbconfig.h
diff --git a/keyboards/bminiex/backlight.c b/keyboards/winkeyless/bminiex/backlight.c
index 94e8126d88..94e8126d88 100644
--- a/keyboards/bminiex/backlight.c
+++ b/keyboards/winkeyless/bminiex/backlight.c
diff --git a/keyboards/bminiex/backlight_custom.h b/keyboards/winkeyless/bminiex/backlight_custom.h
index 51365fe3ba..51365fe3ba 100644
--- a/keyboards/bminiex/backlight_custom.h
+++ b/keyboards/winkeyless/bminiex/backlight_custom.h
diff --git a/keyboards/bminiex/bminiex.c b/keyboards/winkeyless/bminiex/bminiex.c
index d9b05aba51..d9b05aba51 100644
--- a/keyboards/bminiex/bminiex.c
+++ b/keyboards/winkeyless/bminiex/bminiex.c
diff --git a/keyboards/bminiex/bminiex.h b/keyboards/winkeyless/bminiex/bminiex.h
index 8d897f639f..8d897f639f 100644
--- a/keyboards/bminiex/bminiex.h
+++ b/keyboards/winkeyless/bminiex/bminiex.h
diff --git a/keyboards/bminiex/breathing_custom.h b/keyboards/winkeyless/bminiex/breathing_custom.h
index 71416b1b45..71416b1b45 100644
--- a/keyboards/bminiex/breathing_custom.h
+++ b/keyboards/winkeyless/bminiex/breathing_custom.h
diff --git a/keyboards/bminiex/config.h b/keyboards/winkeyless/bminiex/config.h
index ebd33ad61e..ebd33ad61e 100644
--- a/keyboards/bminiex/config.h
+++ b/keyboards/winkeyless/bminiex/config.h
diff --git a/keyboards/bminiex/i2c.c b/keyboards/winkeyless/bminiex/i2c.c
index a4f9521352..a4f9521352 100644
--- a/keyboards/bminiex/i2c.c
+++ b/keyboards/winkeyless/bminiex/i2c.c
diff --git a/keyboards/bminiex/i2c.h b/keyboards/winkeyless/bminiex/i2c.h
index ada8cc7bf1..ada8cc7bf1 100644
--- a/keyboards/bminiex/i2c.h
+++ b/keyboards/winkeyless/bminiex/i2c.h
diff --git a/keyboards/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index 8e38fbfb93..8e38fbfb93 100644
--- a/keyboards/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
diff --git a/keyboards/bminiex/keymaps/ansi/keymap.c b/keyboards/winkeyless/bminiex/keymaps/ansi/keymap.c
index 12c0714b13..12c0714b13 100644
--- a/keyboards/bminiex/keymaps/ansi/keymap.c
+++ b/keyboards/winkeyless/bminiex/keymaps/ansi/keymap.c
diff --git a/keyboards/bminiex/keymaps/ansi/readme.md b/keyboards/winkeyless/bminiex/keymaps/ansi/readme.md
index 853fa05c59..853fa05c59 100644
--- a/keyboards/bminiex/keymaps/ansi/readme.md
+++ b/keyboards/winkeyless/bminiex/keymaps/ansi/readme.md
diff --git a/keyboards/bminiex/keymaps/default/keymap.c b/keyboards/winkeyless/bminiex/keymaps/default/keymap.c
index ed949d74fb..ed949d74fb 100644
--- a/keyboards/bminiex/keymaps/default/keymap.c
+++ b/keyboards/winkeyless/bminiex/keymaps/default/keymap.c
diff --git a/keyboards/bminiex/keymaps/iso/keymap.c b/keyboards/winkeyless/bminiex/keymaps/iso/keymap.c
index aa4ddf063a..aa4ddf063a 100644
--- a/keyboards/bminiex/keymaps/iso/keymap.c
+++ b/keyboards/winkeyless/bminiex/keymaps/iso/keymap.c
diff --git a/keyboards/bminiex/keymaps/iso/readme.md b/keyboards/winkeyless/bminiex/keymaps/iso/readme.md
index 74c42a6184..74c42a6184 100644
--- a/keyboards/bminiex/keymaps/iso/readme.md
+++ b/keyboards/winkeyless/bminiex/keymaps/iso/readme.md
diff --git a/keyboards/bminiex/matrix.c b/keyboards/winkeyless/bminiex/matrix.c
index 8faaed8ac0..8faaed8ac0 100644
--- a/keyboards/bminiex/matrix.c
+++ b/keyboards/winkeyless/bminiex/matrix.c
diff --git a/keyboards/bminiex/readme.md b/keyboards/winkeyless/bminiex/readme.md
index 204bcbbb1b..7dbabedbaf 100644
--- a/keyboards/bminiex/readme.md
+++ b/keyboards/winkeyless/bminiex/readme.md
@@ -1,5 +1,4 @@
-B.mini EX
-=========
+# B.mini EX
A compact fullsize keyboard with RGB
@@ -9,6 +8,6 @@ Hardware Availability: https://winkeyless.kr/product/b-mini-ex-x2-pcb/
Make example for this keyboard (after setting up your build environment):
- make bminiex:default
+ make winkeyless/bminiex: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). \ No newline at end of file
+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/bminiex/rules.mk b/keyboards/winkeyless/bminiex/rules.mk
index e5d3a2a88c..e5d3a2a88c 100644
--- a/keyboards/bminiex/rules.mk
+++ b/keyboards/winkeyless/bminiex/rules.mk
diff --git a/keyboards/bminiex/usbconfig.h b/keyboards/winkeyless/bminiex/usbconfig.h
index d2d848fcdc..d2d848fcdc 100644
--- a/keyboards/bminiex/usbconfig.h
+++ b/keyboards/winkeyless/bminiex/usbconfig.h
diff --git a/keyboards/winkeyless/readme.md b/keyboards/winkeyless/readme.md
new file mode 100644
index 0000000000..e6cb45fc47
--- /dev/null
+++ b/keyboards/winkeyless/readme.md
@@ -0,0 +1,7 @@
+# Winkeyless
+
+[Winkeyless](https://www.winkeyless.kr) is a Korean keyboard company popular for creating the Boot Mapper Client (BMC) firmware. Most Winkeyless boards were low profile and constructed out of acrylic showcasing their RGB underglow capabilities.
+
+In late 2018, Winkeyless closed its doors due to the numerous unlicensed implementations of its hardware and software.
+
+This directory contains official Winkeyless boards that have had QMK ported to work with them.
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
index ec3286b097..e7b8951626 100644
--- a/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
+++ b/layouts/community/75_ansi/mechmerlin-75_ansi/keymap.c
@@ -9,13 +9,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, 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_PGUP,
KC_CTCP, 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_PGDN,
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_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FL] = LAYOUT_75_ansi(\
- KC_TRNS, RGB_TOG, RGB_MOD, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-}; \ No newline at end of file
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END)
+};
diff --git a/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md b/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md
index 12c9502703..ab7a9b92f7 100644
--- a/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md
+++ b/layouts/community/75_ansi/mechmerlin-75_ansi/readme.md
@@ -4,7 +4,8 @@ This is the 75% layout used by u/merlin36, host of the [MechMerlin](www.youtube.
YouTube channel.
It is used on his
-[Duck Octagon V2](https://github.com/qmk/qmk_firmware/tree/master/keyboards/octagon/v2)
+[Duck Octagon V2](https://github.com/qmk/qmk_firmware/tree/master/keyboards/duck/octagon/v2)
+[XD84](https://github.com/qmk/qmk_firmware/tree/master/keyboards/xd84)
### Build
To build the firmware file associated with this keymap, simply run `make your_keyboard:mechmerlin-ansi`.
diff --git a/layouts/default/75_iso/default_75_iso/keymap.c b/layouts/default/75_iso/default_75_iso/keymap.c
new file mode 100644
index 0000000000..2fcca4d2b5
--- /dev/null
+++ b/layouts/default/75_iso/default_75_iso/keymap.c
@@ -0,0 +1,13 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* layer 0: qwerty */
+ [0] = LAYOUT_75_iso(\
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+ KC_TAB, 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_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
diff --git a/layouts/default/75_iso/layout.json b/layouts/default/75_iso/layout.json
new file mode 100644
index 0000000000..6606d90e1d
--- /dev/null
+++ b/layouts/default/75_iso/layout.json
@@ -0,0 +1,6 @@
+[{a:7},"","","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","",{w:2},"",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",""],
+[{w:1.75},"","","","","","","","","","","","","",{x:1.25},""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""]
diff --git a/layouts/default/75_iso/readme.md b/layouts/default/75_iso/readme.md
new file mode 100644
index 0000000000..cbcaeaf9e5
--- /dev/null
+++ b/layouts/default/75_iso/readme.md
@@ -0,0 +1,3 @@
+# 75_iso
+
+ LAYOUT_75_iso \ No newline at end of file