summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/1upkeyboards/pi40/config.h11
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/config.h6
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/info.json149
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/info.json128
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/default/keymap.c36
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/via/keymap.c82
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/config.h4
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/info.json148
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/config.h4
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/info.json148
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk0
-rw-r--r--keyboards/1upkeyboards/pi40/pi40.c22
-rw-r--r--keyboards/1upkeyboards/pi40/rules.mk21
-rw-r--r--keyboards/lily58/r2g/readme.md26
-rw-r--r--keyboards/viktus/minne/info.json363
-rw-r--r--keyboards/viktus/minne/keymaps/default/keymap.c26
-rw-r--r--keyboards/viktus/minne/keymaps/via/keymap.c26
-rw-r--r--keyboards/viktus/minne/keymaps/via/rules.mk1
-rw-r--r--keyboards/viktus/minne/readme.md27
-rw-r--r--keyboards/viktus/minne/rules.mk1
-rw-r--r--keyboards/yandrstudio/transition80/board.h15
-rw-r--r--keyboards/yandrstudio/transition80/info.json129
-rw-r--r--keyboards/yandrstudio/transition80/keymaps/default/keymap.c14
-rw-r--r--keyboards/yandrstudio/transition80/keymaps/via/keymap.c35
-rw-r--r--keyboards/yandrstudio/transition80/keymaps/via/rules.mk1
-rw-r--r--keyboards/yandrstudio/transition80/mcuconf.h9
-rw-r--r--keyboards/yandrstudio/transition80/readme.md26
-rw-r--r--keyboards/yandrstudio/transition80/rules.mk1
30 files changed, 1209 insertions, 250 deletions
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 858e5682d4..ecc8d2611a 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -3,23 +3,16 @@
#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 10
-
-#ifdef OLED_ENABLE
-# define OLED_DISPLAY_128X32
+#define OLED_DISPLAY_128X32
#define I2C1_SCL_PIN GP17
#define I2C1_SDA_PIN GP16
#define I2C_DRIVER I2CD0
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
-#endif
#define RGB_DI_PIN GP0
-#define RGB_MATRIX_LED_COUNT 47
-#define RGBLED_NUM 47
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
# define RGBLIGHT_LIMIT_VAL 150
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/config.h b/keyboards/1upkeyboards/pi40/grid_v1_1/config.h
new file mode 100644
index 0000000000..00ed9f3196
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RGB_MATRIX_LED_COUNT 48 \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
new file mode 100644
index 0000000000..b3c64f7dd4
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -0,0 +1,149 @@
+{
+ "keyboard_name": "pi40",
+ "manufacturer": "1upkeyboards",
+ "maintainer": "ziptyze",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5600",
+ "device_version": "1.1.0"
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true,
+ "rgblight": false
+ },
+ "matrix_pins": {
+ "rows": [ "GP21", "GP20", "GP19", "GP18" ],
+ "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {
+ "pin_a": "GP14",
+ "pin_b": "GP13"
+ }
+ ]
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
+ { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
+ { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
+ { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
+ { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
+ { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
+ { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
+ { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
+ { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
+ { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
+ { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
+ { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
+ { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
+ { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
+ { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
+ { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
+ { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
+ { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
+ { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
+ { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
+ { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
+ { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
+ { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
+ { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
+ { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
+ { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
+ { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
+ { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
+ { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
+ { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
+ { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
+ { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
+ { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
+ { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
+ { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
+ { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
+ { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
+ { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
+ { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
+ { "flags": 1, "matrix": [3, 6], "x": 121, "y": 56 },
+ { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
+ { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
+ { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
+ { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
+ { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 },
+ { "flags": 1, "matrix": [3, 5], "x": 102, "y": 56 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ { "matrix": [0, 12], "x": 11, "y": 0 },
+ { "matrix": [0, 0], "x": 0, "y": 1 },
+ { "matrix": [0, 1], "x": 1, "y": 1 },
+ { "matrix": [0, 2], "x": 2, "y": 1 },
+ { "matrix": [0, 3], "x": 3, "y": 1 },
+ { "matrix": [0, 4], "x": 4, "y": 1 },
+ { "matrix": [0, 5], "x": 5, "y": 1 },
+ { "matrix": [0, 6], "x": 6, "y": 1 },
+ { "matrix": [0, 7], "x": 7, "y": 1 },
+ { "matrix": [0, 8], "x": 8, "y": 1 },
+ { "matrix": [0, 9], "x": 9, "y": 1 },
+ { "matrix": [0, 10], "x": 10, "y": 1 },
+ { "matrix": [0, 11], "x": 11, "y": 1 },
+ { "matrix": [1, 0], "x": 0, "y": 2 },
+ { "matrix": [1, 1], "x": 1, "y": 2 },
+ { "matrix": [1, 2], "x": 2, "y": 2 },
+ { "matrix": [1, 3], "x": 3, "y": 2 },
+ { "matrix": [1, 4], "x": 4, "y": 2 },
+ { "matrix": [1, 5], "x": 5, "y": 2 },
+ { "matrix": [1, 6], "x": 6, "y": 2 },
+ { "matrix": [1, 7], "x": 7, "y": 2 },
+ { "matrix": [1, 8], "x": 8, "y": 2 },
+ { "matrix": [1, 9], "x": 9, "y": 2 },
+ { "matrix": [1, 10], "x": 10, "y": 2 },
+ { "matrix": [1, 11], "x": 11, "y": 2 },
+ { "matrix": [2, 0], "x": 0, "y": 3 },
+ { "matrix": [2, 1], "x": 1, "y": 3 },
+ { "matrix": [2, 2], "x": 2, "y": 3 },
+ { "matrix": [2, 3], "x": 3, "y": 3 },
+ { "matrix": [2, 4], "x": 4, "y": 3 },
+ { "matrix": [2, 5], "x": 5, "y": 3 },
+ { "matrix": [2, 6], "x": 6, "y": 3 },
+ { "matrix": [2, 7], "x": 7, "y": 3 },
+ { "matrix": [2, 8], "x": 8, "y": 3 },
+ { "matrix": [2, 9], "x": 9, "y": 3 },
+ { "matrix": [2, 10], "x": 10, "y": 3 },
+ { "matrix": [2, 11], "x": 11, "y": 3 },
+ { "matrix": [3, 0], "x": 0, "y": 4 },
+ { "matrix": [3, 1], "x": 1, "y": 4 },
+ { "matrix": [3, 2], "x": 2, "y": 4 },
+ { "matrix": [3, 3], "x": 3, "y": 4 },
+ { "matrix": [3, 4], "x": 4, "y": 4 },
+ { "matrix": [3, 5], "x": 5, "y": 4 },
+ { "matrix": [3, 6], "x": 6, "y": 4 },
+ { "matrix": [3, 7], "x": 7, "y": 4 },
+ { "matrix": [3, 8], "x": 8, "y": 4 },
+ { "matrix": [3, 9], "x": 9, "y": 4 },
+ { "matrix": [3, 10], "x": 10, "y": 4 },
+ { "matrix": [3, 11], "x": 11, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/rules.mk
diff --git a/keyboards/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json
deleted file mode 100644
index 10fb9c1674..0000000000
--- a/keyboards/1upkeyboards/pi40/info.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "keyboard_name": "pi40",
- "manufacturer": "1upkeyboards",
- "usb": {
- "vid": "0x6F75",
- "pid": "0x5600",
- "device_version": "0.0.1"
- },
- "matrix_pins": {
- "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12"],
- "rows": ["GP21", "GP20", "GP19", "GP18"]
- },
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "GP14", "pin_b": "GP13"}
- ]
- },
- "processor": "RP2040",
- "bootloader": "rp2040",
- "board": "GENERIC_RP_RP2040",
- "layouts": {
- "LAYOUT": {
- "layout": [
- { "matrix": [3, 6], "x": 11, "y": 0 },
- { "matrix": [0, 0], "x": 0, "y": 1 },
- { "matrix": [0, 1], "x": 1, "y": 1 },
- { "matrix": [0, 2], "x": 2, "y": 1 },
- { "matrix": [0, 3], "x": 3, "y": 1 },
- { "matrix": [0, 4], "x": 4, "y": 1 },
- { "matrix": [0, 5], "x": 5, "y": 1 },
- { "matrix": [0, 6], "x": 6, "y": 1 },
- { "matrix": [0, 7], "x": 7, "y": 1 },
- { "matrix": [0, 8], "x": 8, "y": 1 },
- { "matrix": [0, 9], "x": 9, "y": 1 },
- { "matrix": [0, 10], "x": 10, "y": 1 },
- { "matrix": [0, 11], "x": 11, "y": 1 },
- { "matrix": [1, 0], "x": 0, "y": 2 },
- { "matrix": [1, 1], "x": 1, "y": 2 },
- { "matrix": [1, 2], "x": 2, "y": 2 },
- { "matrix": [1, 3], "x": 3, "y": 2 },
- { "matrix": [1, 4], "x": 4, "y": 2 },
- { "matrix": [1, 5], "x": 5, "y": 2 },
- { "matrix": [1, 6], "x": 6, "y": 2 },
- { "matrix": [1, 7], "x": 7, "y": 2 },
- { "matrix": [1, 8], "x": 8, "y": 2 },
- { "matrix": [1, 9], "x": 9, "y": 2 },
- { "matrix": [1, 10], "x": 10, "y": 2 },
- { "matrix": [1, 11], "x": 11, "y": 2 },
- { "matrix": [2, 0], "x": 0, "y": 3 },
- { "matrix": [2, 1], "x": 1, "y": 3 },
- { "matrix": [2, 2], "x": 2, "y": 3 },
- { "matrix": [2, 3], "x": 3, "y": 3 },
- { "matrix": [2, 4], "x": 4, "y": 3 },
- { "matrix": [2, 5], "x": 5, "y": 3 },
- { "matrix": [2, 6], "x": 6, "y": 3 },
- { "matrix": [2, 7], "x": 7, "y": 3 },
- { "matrix": [2, 8], "x": 8, "y": 3 },
- { "matrix": [2, 9], "x": 9, "y": 3 },
- { "matrix": [2, 10], "x": 10, "y": 3 },
- { "matrix": [2, 11], "x": 11, "y": 3 },
- { "matrix": [3, 0], "x": 0, "y": 4 },
- { "matrix": [3, 1], "x": 1, "y": 4 },
- { "matrix": [3, 2], "x": 2, "y": 4 },
- { "matrix": [3, 3], "x": 3, "y": 4 },
- { "matrix": [3, 4], "x": 4, "y": 4 },
- { "matrix": [3, 5], "x": 5, "y": 4, "w": 2},
- { "matrix": [3, 7], "x": 7, "y": 4 },
- { "matrix": [3, 8], "x": 8, "y": 4 },
- { "matrix": [3, 9], "x": 9, "y": 4 },
- { "matrix": [3, 10], "x": 10, "y": 4 },
- { "matrix": [3, 11], "x": 11, "y": 4 }
- ]
- },
- "LAYOUT_ortho_4x12": {
- "layout": [
- { "matrix": [0, 0], "x": 0, "y": 0 },
- { "matrix": [0, 1], "x": 1, "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, "y": 0 },
- { "matrix": [0, 7], "x": 7, "y": 0 },
- { "matrix": [0, 8], "x": 8, "y": 0 },
- { "matrix": [0, 9], "x": 9, "y": 0 },
- { "matrix": [0, 10], "x": 10, "y": 0 },
- { "matrix": [0, 11], "x": 11, "y": 0 },
- { "matrix": [1, 0], "x": 0, "y": 1 },
- { "matrix": [1, 1], "x": 1, "y": 1 },
- { "matrix": [1, 2], "x": 2, "y": 1 },
- { "matrix": [1, 3], "x": 3, "y": 1 },
- { "matrix": [1, 4], "x": 4, "y": 1 },
- { "matrix": [1, 5], "x": 5, "y": 1 },
- { "matrix": [1, 6], "x": 6, "y": 1 },
- { "matrix": [1, 7], "x": 7, "y": 1 },
- { "matrix": [1, 8], "x": 8, "y": 1 },
- { "matrix": [1, 9], "x": 9, "y": 1 },
- { "matrix": [1, 10], "x": 10, "y": 1 },
- { "matrix": [1, 11], "x": 11, "y": 1 },
- { "matrix": [2, 0], "x": 0, "y": 2 },
- { "matrix": [2, 1], "x": 1, "y": 2 },
- { "matrix": [2, 2], "x": 2, "y": 2 },
- { "matrix": [2, 3], "x": 3, "y": 2 },
- { "matrix": [2, 4], "x": 4, "y": 2 },
- { "matrix": [2, 5], "x": 5, "y": 2 },
- { "matrix": [2, 6], "x": 6, "y": 2 },
- { "matrix": [2, 7], "x": 7, "y": 2 },
- { "matrix": [2, 8], "x": 8, "y": 2 },
- { "matrix": [2, 9], "x": 9, "y": 2 },
- { "matrix": [2, 10], "x": 10, "y": 2 },
- { "matrix": [2, 11], "x": 11, "y": 2 },
- { "matrix": [3, 0], "x": 0, "y": 3 },
- { "matrix": [3, 1], "x": 1, "y": 3 },
- { "matrix": [3, 2], "x": 2, "y": 3 },
- { "matrix": [3, 3], "x": 3, "y": 3 },
- { "matrix": [3, 4], "x": 4, "y": 3 },
- { "matrix": [3, 5], "x": 5, "y": 3 },
- { "matrix": [3, 6], "x": 6, "y": 3, "label": "ENC" },
- { "matrix": [3, 7], "x": 7, "y": 3 },
- { "matrix": [3, 8], "x": 8, "y": 3 },
- { "matrix": [3, 9], "x": 9, "y": 3 },
- { "matrix": [3, 10], "x": 10, "y": 3 },
- { "matrix": [3, 11], "x": 11, "y": 3 }
- ]
- }
- }
-} \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
index 16c1dcadb4..9aeaccb754 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
@@ -26,8 +26,8 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
- * ╱⎺⎺⎺⎺╲
- * |RGBTOG|
+ * ╱⎺⎺⎺⎺╲
+ * |RGBTOG|
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
@@ -39,17 +39,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Adjust| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
* `-----------------------------------------------------------------------------------'
*/
- [_ONE] = LAYOUT (
+ [_ONE] = LAYOUT_ortho_4x12 (
RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
+ MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
@@ -61,17 +61,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_TWO] = LAYOUT (
+ [_TWO] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Raise
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
@@ -83,17 +83,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_THREE] = LAYOUT (
+ [_THREE] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Adjust (Lower + Raise)
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | Reset|Debug | RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-| Del |
@@ -105,12 +105,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_FOUR] = LAYOUT (
+ [_FOUR] = LAYOUT_ortho_4x12 (
KC_MUTE,
- _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
index f8302db749..8f5226ddf8 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
@@ -32,8 +32,8 @@ enum layer_names {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
- * ╱⎺⎺⎺⎺╲
- * |RGBTOG|
+ * ╱⎺⎺⎺⎺╲
+ * |RGBTOG|
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
@@ -45,17 +45,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Adjust| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
* `-----------------------------------------------------------------------------------'
*/
- [_ONE] = LAYOUT (
+ [_ONE] = LAYOUT_ortho_4x12 (
RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ MO(3), KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |
@@ -67,17 +67,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_TWO] = LAYOUT (
+ [_TWO] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Raise
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp |
@@ -89,17 +89,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
- [_THREE] = LAYOUT (
+ [_THREE] = LAYOUT_ortho_4x12 (
KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Adjust (Lower + Raise)
- * ╱⎺⎺⎺⎺╲
- * | MUTE |
+ * ╱⎺⎺⎺⎺╲
+ * | MUTE |
* v-----------------------RGB CONTROL------------------v ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | Reset|Debug | RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-| Del |
@@ -111,17 +111,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | Mute | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_FOUR] = LAYOUT (
+ [_FOUR] = LAYOUT_ortho_4x12 (
KC_MUTE,
- _______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
+ _______, QK_BOOT, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -133,17 +133,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_FIVE] = LAYOUT (
+ [_FIVE] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -155,17 +155,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_SIX] = LAYOUT (
+ [_SIX] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -177,17 +177,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_SEVEN] = LAYOUT (
+ [_SEVEN] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -199,17 +199,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_EIGHT] = LAYOUT (
+ [_EIGHT] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -221,17 +221,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_NINE] = LAYOUT (
+ [_NINE] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Placeholder
- * ╱⎺⎺⎺⎺╲
- * | |
+ * ╱⎺⎺⎺⎺╲
+ * | |
* ╲⎽⎽⎽⎽╱
* ,-----------------------------------------------------------------------------------.
* | | | | | | | | | | | | |
@@ -243,12 +243,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | | | | | | | | | | | | |
* `-----------------------------------------------------------------------------------'
*/
- [_TEN] = LAYOUT (
+ [_TEN] = LAYOUT_ortho_4x12 (
_______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/config.h
new file mode 100644
index 0000000000..a4d7d0e39a
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/config.h
@@ -0,0 +1,4 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define RGB_MATRIX_LED_COUNT 47 \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
new file mode 100644
index 0000000000..d476109f79
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -0,0 +1,148 @@
+{
+ "keyboard_name": "pi40",
+ "manufacturer": "1upkeyboards",
+ "maintainer": "ziptyze",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5600",
+ "device_version": "1.0.0"
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true,
+ "rgblight": false
+ },
+ "matrix_pins": {
+ "rows": [ "GP21", "GP20", "GP19", "GP18" ],
+ "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {
+ "pin_a": "GP14",
+ "pin_b": "GP13"
+ }
+ ]
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
+ { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
+ { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
+ { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
+ { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
+ { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
+ { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
+ { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
+ { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
+ { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
+ { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
+ { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
+ { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
+ { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
+ { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
+ { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
+ { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
+ { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
+ { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
+ { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
+ { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
+ { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
+ { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
+ { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
+ { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
+ { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
+ { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
+ { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
+ { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
+ { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
+ { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
+ { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
+ { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
+ { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
+ { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
+ { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
+ { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
+ { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
+ { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
+ { "flags": 1, "matrix": [3, 5], "x": 112, "y": 56 },
+ { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
+ { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
+ { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
+ { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
+ { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ { "matrix": [3, 6], "x": 11, "y": 0 },
+ { "matrix": [0, 0], "x": 0, "y": 1 },
+ { "matrix": [0, 1], "x": 1, "y": 1 },
+ { "matrix": [0, 2], "x": 2, "y": 1 },
+ { "matrix": [0, 3], "x": 3, "y": 1 },
+ { "matrix": [0, 4], "x": 4, "y": 1 },
+ { "matrix": [0, 5], "x": 5, "y": 1 },
+ { "matrix": [0, 6], "x": 6, "y": 1 },
+ { "matrix": [0, 7], "x": 7, "y": 1 },
+ { "matrix": [0, 8], "x": 8, "y": 1 },
+ { "matrix": [0, 9], "x": 9, "y": 1 },
+ { "matrix": [0, 10], "x": 10, "y": 1 },
+ { "matrix": [0, 11], "x": 11, "y": 1 },
+ { "matrix": [1, 0], "x": 0, "y": 2 },
+ { "matrix": [1, 1], "x": 1, "y": 2 },
+ { "matrix": [1, 2], "x": 2, "y": 2 },
+ { "matrix": [1, 3], "x": 3, "y": 2 },
+ { "matrix": [1, 4], "x": 4, "y": 2 },
+ { "matrix": [1, 5], "x": 5, "y": 2 },
+ { "matrix": [1, 6], "x": 6, "y": 2 },
+ { "matrix": [1, 7], "x": 7, "y": 2 },
+ { "matrix": [1, 8], "x": 8, "y": 2 },
+ { "matrix": [1, 9], "x": 9, "y": 2 },
+ { "matrix": [1, 10], "x": 10, "y": 2 },
+ { "matrix": [1, 11], "x": 11, "y": 2 },
+ { "matrix": [2, 0], "x": 0, "y": 3 },
+ { "matrix": [2, 1], "x": 1, "y": 3 },
+ { "matrix": [2, 2], "x": 2, "y": 3 },
+ { "matrix": [2, 3], "x": 3, "y": 3 },
+ { "matrix": [2, 4], "x": 4, "y": 3 },
+ { "matrix": [2, 5], "x": 5, "y": 3 },
+ { "matrix": [2, 6], "x": 6, "y": 3 },
+ { "matrix": [2, 7], "x": 7, "y": 3 },
+ { "matrix": [2, 8], "x": 8, "y": 3 },
+ { "matrix": [2, 9], "x": 9, "y": 3 },
+ { "matrix": [2, 10], "x": 10, "y": 3 },
+ { "matrix": [2, 11], "x": 11, "y": 3 },
+ { "matrix": [3, 0], "x": 0, "y": 4 },
+ { "matrix": [3, 1], "x": 1, "y": 4 },
+ { "matrix": [3, 2], "x": 2, "y": 4 },
+ { "matrix": [3, 3], "x": 3, "y": 4 },
+ { "matrix": [3, 4], "x": 4, "y": 4 },
+ { "matrix": [3, 5], "x": 5, "y": 4 },
+ { "matrix": [0, 12], "x": 6, "y": 4 },
+ { "matrix": [3, 7], "x": 7, "y": 4 },
+ { "matrix": [3, 8], "x": 8, "y": 4 },
+ { "matrix": [3, 9], "x": 9, "y": 4 },
+ { "matrix": [3, 10], "x": 10, "y": 4 },
+ { "matrix": [3, 11], "x": 11, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/rules.mk
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/config.h b/keyboards/1upkeyboards/pi40/mit_v1_1/config.h
new file mode 100644
index 0000000000..a4d7d0e39a
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/config.h
@@ -0,0 +1,4 @@
+// Copyright 2022 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define RGB_MATRIX_LED_COUNT 47 \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
new file mode 100644
index 0000000000..9e01928554
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -0,0 +1,148 @@
+{
+ "keyboard_name": "pi40",
+ "manufacturer": "1upkeyboards",
+ "maintainer": "ziptyze",
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "usb": {
+ "vid": "0x6F75",
+ "pid": "0x5600",
+ "device_version": "1.1.0"
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 10
+ },
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgb_matrix": true,
+ "rgblight": false
+ },
+ "matrix_pins": {
+ "rows": [ "GP21", "GP20", "GP19", "GP18" ],
+ "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {
+ "pin_a": "GP14",
+ "pin_b": "GP13"
+ }
+ ]
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
+ { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
+ { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
+ { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
+ { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
+ { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
+ { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
+ { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
+ { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
+ { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
+ { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
+ { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
+ { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
+ { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
+ { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
+ { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
+ { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
+ { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
+ { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
+ { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
+ { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
+ { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
+ { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
+ { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
+ { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
+ { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
+ { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
+ { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
+ { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
+ { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
+ { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
+ { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
+ { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
+ { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
+ { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
+ { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
+ { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
+ { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
+ { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
+ { "flags": 1, "matrix": [3, 5], "x": 112, "y": 56 },
+ { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
+ { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
+ { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
+ { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
+ { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT_ortho_4x12": {
+ "layout": [
+ { "matrix": [0, 12], "x": 11, "y": 0 },
+ { "matrix": [0, 0], "x": 0, "y": 1 },
+ { "matrix": [0, 1], "x": 1, "y": 1 },
+ { "matrix": [0, 2], "x": 2, "y": 1 },
+ { "matrix": [0, 3], "x": 3, "y": 1 },
+ { "matrix": [0, 4], "x": 4, "y": 1 },
+ { "matrix": [0, 5], "x": 5, "y": 1 },
+ { "matrix": [0, 6], "x": 6, "y": 1 },
+ { "matrix": [0, 7], "x": 7, "y": 1 },
+ { "matrix": [0, 8], "x": 8, "y": 1 },
+ { "matrix": [0, 9], "x": 9, "y": 1 },
+ { "matrix": [0, 10], "x": 10, "y": 1 },
+ { "matrix": [0, 11], "x": 11, "y": 1 },
+ { "matrix": [1, 0], "x": 0, "y": 2 },
+ { "matrix": [1, 1], "x": 1, "y": 2 },
+ { "matrix": [1, 2], "x": 2, "y": 2 },
+ { "matrix": [1, 3], "x": 3, "y": 2 },
+ { "matrix": [1, 4], "x": 4, "y": 2 },
+ { "matrix": [1, 5], "x": 5, "y": 2 },
+ { "matrix": [1, 6], "x": 6, "y": 2 },
+ { "matrix": [1, 7], "x": 7, "y": 2 },
+ { "matrix": [1, 8], "x": 8, "y": 2 },
+ { "matrix": [1, 9], "x": 9, "y": 2 },
+ { "matrix": [1, 10], "x": 10, "y": 2 },
+ { "matrix": [1, 11], "x": 11, "y": 2 },
+ { "matrix": [2, 0], "x": 0, "y": 3 },
+ { "matrix": [2, 1], "x": 1, "y": 3 },
+ { "matrix": [2, 2], "x": 2, "y": 3 },
+ { "matrix": [2, 3], "x": 3, "y": 3 },
+ { "matrix": [2, 4], "x": 4, "y": 3 },
+ { "matrix": [2, 5], "x": 5, "y": 3 },
+ { "matrix": [2, 6], "x": 6, "y": 3 },
+ { "matrix": [2, 7], "x": 7, "y": 3 },
+ { "matrix": [2, 8], "x": 8, "y": 3 },
+ { "matrix": [2, 9], "x": 9, "y": 3 },
+ { "matrix": [2, 10], "x": 10, "y": 3 },
+ { "matrix": [2, 11], "x": 11, "y": 3 },
+ { "matrix": [3, 0], "x": 0, "y": 4 },
+ { "matrix": [3, 1], "x": 1, "y": 4 },
+ { "matrix": [3, 2], "x": 2, "y": 4 },
+ { "matrix": [3, 3], "x": 3, "y": 4 },
+ { "matrix": [3, 4], "x": 4, "y": 4 },
+ { "matrix": [3, 5], "x": 5, "y": 4 },
+ { "matrix": [3, 6], "x": 6, "y": 4 },
+ { "matrix": [3, 7], "x": 7, "y": 4 },
+ { "matrix": [3, 8], "x": 8, "y": 4 },
+ { "matrix": [3, 9], "x": 9, "y": 4 },
+ { "matrix": [3, 10], "x": 10, "y": 4 },
+ { "matrix": [3, 11], "x": 11, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/rules.mk
diff --git a/keyboards/1upkeyboards/pi40/pi40.c b/keyboards/1upkeyboards/pi40/pi40.c
index 8e2fc4c3d3..085f0da8f8 100644
--- a/keyboards/1upkeyboards/pi40/pi40.c
+++ b/keyboards/1upkeyboards/pi40/pi40.c
@@ -57,28 +57,6 @@ static const char PROGMEM my_logo[] = {
#endif
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // Key Matrix to LED Index
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
- { 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12 },
- { 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 },
- { 46, 45, 44, 43, 42, 41, NO_LED, 40, 39, 38, 37, 36 }
-}, {
- // LED Index to Physical Position
- { 9, 8 }, { 28, 8 }, { 46, 8 }, { 65, 8 }, { 84, 8 }, { 102, 8 }, { 121, 8 }, { 140, 8 }, { 159, 8 }, { 177, 8 }, { 196, 8 }, { 215, 8 },
- { 215, 24 }, { 196, 24 }, { 177, 24 }, { 159, 24 }, { 140, 24 }, { 121, 24 }, { 102, 24 }, { 84, 24 }, { 65, 24 }, { 46, 24 }, { 28, 24 }, { 9, 24 },
- { 9, 40 }, { 28, 40 }, { 46, 40 }, { 65, 40 }, { 84, 40 }, { 102, 40 }, { 121, 40 }, { 140, 40 }, { 159, 40 }, { 177, 40 }, { 196, 40 }, { 215, 40 },
- { 215, 56 }, { 196, 56 }, { 177, 56 }, { 159, 56 }, { 140, 56 }, { 112, 56 }, { 84, 56 }, { 65, 56 }, { 46, 56 }, { 28, 56 }, { 9, 56 }
-}, {
- // LED Index to Flag
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-} };
-#endif
-
#ifdef OLED_ENABLE
void init_timer(void){
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 017a3fe1cf..75f06c3f2b 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,21 +1,6 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-
WS2812_DRIVER = vendor
-ENCODER_ENABLE = yes
OLED_ENABLE = yes
-OLED_DRIVER = SSD1306 \ No newline at end of file
+OLED_DRIVER = SSD1306
+
+DEFAULT_FOLDER = 1upkeyboards/pi40/mit_v1_0
diff --git a/keyboards/lily58/r2g/readme.md b/keyboards/lily58/r2g/readme.md
index ad48dcfbd2..d530fff552 100644
--- a/keyboards/lily58/r2g/readme.md
+++ b/keyboards/lily58/r2g/readme.md
@@ -1,21 +1,20 @@
# Lily58 R2G
-Lily58 R2G is factory assembled version of the lilly 58 featuring hotswap and perkey rgb
-
![Lily58_R2G](https://i.imgur.com/4vPkIQ5.png)
-Keyboard Maintainer: [Elliot Powell](https://github.com/e11i0t23)
-Hardware Supported: Lily58 R2G PCB
-Hardware Availability: [Mechboards UK](https://mechboards.co.uk/products/lily58-r2g-ready2go-kit)
+
+Lily58 R2G is factory assembled version of the Lily 58 featuring hotswap and perkey RGB.
+
+* Keyboard Maintainer: [Elliot Powell](https://github.com/e11i0t23)
+* Hardware Supported: Lily58 R2G PCB
+* Hardware Availability: [Mechboards UK](https://mechboards.co.uk/products/lily58-r2g-ready2go-kit)
Make example for this keyboard (after setting up your build environment):
-```sh
-make crkbd/r2g:mb_via
-```
-Flash example for this keyboard:
-```sh
-make crkbd/r2g:mb_via:flash
-```
+ make lily58/r2g:mb_via
+
+Flash example for this keyboard:
+
+ make lily58/r2g:mb_via:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
@@ -23,5 +22,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
These PCBs have a reset on the underside of the PCB next to the controller which may be pressed to enter in to the bootloader.
-Additionally, if you hold down the "ESC" or "GRV" buttons when plugging in that half of the keyboard (per the default QWERTY layout), this will jump to the bootloader and reset the EEPROM (persistent storage).
-
+Additionally, if you hold down the "ESC" or "GRV" buttons when plugging in that half of the keyboard (per the default QWERTY layout), this will jump to the bootloader and reset the EEPROM (persistent storage).
diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json
new file mode 100644
index 0000000000..a3c2d64511
--- /dev/null
+++ b/keyboards/viktus/minne/info.json
@@ -0,0 +1,363 @@
+{
+ "manufacturer": "Viktus Design LLC",
+ "keyboard_name": "Viktus Minne",
+ "maintainer": "BlindAssassin111",
+ "url": "https://viktus.design",
+ "usb": {
+ "device_version": "1.0.0",
+ "vid": "0x5644",
+ "pid": "0x4D49"
+ },
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "rgblight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true
+ },
+ "bootmagic": {
+ "matrix": [1,0]
+ },
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B7", "F7", "D5", "D3", "D2", "D1", "D0"],
+ "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "C6", "C7"]
+ },
+ "rgblight": {
+ "led_count": 14,
+ "pin": "F6",
+ "max_brightness": 191,
+ "animations": {
+ "breathing": true,
+ "rainbow_swirl": true,
+ "twinkle": true
+ }
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 },
+ { "label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3 },
+ { "label": "K72", "matrix": [7, 2], "w": 1.25, "x": 4.625, "y": 3 },
+ { "label": "K73", "matrix": [7, 3], "w": 1, "x": 5.875, "y": 3 },
+ { "label": "K63", "matrix": [6, 3], "w": 1.25, "x": 6.875, "y": 3 },
+ { "label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3 },
+ { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 },
+ { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 }
+ ]
+ },
+ "LAYOUT_dual175u": {
+ "layout": [
+ { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 },
+ { "label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3 },
+ { "label": "K72", "matrix": [7, 2], "w": 1.75, "x": 4.625, "y": 3 },
+ { "label": "K63", "matrix": [6, 3], "w": 1.75, "x": 6.375, "y": 3 },
+ { "label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3 },
+ { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 },
+ { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 }
+ ]
+ },
+ "LAYOUT_275_225u": {
+ "layout": [
+ { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K61", "matrix": [6, 1], "w": 1.5, "x": 2.375, "y": 3 },
+ { "label": "K72", "matrix": [7, 2], "w": 2.75, "x": 3.875, "y": 3 },
+ { "label": "K63", "matrix": [6, 3], "w": 2.25, "x": 6.625, "y": 3 },
+ { "label": "K74", "matrix": [7, 4], "w": 1.5, "x": 8.875, "y": 3 },
+ { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 }
+ ]
+ },
+ "LAYOUT_dual3u": {
+ "layout": [
+ { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 },
+ { "label": "K72", "matrix": [7, 2], "w": 3, "x": 3.375, "y": 3 },
+ { "label": "K63", "matrix": [6, 3], "w": 3, "x": 6.375, "y": 3 },
+ { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 },
+ { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 }
+ ]
+ },
+ "LAYOUT_6u": {
+ "layout": [
+ { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3 },
+ { "label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3 },
+ { "label": "K73", "matrix": [7, 3], "w": 6, "x": 3.375, "y": 3 },
+ { "label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3 },
+ { "label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3 }
+ ]
+ },
+ "LAYOUT_7u": {
+ "layout": [
+ { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K71", "matrix": [7, 1], "w": 1.5, "x": 1.375, "y": 3 },
+ { "label": "K73", "matrix": [7, 3], "w": 7, "x": 2.875, "y": 3 },
+ { "label": "K75", "matrix": [7, 5], "w": 1.5, "x": 9.875, "y": 3 }
+ ]
+ },
+ "LAYOUT_10u": {
+ "layout": [
+ { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0 },
+ { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0 },
+ { "label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0 },
+ { "label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0 },
+ { "label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0 },
+ { "label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0 },
+ { "label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0 },
+ { "label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0 },
+ { "label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0 },
+ { "label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1 },
+ { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1 },
+ { "label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1 },
+ { "label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1 },
+ { "label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1 },
+ { "label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1 },
+ { "label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1 },
+ { "label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1 },
+ { "label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1 },
+ { "label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1 },
+ { "label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1 },
+ { "label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1 },
+ { "label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2 },
+ { "label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2 },
+ { "label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2 },
+ { "label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2 },
+ { "label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2 },
+ { "label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2 },
+ { "label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2 },
+ { "label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2 },
+ { "label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2 },
+ { "label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2 },
+ { "label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2 },
+ { "label": "K73", "matrix": [7, 3], "w": 10, "x": 1.375, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/minne/keymaps/default/keymap.c b/keyboards/viktus/minne/keymaps/default/keymap.c
new file mode 100644
index 0000000000..547132712c
--- /dev/null
+++ b/keyboards/viktus/minne/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1),
+ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL
+ )
+};
diff --git a/keyboards/viktus/minne/keymaps/via/keymap.c b/keyboards/viktus/minne/keymaps/via/keymap.c
new file mode 100644
index 0000000000..547132712c
--- /dev/null
+++ b/keyboards/viktus/minne/keymaps/via/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2023 Viktus Design LLC
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, MO(1),
+ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL
+ )
+};
diff --git a/keyboards/viktus/minne/keymaps/via/rules.mk b/keyboards/viktus/minne/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/viktus/minne/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/viktus/minne/readme.md b/keyboards/viktus/minne/readme.md
new file mode 100644
index 0000000000..6b35e5f681
--- /dev/null
+++ b/keyboards/viktus/minne/readme.md
@@ -0,0 +1,27 @@
+# Minne
+
+![minne](https://i.imgur.com/OKnryxch.png)
+
+Minne is a 40% keyboard with an HHKB bottom row.
+
+- Keyboard Maintainer: [BlindAssassin111](https://github.com/BlindAssassin111)
+- Hardware Supported: Viktus Minne MX PCB
+- Hardware Availability: Viktus Design LLC
+
+Make example for this keyboard (after setting up your build environment):
+
+ make viktus/minne:default
+
+Flashing example for this keyboard:
+
+ make viktus/minne: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 - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/viktus/minne/rules.mk b/keyboards/viktus/minne/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/viktus/minne/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/yandrstudio/transition80/board.h b/keyboards/yandrstudio/transition80/board.h
new file mode 100644
index 0000000000..4f6a861863
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/board.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Y&R-Biu (@jiaxin96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
+
+#undef VAL_GPIOCCRH
+#define VAL_GPIOCCRH 0x88888888
+
+#undef VAL_GPIOBCRH
+#define VAL_GPIOBCRH 0x88888888
diff --git a/keyboards/yandrstudio/transition80/info.json b/keyboards/yandrstudio/transition80/info.json
new file mode 100644
index 0000000000..fd8c7528ee
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/info.json
@@ -0,0 +1,129 @@
+{
+ "keyboard_name": "Transition80",
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "usb": {
+ "pid": "0xAA6F",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B3", "B4", "B5", "B6", "B7", "B8", "B9", "A3", "A4", "A5", "A6", "A7", "B0", "B12", "B13", "B15", "A10"],
+ "rows": ["A8", "A9", "A0", "A1", "A2", "B1"]
+ },
+ "tapping": {
+ "tap_capslock_delay": 10
+ },
+ "indicators": {
+ "caps_lock": "A15",
+ "scroll_lock": "B14",
+ "on_state": 1
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
+ {"label":"F1", "x":1.25, "y":0, "matrix": [0, 2]},
+ {"label":"F2", "x":2.25, "y":0, "matrix": [0, 3]},
+ {"label":"F3", "x":3.25, "y":0, "matrix": [0, 4]},
+ {"label":"F4", "x":4.25, "y":0, "matrix": [0, 5]},
+ {"label":"F5", "x":5.5, "y":0, "matrix": [0, 6]},
+ {"label":"F6", "x":6.5, "y":0, "matrix": [0, 7]},
+ {"label":"F7", "x":7.5, "y":0, "matrix": [0, 8]},
+ {"label":"F8", "x":8.5, "y":0, "matrix": [0, 9]},
+ {"label":"F9", "x":9.75, "y":0, "matrix": [0, 10]},
+ {"label":"F10", "x":10.75, "y":0, "matrix": [0, 11]},
+ {"label":"F11", "x":11.75, "y":0, "matrix": [0, 12]},
+ {"label":"F12", "x":12.75, "y":0, "matrix": [0, 13]},
+ {"label":"PrtSc", "x":15.25, "y":0, "matrix": [0, 14]},
+ {"label":"Scroll Lock", "x":16.25, "y":0, "matrix": [0, 15]},
+ {"label":"Pause", "x":17.25, "y":0, "matrix": [0, 16]},
+
+ {"label":"~", "x":0, "y":1.25, "matrix": [1, 0]},
+ {"label":"!", "x":1, "y":1.25, "matrix": [1, 1]},
+ {"label":"@", "x":2, "y":1.25, "matrix": [1, 2]},
+ {"label":"#", "x":3, "y":1.25, "matrix": [1, 3]},
+ {"label":"$", "x":4, "y":1.25, "matrix": [1, 4]},
+ {"label":"%", "x":5, "y":1.25, "matrix": [1, 5]},
+ {"label":"^", "x":6, "y":1.25, "matrix": [1, 6]},
+ {"label":"&", "x":7, "y":1.25, "matrix": [1, 7]},
+ {"label":"*", "x":8, "y":1.25, "matrix": [1, 8]},
+ {"label":"(", "x":9, "y":1.25, "matrix": [1, 9]},
+ {"label":")", "x":10, "y":1.25, "matrix": [1, 10]},
+ {"label":"_", "x":11, "y":1.25, "matrix": [1, 11]},
+ {"label":"+", "x":12, "y":1.25, "matrix": [1, 12]},
+ {"label":"Backspace", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+ {"label":"|", "x":13, "y":1.5, "matrix": [3, 13]},
+ {"label":"Backspace", "x":14, "y":1.5, "matrix": [3, 14]},
+ {"label":"Insert", "x":15.25, "y":1.25, "matrix": [1, 14]},
+ {"label":"Home", "x":16.25, "y":1.25, "matrix": [1, 15]},
+ {"label":"PgUp", "x":17.25, "y":1.25, "matrix": [1, 16]},
+
+ {"label":"Tab", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
+ {"label":"Q", "x":1.5, "y":2.25, "matrix": [2, 1]},
+ {"label":"W", "x":2.5, "y":2.25, "matrix": [2, 2]},
+ {"label":"E", "x":3.5, "y":2.25, "matrix": [2, 3]},
+ {"label":"R", "x":4.5, "y":2.25, "matrix": [2, 4]},
+ {"label":"T", "x":5.5, "y":2.25, "matrix": [2, 5]},
+ {"label":"Y", "x":6.5, "y":2.25, "matrix": [2, 6]},
+ {"label":"U", "x":7.5, "y":2.25, "matrix": [2, 7]},
+ {"label":"I", "x":8.5, "y":2.25, "matrix": [2, 8]},
+ {"label":"O", "x":9.5, "y":2.25, "matrix": [2, 9]},
+ {"label":"P", "x":10.5, "y":2.25, "matrix": [2, 10]},
+ {"label":"{", "x":11.5, "y":2.25, "matrix": [2, 11]},
+ {"label":"}", "x":12.5, "y":2.25, "matrix": [2, 12]},
+ {"label":"|", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+ {"label":"Delete", "x":15.25, "y":2.25, "matrix": [2, 14]},
+ {"label":"End", "x":16.25, "y":2.25, "matrix": [2, 15]},
+ {"label":"PgDn", "x":17.25, "y":2.25, "matrix": [2, 16]},
+
+ {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
+ {"label":"A", "x":1.75, "y":3.25, "matrix": [3, 1]},
+ {"label":"S", "x":2.75, "y":3.25, "matrix": [3, 2]},
+ {"label":"D", "x":3.75, "y":3.25, "matrix": [3, 3]},
+ {"label":"F", "x":4.75, "y":3.25, "matrix": [3, 4]},
+ {"label":"G", "x":5.75, "y":3.25, "matrix": [3, 5]},
+ {"label":"H", "x":6.75, "y":3.25, "matrix": [3, 6]},
+ {"label":"J", "x":7.75, "y":3.25, "matrix": [3, 7]},
+ {"label":"K", "x":8.75, "y":3.25, "matrix": [3, 8]},
+ {"label":"L", "x":9.75, "y":3.25, "matrix": [3, 9]},
+ {"label":":", "x":10.75, "y":3.25, "matrix": [3, 10]},
+ {"label":"\"", "x":11.75, "y":3.25, "matrix": [3, 11]},
+ {"label":"Enter", "x":12.75, "y":3.25, "w":2.25, "matrix": [3, 12]},
+
+
+ {"label":"Shift", "x":0, "y":4.25, "w":2.25, "matrix": [4, 0]},
+ {"label":"Z", "x":2.25, "y":4.25, "matrix": [4, 2]},
+ {"label":"X", "x":3.25, "y":4.25, "matrix": [4, 3]},
+ {"label":"C", "x":4.25, "y":4.25, "matrix": [4, 4]},
+ {"label":"V", "x":5.25, "y":4.25, "matrix": [4, 5]},
+ {"label":"B", "x":6.25, "y":4.25, "matrix": [4, 6]},
+ {"label":"N", "x":7.25, "y":4.25, "matrix": [4, 7]},
+ {"label":"M", "x":8.25, "y":4.25, "matrix": [4, 8]},
+ {"label":"<", "x":9.25, "y":4.25, "matrix": [4, 9]},
+ {"label":">", "x":10.25, "y":4.25, "matrix": [4, 10]},
+ {"label":"?", "x":11.25, "y":4.25, "matrix": [4, 11]},
+ {"label":"Shift", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+ {"label":"Up", "x":16.25, "y":4.25, "matrix": [4, 14]},
+
+ {"label":"Ctrl", "x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
+ {"label":"Win", "x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
+ {"label":"Alt", "x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
+ {"label":"Space", "x":3.75, "y":5.5, "w":6.25, "matrix": [5, 6]},
+ {"label":"Menu", "x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
+ {"label":"Alt", "x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
+ {"label":"Fn", "x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
+ {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]},
+ {"label":"Left", "x":15.25, "y":5.5, "matrix": [5, 14]},
+ {"label":"Down", "x":16.25, "y":5.5, "matrix": [5, 15]},
+ {"label":"Right", "x":17.25, "y":5.5, "matrix": [5, 16]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/yandrstudio/transition80/keymaps/default/keymap.c b/keyboards/yandrstudio/transition80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d9f51ce6f8
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/keymaps/default/keymap.c
@@ -0,0 +1,14 @@
+// Copyright 2022 Y&R-Biu (@jiaxin96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_PSCR, KC_SCRL, KC_PAUS,
+ 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_BSLS, KC_BSPC,
+ 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_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT)
+};
diff --git a/keyboards/yandrstudio/transition80/keymaps/via/keymap.c b/keyboards/yandrstudio/transition80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0be5c0a46e
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2022 Y&R-Biu (@jiaxin96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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_PSCR, KC_SCRL, KC_PAUS,
+ 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_BSLS, KC_BSPC,
+ 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_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+ [1] = LAYOUT(
+ 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, 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, AG_TOGG, 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),
+ [2] = LAYOUT(
+ 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, 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),
+ [3] = LAYOUT(
+ 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, 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)
+};
diff --git a/keyboards/yandrstudio/transition80/keymaps/via/rules.mk b/keyboards/yandrstudio/transition80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/transition80/mcuconf.h b/keyboards/yandrstudio/transition80/mcuconf.h
new file mode 100644
index 0000000000..f4ea9fab2d
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Y&R-Biu (@jiaxin96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/transition80/readme.md b/keyboards/yandrstudio/transition80/readme.md
new file mode 100644
index 0000000000..6ec215b0a3
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/readme.md
@@ -0,0 +1,26 @@
+# transition80
+
+![transition80](https://i.imgur.com/2A0AWs2h.jpg)
+A 80% keyboard.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: APM32F103 16MHZ
+- Hardware Availability: [swagkeys](https://swagkeys.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make yandrstudio/transition80:default
+
+Flashing example for this keyboard:
+
+ make yandrstudio/transition80:default:flash
+
+
+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.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/transition80/rules.mk b/keyboards/yandrstudio/transition80/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/yandrstudio/transition80/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 15:19:41 +0000