diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 174704e99a..0dcda6f61d 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1140,6 +1140,12 @@
"mt980": {
"target": "mt/mt980"
},
+ "mt/ncr80/hotswap": {
+ "target": "mt/ncr80/r2/hotswap"
+ },
+ "mt/ncr80/solder": {
+ "target": "mt/ncr80/r2/solder"
+ },
"nafuda": {
"target": "salicylic_acid3/nafuda"
},
diff --git a/keyboards/mt/ncr80/hotswap/keyboard.json b/keyboards/mt/ncr80/hotswap/keyboard.json
deleted file mode 100644
index 6f82bb0e78..0000000000
--- a/keyboards/mt/ncr80/hotswap/keyboard.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
- "keyboard_name": "NCR-80 Hotswap",
- "manufacturer": "NCR",
- "url": "https://www.aliexpress.com/item/1005003345941543.html",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4D54",
- "pid": "0x2002",
- "device_version": "0.0.1"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "nkro": true
- },
- "matrix_pins": {
- "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
- "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
- },
- "diode_direction": "ROW2COL",
- "indicators": {
- "caps_lock": "C6",
- "num_lock": "B5",
- "scroll_lock": "C7",
- "on_state": 0
- },
- "ws2812": {
- "pin": "E2"
- },
- "rgblight": {
- "saturation_steps": 8,
- "brightness_steps": 8,
- "led_count": 81,
- "max_brightness": 180,
- "animations": {
- "breathing": true,
- "rainbow_mood": true,
- "rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
- "rgb_test": true,
- "alternating": true,
- "twinkle": true
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
-
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 3, "y": 0, "matrix": [0, 3]},
- {"x": 4, "y": 0, "matrix": [0, 4]},
- {"x": 5, "y": 0, "matrix": [0, 5]},
-
- {"x": 6.5, "y": 0, "matrix": [0, 6]},
- {"x": 7.5, "y": 0, "matrix": [0, 7]},
- {"x": 8.5, "y": 0, "matrix": [0, 8]},
- {"x": 9.5, "y": 0, "matrix": [6, 8]},
-
- {"x": 11, "y": 0, "matrix": [6, 7]},
- {"x": 12, "y": 0, "matrix": [6, 5]},
- {"x": 13, "y": 0, "matrix": [6, 4]},
- {"x": 14, "y": 0, "matrix": [6, 3]},
-
- {"x": 0, "y": 1.5, "matrix": [1, 0]},
- {"x": 1, "y": 1.5, "matrix": [1, 1]},
- {"x": 2, "y": 1.5, "matrix": [1, 2]},
- {"x": 3, "y": 1.5, "matrix": [1, 3]},
- {"x": 4, "y": 1.5, "matrix": [1, 4]},
- {"x": 5, "y": 1.5, "matrix": [1, 5]},
- {"x": 6, "y": 1.5, "matrix": [1, 6]},
- {"x": 7, "y": 1.5, "matrix": [1, 7]},
- {"x": 8, "y": 1.5, "matrix": [1, 8]},
- {"x": 9, "y": 1.5, "matrix": [7, 8]},
- {"x": 10, "y": 1.5, "matrix": [7, 0]},
- {"x": 11, "y": 1.5, "matrix": [7, 7]},
- {"x": 12, "y": 1.5, "matrix": [7, 5]},
- {"x": 13, "y": 1.5, "w": 2, "matrix": [7, 3]},
-
- {"x": 15.25, "y": 1.5, "matrix": [7, 6]},
- {"x": 16.25, "y": 1.5, "matrix": [7, 2]},
- {"x": 17.25, "y": 1.5, "matrix": [7, 1]},
-
- {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
- {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
- {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
- {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
- {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
- {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
- {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
- {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
- {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
- {"x": 9.5, "y": 2.5, "matrix": [8, 8]},
- {"x": 10.5, "y": 2.5, "matrix": [8, 7]},
- {"x": 11.5, "y": 2.5, "matrix": [8, 5]},
- {"x": 12.5, "y": 2.5, "matrix": [8, 4]},
- {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [8, 3]},
-
- {"x": 15.25, "y": 2.5, "matrix": [8, 6]},
- {"x": 16.25, "y": 2.5, "matrix": [8, 2]},
- {"x": 17.25, "y": 2.5, "matrix": [8, 1]},
-
- {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
- {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
- {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
- {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
- {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
- {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
- {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
- {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
- {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
- {"x": 9.75, "y": 3.5, "matrix": [9, 8]},
- {"x": 10.75, "y": 3.5, "matrix": [9, 7]},
- {"x": 11.75, "y": 3.5, "matrix": [9, 5]},
- {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [9, 3]},
-
- {"x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0]},
- {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
- {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
- {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
- {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
- {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
- {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
- {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
- {"x": 9.25, "y": 4.5, "matrix": [10, 8]},
- {"x": 10.25, "y": 4.5, "matrix": [10, 7]},
- {"x": 11.25, "y": 4.5, "matrix": [10, 5]},
- {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [10, 4]},
-
- {"x": 16.25, "y": 4.5, "matrix": [9, 2]},
-
- {"x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0]},
- {"x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2]},
- {"x": 4, "y": 5.5, "w": 7, "matrix": [5, 6]},
- {"x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 7]},
- {"x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 3]},
-
- {"x": 15.25, "y": 5.5, "matrix": [10, 6]},
- {"x": 16.25, "y": 5.5, "matrix": [10, 2]},
- {"x": 17.25, "y": 5.5, "matrix": [10, 1]}
- ]
- }
- }
-}
diff --git a/keyboards/mt/ncr80/hotswap/keymaps/via/keymap.c b/keyboards/mt/ncr80/hotswap/keymaps/via/keymap.c
deleted file mode 100644
index e23de81b78..0000000000
--- a/keyboards/mt/ncr80/hotswap/keymaps/via/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2022 peepeetee
- *
- * 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(
- 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_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_INS, KC_HOME, KC_PGUP,
- 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_DEL, KC_END, KC_PGDN,
- 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_ENT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
- [1] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______),
- [2] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______),
- [3] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______),
-
-};
diff --git a/keyboards/mt/ncr80/hotswap/readme.md b/keyboards/mt/ncr80/hotswap/readme.md
deleted file mode 100644
index 5f9aa43c3e..0000000000
--- a/keyboards/mt/ncr80/hotswap/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# NCR-80
-
-![NCR-80](https://i.imgur.com/kAjbAPLl.jpg)
-
-> Re-imagination of the classic rebranded Cherry G81-3000 by NCR
-
-NCR-80 is an affordable keyboard kit inspired by iconic vintage keyboards.
-
-* Keyboard Maintainer: QMK Community
-* Hardware Supported: ATmega32U4
-* Hardware Availability: [AliExpress](https://www.aliexpress.com/item/1005003345941543.html) [Taobao 淘宝](https://item.taobao.com/item.htm?id=657482028672)
-
-Make example for this keyboard (after setting up your build environment):
-
- make ncr80/hotswap:default
-
-Flashing example for this keyboard:
-
- make ncr80/hotswap: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).
-
-## Bootloader
-
-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
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
-
-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/mt/ncr80/info.json b/keyboards/mt/ncr80/info.json
new file mode 100644
index 0000000000..3573e72012
--- /dev/null
+++ b/keyboards/mt/ncr80/info.json
@@ -0,0 +1,8 @@
+{
+ "manufacturer": "MT",
+ "keyboard_name": "NCR-80",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4D54"
+ }
+}
diff --git a/keyboards/mt/ncr80/r2/hotswap/keyboard.json b/keyboards/mt/ncr80/r2/hotswap/keyboard.json
new file mode 100644
index 0000000000..fbd10e0ee8
--- /dev/null
+++ b/keyboards/mt/ncr80/r2/hotswap/keyboard.json
@@ -0,0 +1,122 @@
+{
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "rgblight": {
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ },
+ "brightness_steps": 8,
+ "led_count": 81,
+ "max_brightness": 180,
+ "saturation_steps": 8
+ },
+ "url": "https://www.aliexpress.com/item/1005003345941543.html",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x2002"
+ },
+ "ws2812": {
+ "pin": "E2"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mt/ncr80/hotswap/keymaps/default/keymap.c b/keyboards/mt/ncr80/r2/hotswap/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mt/ncr80/hotswap/keymaps/default/keymap.c
rename to keyboards/mt/ncr80/r2/hotswap/keymaps/default/keymap.c
diff --git a/keyboards/mt/ncr80/r2/hotswap/keymaps/via/keymap.c b/keyboards/mt/ncr80/r2/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..91afb7c4f7
--- /dev/null
+++ b/keyboards/mt/ncr80/r2/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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(
+ 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_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_INS, KC_HOME, KC_PGUP,
+ 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_DEL, KC_END, KC_PGDN,
+ 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_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
diff --git a/keyboards/mt/ncr80/hotswap/keymaps/via/rules.mk b/keyboards/mt/ncr80/r2/hotswap/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mt/ncr80/hotswap/keymaps/via/rules.mk
rename to keyboards/mt/ncr80/r2/hotswap/keymaps/via/rules.mk
diff --git a/keyboards/mt/ncr80/r2/info.json b/keyboards/mt/ncr80/r2/info.json
new file mode 100644
index 0000000000..214153235e
--- /dev/null
+++ b/keyboards/mt/ncr80/r2/info.json
@@ -0,0 +1,15 @@
+{
+ "bootloader": "atmel-dfu",
+ "diode_direction": "ROW2COL",
+ "indicators": {
+ "caps_lock": "C6",
+ "num_lock": "B5",
+ "on_state": 0,
+ "scroll_lock": "C7"
+ },
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
+ "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
+ },
+ "processor": "atmega32u4"
+}
diff --git a/keyboards/mt/ncr80/r2/solder/keyboard.json b/keyboards/mt/ncr80/r2/solder/keyboard.json
new file mode 100644
index 0000000000..8c7265614a
--- /dev/null
+++ b/keyboards/mt/ncr80/r2/solder/keyboard.json
@@ -0,0 +1,1209 @@
+{
+ "backlight": {
+ "levels": 5,
+ "pin": "B6"
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "url": "https://www.aliexpress.com/item/1005003364462523.html",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x2001"
+ },
+ "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_ansi_wkl", "tkl_ansi_wkl_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift", "tkl_iso_wkl", "tkl_iso_wkl_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5},
+ {"matrix": [7, 3], "x": 14, "y": 1.5},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 3], "x": 14, "y": 4.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5},
+ {"matrix": [7, 3], "x": 14, "y": 1.5},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 3], "x": 14, "y": 4.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5},
+ {"matrix": [7, 3], "x": 14, "y": 1.5},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 3], "x": 14, "y": 4.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5},
+ {"matrix": [7, 3], "x": 14, "y": 1.5},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 3], "x": 14, "y": 4.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 12.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5},
+ {"matrix": [7, 3], "x": 14, "y": 1.5},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 12.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 3], "x": 14, "y": 4.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 12.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5},
+ {"matrix": [7, 3], "x": 14, "y": 1.5},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 12.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 3], "x": 14, "y": 4.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 4], "x": 12.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 12.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ },
+ "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [6, 8], "x": 9.5, "y": 0},
+ {"matrix": [6, 7], "x": 11, "y": 0},
+ {"matrix": [6, 5], "x": 12, "y": 0},
+ {"matrix": [6, 4], "x": 13, "y": 0},
+ {"matrix": [6, 3], "x": 14, "y": 0},
+ {"matrix": [6, 6], "x": 15.25, "y": 0},
+ {"matrix": [6, 2], "x": 16.25, "y": 0},
+ {"matrix": [6, 1], "x": 17.25, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [7, 8], "x": 9, "y": 1.5},
+ {"matrix": [7, 0], "x": 10, "y": 1.5},
+ {"matrix": [7, 7], "x": 11, "y": 1.5},
+ {"matrix": [7, 5], "x": 12, "y": 1.5},
+ {"matrix": [7, 4], "x": 13, "y": 1.5},
+ {"matrix": [7, 3], "x": 14, "y": 1.5},
+ {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+ {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+ {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+ {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+ {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+ {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+ {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+ {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+ {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+ {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [9, 4], "x": 12.75, "y": 3.5},
+ {"matrix": [8, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+ {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+ {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 3], "x": 14, "y": 4.5},
+ {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+ {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+ {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 17.25, "y": 5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mt/ncr80/solder/keymaps/default/keymap.c b/keyboards/mt/ncr80/r2/solder/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mt/ncr80/solder/keymaps/default/keymap.c
rename to keyboards/mt/ncr80/r2/solder/keymaps/default/keymap.c
diff --git a/keyboards/mt/ncr80/solder/keymaps/default_tkl_ansi/keymap.c b/keyboards/mt/ncr80/r2/solder/keymaps/default_tkl_ansi/keymap.c
similarity index 100%
rename from keyboards/mt/ncr80/solder/keymaps/default_tkl_ansi/keymap.c
rename to keyboards/mt/ncr80/r2/solder/keymaps/default_tkl_ansi/keymap.c
diff --git a/keyboards/mt/ncr80/solder/keymaps/default_tkl_iso/keymap.c b/keyboards/mt/ncr80/r2/solder/keymaps/default_tkl_iso/keymap.c
similarity index 100%
rename from keyboards/mt/ncr80/solder/keymaps/default_tkl_iso/keymap.c
rename to keyboards/mt/ncr80/r2/solder/keymaps/default_tkl_iso/keymap.c
diff --git a/keyboards/mt/ncr80/solder/keymaps/via/keymap.c b/keyboards/mt/ncr80/r2/solder/keymaps/via/keymap.c
similarity index 57%
rename from keyboards/mt/ncr80/solder/keymaps/via/keymap.c
rename to keyboards/mt/ncr80/r2/solder/keymaps/via/keymap.c
index 493165c22f..66cdca8a71 100644
--- a/keyboards/mt/ncr80/solder/keymaps/via/keymap.c
+++ b/keyboards/mt/ncr80/r2/solder/keymaps/via/keymap.c
@@ -34,24 +34,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, BL_DOWN, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______
- ),
-
- [2] = LAYOUT_all(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
- [3] = LAYOUT_all(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
+ )
};
diff --git a/keyboards/mt/ncr80/solder/keymaps/via/rules.mk b/keyboards/mt/ncr80/r2/solder/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mt/ncr80/solder/keymaps/via/rules.mk
rename to keyboards/mt/ncr80/r2/solder/keymaps/via/rules.mk
diff --git a/keyboards/mt/ncr80/readme.md b/keyboards/mt/ncr80/readme.md
index 210822f28e..1211efa720 100644
--- a/keyboards/mt/ncr80/readme.md
+++ b/keyboards/mt/ncr80/readme.md
@@ -6,11 +6,29 @@
NCR-80 is an affordable keyboard kit inspired by iconic vintage keyboards.
-For more information, read the readme.md in soldered/ or hotswap/, depending on the version you are interested in.
+* Keyboard Maintainer: QMK Community
+* Hardware Supported:
+ * NCR-80 R2 PCBs (ATmega32U4, atmel-dfu)
+* Hardware Availability:
+ * R2 Hotswap: [AliExpress](https://www.aliexpress.com/item/1005003345941543.html) [Taobao 淘宝](https://item.taobao.com/item.htm?id=657482028672)
+ * R2 Solder: [AliExpress](https://www.aliexpress.com/item/1005003364462523.html) [Taobao 淘宝](https://item.taobao.com/item.htm?id=657482028672)
Make example for this keyboard (after setting up your build environment):
- make ncr80/solder:default
- make ncr80/hotswap:default
+ make mt/ncr80/r2/hotswap:default
+ make mt/ncr80/r2/solder:default
-For more information, read the readme.md in [solder/](solder/) or [hotswap/](hotswap/), depending on the version you are interested in.
+Flashing example for this keyboard:
+
+ make mt/ncr80/r2/hotswap:default:flash
+ make mt/ncr80/r2/solder: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear EEPROM, so it is a good first step if the keyboard is misbehaving.
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymaps, but you may assign this key in any keymaps you create.
diff --git a/keyboards/mt/ncr80/rules.mk b/keyboards/mt/ncr80/rules.mk
deleted file mode 100644
index 5ebd6454f6..0000000000
--- a/keyboards/mt/ncr80/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mt/ncr80/hotswap
diff --git a/keyboards/mt/ncr80/solder/keyboard.json b/keyboards/mt/ncr80/solder/keyboard.json
deleted file mode 100644
index fac59abadd..0000000000
--- a/keyboards/mt/ncr80/solder/keyboard.json
+++ /dev/null
@@ -1,352 +0,0 @@
-{
- "keyboard_name": "NCR-80",
- "manufacturer": "NCR",
- "url": "https://www.aliexpress.com/item/1005003364462523.html",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4D54",
- "pid": "0x2001",
- "device_version": "0.0.1"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "nkro": true,
- "backlight": true
- },
- "matrix_pins": {
- "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
- "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"]
- },
- "diode_direction": "ROW2COL",
- "backlight": {
- "pin": "B6",
- "levels": 5
- },
- "indicators": {
- "caps_lock": "C6",
- "num_lock": "B5",
- "scroll_lock": "C7",
- "on_state": 0
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
-
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 3, "y": 0, "matrix": [0, 3]},
- {"x": 4, "y": 0, "matrix": [0, 4]},
- {"x": 5, "y": 0, "matrix": [0, 5]},
-
- {"x": 6.5, "y": 0, "matrix": [0, 6]},
- {"x": 7.5, "y": 0, "matrix": [0, 7]},
- {"x": 8.5, "y": 0, "matrix": [0, 8]},
- {"x": 9.5, "y": 0, "matrix": [6, 8]},
-
- {"x": 11, "y": 0, "matrix": [6, 7]},
- {"x": 12, "y": 0, "matrix": [6, 5]},
- {"x": 13, "y": 0, "matrix": [6, 4]},
- {"x": 14, "y": 0, "matrix": [6, 3]},
-
- {"x": 15.25, "y": 0, "matrix": [6, 6]},
- {"x": 16.25, "y": 0, "matrix": [6, 2]},
- {"x": 17.25, "y": 0, "matrix": [6, 1]},
-
- {"x": 0, "y": 1.5, "matrix": [1, 0]},
- {"x": 1, "y": 1.5, "matrix": [1, 1]},
- {"x": 2, "y": 1.5, "matrix": [1, 2]},
- {"x": 3, "y": 1.5, "matrix": [1, 3]},
- {"x": 4, "y": 1.5, "matrix": [1, 4]},
- {"x": 5, "y": 1.5, "matrix": [1, 5]},
- {"x": 6, "y": 1.5, "matrix": [1, 6]},
- {"x": 7, "y": 1.5, "matrix": [1, 7]},
- {"x": 8, "y": 1.5, "matrix": [1, 8]},
- {"x": 9, "y": 1.5, "matrix": [7, 8]},
- {"x": 10, "y": 1.5, "matrix": [7, 0]},
- {"x": 11, "y": 1.5, "matrix": [7, 7]},
- {"x": 12, "y": 1.5, "matrix": [7, 5]},
- {"x": 13, "y": 1.5, "matrix": [7, 4]},
- {"x": 14, "y": 1.5, "matrix": [7, 3]},
-
- {"x": 15.25, "y": 1.5, "matrix": [7, 6]},
- {"x": 16.25, "y": 1.5, "matrix": [7, 2]},
- {"x": 17.25, "y": 1.5, "matrix": [7, 1]},
-
- {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
- {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
- {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
- {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
- {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
- {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
- {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
- {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
- {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
- {"x": 9.5, "y": 2.5, "matrix": [8, 8]},
- {"x": 10.5, "y": 2.5, "matrix": [8, 7]},
- {"x": 11.5, "y": 2.5, "matrix": [8, 5]},
- {"x": 12.5, "y": 2.5, "matrix": [8, 4]},
- {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [9, 4]},
-
- {"x": 15.25, "y": 2.5, "matrix": [8, 6]},
- {"x": 16.25, "y": 2.5, "matrix": [8, 2]},
- {"x": 17.25, "y": 2.5, "matrix": [8, 1]},
-
- {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
- {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
- {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
- {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
- {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
- {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
- {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
- {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
- {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
- {"x": 9.75, "y": 3.5, "matrix": [9, 8]},
- {"x": 10.75, "y": 3.5, "matrix": [9, 7]},
- {"x": 11.75, "y": 3.5, "matrix": [9, 5]},
- {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [8, 3]},
-
- {"x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0]},
- {"x": 1.25, "y": 4.5, "matrix": [4, 1]},
- {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
- {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
- {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
- {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
- {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
- {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
- {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
- {"x": 9.25, "y": 4.5, "matrix": [10, 8]},
- {"x": 10.25, "y": 4.5, "matrix": [10, 7]},
- {"x": 11.25, "y": 4.5, "matrix": [10, 5]},
- {"x": 12.25, "y": 4.5, "w": 1.75, "matrix": [10, 4]},
- {"x": 14, "y": 4.5, "matrix": [10, 3]},
-
- {"x": 16.25, "y": 4.5, "matrix": [9, 2]},
-
- {"x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]},
- {"x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]},
- {"x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]},
- {"x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 6]},
- {"x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 8]},
- {"x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 7]},
- {"x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 4]},
- {"x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 3]},
-
- {"x": 15.25, "y": 5.5, "matrix": [10, 6]},
- {"x": 16.25, "y": 5.5, "matrix": [10, 2]},
- {"x": 17.25, "y": 5.5, "matrix": [10, 1]}
- ]
- },
- "LAYOUT_tkl_ansi": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
-
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 3, "y": 0, "matrix": [0, 3]},
- {"x": 4, "y": 0, "matrix": [0, 4]},
- {"x": 5, "y": 0, "matrix": [0, 5]},
-
- {"x": 6.5, "y": 0, "matrix": [0, 6]},
- {"x": 7.5, "y": 0, "matrix": [0, 7]},
- {"x": 8.5, "y": 0, "matrix": [0, 8]},
- {"x": 9.5, "y": 0, "matrix": [6, 8]},
-
- {"x": 11, "y": 0, "matrix": [6, 7]},
- {"x": 12, "y": 0, "matrix": [6, 5]},
- {"x": 13, "y": 0, "matrix": [6, 4]},
- {"x": 14, "y": 0, "matrix": [6, 3]},
-
- {"x": 15.25, "y": 0, "matrix": [6, 6]},
- {"x": 16.25, "y": 0, "matrix": [6, 2]},
- {"x": 17.25, "y": 0, "matrix": [6, 1]},
-
- {"x": 0, "y": 1.25, "matrix": [1, 0]},
- {"x": 1, "y": 1.25, "matrix": [1, 1]},
- {"x": 2, "y": 1.25, "matrix": [1, 2]},
- {"x": 3, "y": 1.25, "matrix": [1, 3]},
- {"x": 4, "y": 1.25, "matrix": [1, 4]},
- {"x": 5, "y": 1.25, "matrix": [1, 5]},
- {"x": 6, "y": 1.25, "matrix": [1, 6]},
- {"x": 7, "y": 1.25, "matrix": [1, 7]},
- {"x": 8, "y": 1.25, "matrix": [1, 8]},
- {"x": 9, "y": 1.25, "matrix": [7, 8]},
- {"x": 10, "y": 1.25, "matrix": [7, 0]},
- {"x": 11, "y": 1.25, "matrix": [7, 7]},
- {"x": 12, "y": 1.25, "matrix": [7, 5]},
- {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]},
-
- {"x": 15.25, "y": 1.25, "matrix": [7, 6]},
- {"x": 16.25, "y": 1.25, "matrix": [7, 2]},
- {"x": 17.25, "y": 1.25, "matrix": [7, 1]},
-
- {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
- {"x": 1.5, "y": 2.25, "matrix": [2, 1]},
- {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
- {"x": 3.5, "y": 2.25, "matrix": [2, 3]},
- {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
- {"x": 5.5, "y": 2.25, "matrix": [2, 5]},
- {"x": 6.5, "y": 2.25, "matrix": [2, 6]},
- {"x": 7.5, "y": 2.25, "matrix": [2, 7]},
- {"x": 8.5, "y": 2.25, "matrix": [2, 8]},
- {"x": 9.5, "y": 2.25, "matrix": [8, 8]},
- {"x": 10.5, "y": 2.25, "matrix": [8, 7]},
- {"x": 11.5, "y": 2.25, "matrix": [8, 5]},
- {"x": 12.5, "y": 2.25, "matrix": [8, 4]},
- {"x": 13.5, "y": 2.25, "w": 1.5, "matrix": [9, 4]},
-
- {"x": 15.25, "y": 2.25, "matrix": [8, 6]},
- {"x": 16.25, "y": 2.25, "matrix": [8, 2]},
- {"x": 17.25, "y": 2.25, "matrix": [8, 1]},
-
- {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
- {"x": 1.75, "y": 3.25, "matrix": [3, 1]},
- {"x": 2.75, "y": 3.25, "matrix": [3, 2]},
- {"x": 3.75, "y": 3.25, "matrix": [3, 3]},
- {"x": 4.75, "y": 3.25, "matrix": [3, 4]},
- {"x": 5.75, "y": 3.25, "matrix": [3, 5]},
- {"x": 6.75, "y": 3.25, "matrix": [3, 6]},
- {"x": 7.75, "y": 3.25, "matrix": [3, 7]},
- {"x": 8.75, "y": 3.25, "matrix": [3, 8]},
- {"x": 9.75, "y": 3.25, "matrix": [9, 8]},
- {"x": 10.75, "y": 3.25, "matrix": [9, 7]},
- {"x": 11.75, "y": 3.25, "matrix": [9, 5]},
- {"x": 12.75, "y": 3.25, "w": 2.25, "matrix": [8, 3]},
-
- {"x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 0]},
- {"x": 2.25, "y": 4.25, "matrix": [4, 2]},
- {"x": 3.25, "y": 4.25, "matrix": [4, 3]},
- {"x": 4.25, "y": 4.25, "matrix": [4, 4]},
- {"x": 5.25, "y": 4.25, "matrix": [4, 5]},
- {"x": 6.25, "y": 4.25, "matrix": [4, 6]},
- {"x": 7.25, "y": 4.25, "matrix": [4, 7]},
- {"x": 8.25, "y": 4.25, "matrix": [4, 8]},
- {"x": 9.25, "y": 4.25, "matrix": [10, 8]},
- {"x": 10.25, "y": 4.25, "matrix": [10, 7]},
- {"x": 11.25, "y": 4.25, "matrix": [10, 5]},
- {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]},
-
- {"x": 16.25, "y": 4.25, "matrix": [9, 2]},
-
- {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
- {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
- {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
- {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
- {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]},
- {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]},
- {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]},
- {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
- {"x": 15.25, "y": 5.25, "matrix": [10, 6]},
- {"x": 16.25, "y": 5.25, "matrix": [10, 2]},
- {"x": 17.25, "y": 5.25, "matrix": [10, 1]}
- ]
- },
- "LAYOUT_tkl_iso": {
- "layout": [
- {"x": 0, "y": 0, "matrix": [0, 0]},
-
- {"x": 2, "y": 0, "matrix": [0, 2]},
- {"x": 3, "y": 0, "matrix": [0, 3]},
- {"x": 4, "y": 0, "matrix": [0, 4]},
- {"x": 5, "y": 0, "matrix": [0, 5]},
-
- {"x": 6.5, "y": 0, "matrix": [0, 6]},
- {"x": 7.5, "y": 0, "matrix": [0, 7]},
- {"x": 8.5, "y": 0, "matrix": [0, 8]},
- {"x": 9.5, "y": 0, "matrix": [6, 8]},
-
- {"x": 11, "y": 0, "matrix": [6, 7]},
- {"x": 12, "y": 0, "matrix": [6, 5]},
- {"x": 13, "y": 0, "matrix": [6, 4]},
- {"x": 14, "y": 0, "matrix": [6, 3]},
-
- {"x": 15.25, "y": 0, "matrix": [6, 6]},
- {"x": 16.25, "y": 0, "matrix": [6, 2]},
- {"x": 17.25, "y": 0, "matrix": [6, 1]},
-
- {"x": 0, "y": 1.25, "matrix": [1, 0]},
- {"x": 1, "y": 1.25, "matrix": [1, 1]},
- {"x": 2, "y": 1.25, "matrix": [1, 2]},
- {"x": 3, "y": 1.25, "matrix": [1, 3]},
- {"x": 4, "y": 1.25, "matrix": [1, 4]},
- {"x": 5, "y": 1.25, "matrix": [1, 5]},
- {"x": 6, "y": 1.25, "matrix": [1, 6]},
- {"x": 7, "y": 1.25, "matrix": [1, 7]},
- {"x": 8, "y": 1.25, "matrix": [1, 8]},
- {"x": 9, "y": 1.25, "matrix": [7, 8]},
- {"x": 10, "y": 1.25, "matrix": [7, 0]},
- {"x": 11, "y": 1.25, "matrix": [7, 7]},
- {"x": 12, "y": 1.25, "matrix": [7, 5]},
- {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]},
-
- {"x": 15.25, "y": 1.25, "matrix": [7, 6]},
- {"x": 16.25, "y": 1.25, "matrix": [7, 2]},
- {"x": 17.25, "y": 1.25, "matrix": [7, 1]},
-
- {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
- {"x": 1.5, "y": 2.25, "matrix": [2, 1]},
- {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
- {"x": 3.5, "y": 2.25, "matrix": [2, 3]},
- {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
- {"x": 5.5, "y": 2.25, "matrix": [2, 5]},
- {"x": 6.5, "y": 2.25, "matrix": [2, 6]},
- {"x": 7.5, "y": 2.25, "matrix": [2, 7]},
- {"x": 8.5, "y": 2.25, "matrix": [2, 8]},
- {"x": 9.5, "y": 2.25, "matrix": [8, 8]},
- {"x": 10.5, "y": 2.25, "matrix": [8, 7]},
- {"x": 11.5, "y": 2.25, "matrix": [8, 5]},
- {"x": 12.5, "y": 2.25, "matrix": [8, 4]},
-
- {"x": 15.25, "y": 2.25, "matrix": [8, 6]},
- {"x": 16.25, "y": 2.25, "matrix": [8, 2]},
- {"x": 17.25, "y": 2.25, "matrix": [8, 1]},
-
- {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
- {"x": 1.75, "y": 3.25, "matrix": [3, 1]},
- {"x": 2.75, "y": 3.25, "matrix": [3, 2]},
- {"x": 3.75, "y": 3.25, "matrix": [3, 3]},
- {"x": 4.75, "y": 3.25, "matrix": [3, 4]},
- {"x": 5.75, "y": 3.25, "matrix": [3, 5]},
- {"x": 6.75, "y": 3.25, "matrix": [3, 6]},
- {"x": 7.75, "y": 3.25, "matrix": [3, 7]},
- {"x": 8.75, "y": 3.25, "matrix": [3, 8]},
- {"x": 9.75, "y": 3.25, "matrix": [9, 8]},
- {"x": 10.75, "y": 3.25, "matrix": [9, 7]},
- {"x": 11.75, "y": 3.25, "matrix": [9, 5]},
- {"x": 12.75, "y": 3.25, "matrix": [9, 4]},
- {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2, "matrix": [8, 3]},
-
- {"x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
- {"x": 1.25, "y": 4.25, "matrix": [4, 1]},
- {"x": 2.25, "y": 4.25, "matrix": [4, 2]},
- {"x": 3.25, "y": 4.25, "matrix": [4, 3]},
- {"x": 4.25, "y": 4.25, "matrix": [4, 4]},
- {"x": 5.25, "y": 4.25, "matrix": [4, 5]},
- {"x": 6.25, "y": 4.25, "matrix": [4, 6]},
- {"x": 7.25, "y": 4.25, "matrix": [4, 7]},
- {"x": 8.25, "y": 4.25, "matrix": [4, 8]},
- {"x": 9.25, "y": 4.25, "matrix": [10, 8]},
- {"x": 10.25, "y": 4.25, "matrix": [10, 7]},
- {"x": 11.25, "y": 4.25, "matrix": [10, 5]},
- {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]},
-
- {"x": 16.25, "y": 4.25, "matrix": [9, 2]},
-
- {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
- {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
- {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
- {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
- {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]},
- {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]},
- {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]},
- {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
-
- {"x": 15.25, "y": 5.25, "matrix": [10, 6]},
- {"x": 16.25, "y": 5.25, "matrix": [10, 2]},
- {"x": 17.25, "y": 5.25, "matrix": [10, 1]}
- ]
- }
- }
-}
diff --git a/keyboards/mt/ncr80/solder/readme.md b/keyboards/mt/ncr80/solder/readme.md
deleted file mode 100644
index 9333c57ac1..0000000000
--- a/keyboards/mt/ncr80/solder/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# NCR-80
-
-![NCR-80](https://i.imgur.com/kAjbAPLl.jpg)
-
-> Re-imagination of the classic rebranded Cherry G81-3000 by NCR
-
-NCR-80 is an affordable keyboard kit inspired by iconic vintage keyboards.
-
-* Keyboard Maintainer: QMK Community
-* Hardware Supported: ATmega32U4
-* Hardware Availability: [AliExpress](https://www.aliexpress.com/item/1005003364462523.html) [Taobao 淘宝](https://item.taobao.com/item.htm?id=657482028672)
-
-Make example for this keyboard (after setting up your build environment):
-
- make ncr80/solder:default
-
-Flashing example for this keyboard:
-
- make ncr80/solder:default:flash
-
-## Bootloader
-
-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
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
-
-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