diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json
index cab2fa1c079..fdcf9d0bdee 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/info.json
+++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json
@@ -15,8 +15,11 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_all"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -47,21 +50,21 @@
{"matrix": [1, 10], "x": 10.5, "y": 1},
{"matrix": [1, 11], "x": 11.5, "y": 1},
{"matrix": [1, 12], "x": 12.5, "y": 1},
- {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
- {"matrix": [2, 2], "x": 1.75, "y": 2},
- {"matrix": [2, 3], "x": 2.75, "y": 2},
- {"matrix": [2, 4], "x": 3.75, "y": 2},
- {"matrix": [2, 5], "x": 4.75, "y": 2},
- {"matrix": [2, 6], "x": 5.75, "y": 2},
- {"matrix": [2, 7], "x": 6.75, "y": 2},
- {"matrix": [2, 8], "x": 7.75, "y": 2},
- {"matrix": [2, 9], "x": 8.75, "y": 2},
- {"matrix": [2, 10], "x": 9.75, "y": 2},
- {"matrix": [2, 11], "x": 10.75, "y": 2},
- {"matrix": [2, 12], "x": 11.75, "y": 2},
- {"matrix": [2, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3},
@@ -88,6 +91,284 @@
{"matrix": [4, 12], "x": 12.5, "y": 4},
{"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
]
+ },
+ "LAYOUT_60_iso_tsangan_split_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [1, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_wkl_split_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_60_iso_wkl_split_bs_rshift": {
+ "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": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [1, 13], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c
index 563c3838d10..7536b7f3a1a 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/default/keymap.c
@@ -18,14 +18,14 @@ along with this program. If not, see .
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// main layer
-[0] = LAYOUT(
+[0] = LAYOUT_all(
KC_ESC, 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_NO, KC_BSPC,
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
// basic function layer
-[1] = LAYOUT(
+[1] = LAYOUT_all(
QK_BOOT, 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_TRNS, KC_DEL,
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NUHS, KC_TRNS,
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c
index 18c29122690..b6945a706d8 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c
+++ b/keyboards/4pplet/waffling60/rev_d_iso/keymaps/via/keymap.c
@@ -18,28 +18,28 @@ along with this program. If not, see .
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// main layer
-[0] = LAYOUT(
+[0] = LAYOUT_all(
KC_ESC, 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_BSLS, KC_BSPC,
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
// basic function layer
-[1] = LAYOUT(
+[1] = LAYOUT_all(
QK_BOOT, 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_TRNS, KC_DEL,
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
// extra layer for VIA
-[2] = LAYOUT(
+[2] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
// extra layer for VIA
-[3] = LAYOUT(
+[3] = LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, 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/4pplet/waffling60/rev_d_iso/matrix_diagram.md b/keyboards/4pplet/waffling60/rev_d_iso/matrix_diagram.md
new file mode 100644
index 00000000000..781000ec413
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_d_iso/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for 4pplet Waffling60 Rev D ISO
+
+```
+ ┌───────┐
+ 2u Backspace │1D │
+ └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2D │
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│40 │41 │42 │44 │46 │48 │4B │4C │4D │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│40 │41 │42 │46 │4B │4C │4D │ Tsangan/WKL/HHKB
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│40 │41 │46 │4C │4D │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
diff --git a/keyboards/akko/5108/5108.c b/keyboards/akko/5108/5108.c
new file mode 100644
index 00000000000..a14f02bc76e
--- /dev/null
+++ b/keyboards/akko/5108/5108.c
@@ -0,0 +1,162 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * 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 "quantum.h"
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ /*row0*/
+ {1, A_1, B_1, C_1},
+ {1, A_2, B_2, C_2},
+ {1, A_3, B_3, C_3},
+ {1, A_4, B_4, C_4},
+ {1, A_5, B_5, C_5},
+ {1, A_6, B_6, C_6},
+ {1, A_7, B_7, C_7},
+ {1, A_8, B_8, C_8},
+ {1, A_9, B_9, C_9},
+ {1, A_10, B_10, C_10},
+ {1, A_11, B_11, C_11},
+ {1, A_12, B_12, C_12},
+ {1, A_13, B_13, C_13},
+ {1, A_14, B_14, C_14},
+ {1, A_15, B_15, C_15},
+ {1, A_16, B_16, C_16},
+ {1, D_11, E_11, F_11},
+ {1, D_12, E_12, F_12},
+ {1, D_13, E_13, F_13},
+ {1, D_14, E_14, F_14},
+
+ /*row1*/
+ {0, A_1, B_1, C_1},
+ {0, A_2, B_2, C_2},
+ {0, A_3, B_3, C_3},
+ {0, A_4, B_4, C_4},
+ {0, A_5, B_5, C_5},
+ {0, A_6, B_6, C_6},
+ {0, A_7, B_7, C_7},
+ {0, A_8, B_8, C_8},
+ {0, A_9, B_9, C_9},
+ {0, A_10, B_10, C_10},
+ {0, A_11, B_11, C_11},
+ {0, A_12, B_12, C_12},
+ {0, A_13, B_13, C_13},
+ {0, A_14, B_14, C_14},
+ {1, D_1, E_1, F_1 },
+ {1, D_2, E_2, F_2},
+ {1, D_3, E_3, F_3},
+ {1, D_4, E_4, F_4},
+ {1, D_5, E_5, F_5},
+ {1, D_6, E_6, F_6},
+ {1, D_7, E_7, F_7},
+
+ /*row2*/
+ {0, D_1, E_1, F_1},
+ {0, D_2, E_2, F_2},
+ {0, D_3, E_3, F_3},
+ {0, D_4, E_4, F_4},
+ {0, D_5, E_5, F_5},
+ {0, D_6, E_6, F_6},
+ {0, D_7, E_7, F_7},
+ {0, D_8, E_8, F_8},
+ {0, D_9, E_9, F_9},
+ {0, D_10, E_10, F_10},
+ {0, D_11, E_11, F_11},
+ {0, D_12, E_12, F_12},
+ {0, D_13, E_13, F_13},
+ {0, D_14, E_14, F_14},
+ {1, G_1, H_1, I_1},
+ {1, G_2, H_2, I_2},
+ {1, G_3, H_3, I_3},
+ {1, D_8, E_8, F_8},
+ {1, D_9, E_9, F_9},
+ {1, D_10, E_10, F_10},
+ {1, G_7, H_7, I_7},
+
+ /*row3*/
+ {0, G_1, H_1, I_1},
+ {0, G_2, H_2, I_2},
+ {0, G_3, H_3, I_3},
+ {0, G_4, H_4, I_4},
+ {0, G_5, H_5, I_5},
+ {0, G_6, H_6, I_6},
+ {0, G_7, H_7, I_7},
+ {0, G_8, H_8, I_8},
+ {0, G_9, H_9, I_9},
+ {0, G_10, H_10, I_10},
+ {0, G_11, H_11, I_11},
+ {0, G_12, H_12, I_12},
+ {0, G_13, H_13, I_13},
+ {1, G_4, H_4, I_4},
+ {1, G_5, H_5, I_5},
+ {1, G_6, H_6, I_6},
+
+ /*row4*/
+ {0, J_1, K_1, L_1},
+ {0, J_2, K_2, L_2},
+ {0, J_3, K_3, L_3},
+ {0, J_4, K_4, L_4},
+ {0, J_5, K_5, L_5},
+ {0, J_6, K_6, L_6},
+ {0, J_7, K_7, L_7},
+ {0, J_8, K_8, L_8},
+ {0, J_9, K_9, L_9},
+ {0, J_10, K_10, L_10},
+ {0, J_11, K_11, L_11},
+ {0, J_12, K_12, L_12},
+ {1, J_4, K_4, L_4},
+ {1, J_7, K_7, L_7},
+ {1, J_8, K_8, L_8},
+ {1, J_9, K_9, L_9},
+ {1, J_10, K_10, L_10},
+
+ /*row5*/
+ {0, J_13, K_13, L_13},
+ {0, J_14, K_14, L_14},
+ {0, J_15, K_15, L_15},
+ {0, J_16, K_16, L_16},
+ {0, G_14, H_14, I_14},
+ {0, G_15, H_15, I_15},
+ {0, G_16, H_16, I_16},
+ {0, D_15, E_15, F_15},
+ {1, J_1, K_1, L_1},
+ {1, J_2, K_2, L_2},
+ {1, J_3, K_3, L_3},
+ {1, J_5, K_5, L_5},
+ {1, J_6, K_6, L_6},
+
+};
+#endif
+
+void keyboard_pre_init_kb(void) {
+ setPinOutput(LED_WIN_LOCK_PIN); // LED3 Win Lock
+ writePinLow(LED_WIN_LOCK_PIN);
+ keyboard_pre_init_user();
+}
+
+bool led_update_kb(led_t led_state) {
+ bool res = led_update_user(led_state);
+ if (res) {
+ writePin(LED_WIN_LOCK_PIN, keymap_config.no_gui);
+ }
+ return res;
+}
diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h
new file mode 100644
index 00000000000..f56e825e050
--- /dev/null
+++ b/keyboards/akko/5108/config.h
@@ -0,0 +1,54 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+/* Use 5 dynamic keymap layers */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+/* LED Indicators */
+#define LED_WIN_LOCK_PIN C11
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 400000 /* 400000 */
+
+#define RGB_MATRIX_LED_COUNT 108
+
+#define RGB_TRIGGER_ON_KEYDOWN
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/akko/5108/halconf.h b/keyboards/akko/5108/halconf.h
new file mode 100644
index 00000000000..2f64e65393a
--- /dev/null
+++ b/keyboards/akko/5108/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next
diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/info.json
new file mode 100644
index 00000000000..e9e99be69e3
--- /dev/null
+++ b/keyboards/akko/5108/info.json
@@ -0,0 +1,290 @@
+{
+ "keyboard_name": "5108",
+ "manufacturer": "Akko",
+ "url":"https://www.akkogear.com",
+ "maintainer": "jonylee@hfd",
+ "usb": {
+ "vid": "0xFFFE",
+ "pid": "0x000D",
+ "device_version": "1.0.3",
+ "suspend_wakeup_delay": 400,
+ "force_nkro": true
+ },
+ "processor": "WB32FQ95",
+ "bootloader": "wb32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"],
+ "rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
+ },
+ "diode_direction": "ROW2COL",
+ "indicators": {
+ "num_lock": "A15",
+ "caps_lock": "C10"
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3733",
+ "max_brightness": 180,
+ "animations": {
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "raindrops": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "multisplash": true
+ },
+ "layout":[
+ { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
+ { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+ { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 },
+ { "flags": 4, "matrix": [0, 3], "x": 40, "y": 0 },
+ { "flags": 4, "matrix": [0, 4], "x": 50, "y": 0 },
+ { "flags": 4, "matrix": [0, 5], "x": 70, "y": 0 },
+ { "flags": 4, "matrix": [0, 6], "x": 80, "y": 0 },
+ { "flags": 4, "matrix": [0, 7], "x": 90, "y": 0 },
+ { "flags": 4, "matrix": [0, 8], "x": 100, "y": 0 },
+ { "flags": 4, "matrix": [0, 9], "x": 110, "y": 0 },
+ { "flags": 4, "matrix": [0, 10], "x": 120, "y": 0 },
+ { "flags": 4, "matrix": [0, 11], "x": 130, "y": 0 },
+ { "flags": 4, "matrix": [0, 12], "x": 140, "y": 0 },
+ { "flags": 4, "matrix": [0, 14], "x": 156, "y": 0 },
+ { "flags": 4, "matrix": [0, 15], "x": 166, "y": 0 },
+ { "flags": 4, "matrix": [0, 16], "x": 176, "y": 0 },
+ { "flags": 4, "matrix": [0, 17], "x": 194, "y": 0 },
+ { "flags": 4, "matrix": [0, 18], "x": 204, "y": 0 },
+ { "flags": 4, "matrix": [0, 19], "x": 214, "y": 0 },
+ { "flags": 4, "matrix": [0, 20], "x": 224, "y": 0 },
+
+ { "flags": 4, "matrix": [1, 0], "x": 0, "y": 13 },
+ { "flags": 4, "matrix": [1, 1], "x": 10, "y": 13 },
+ { "flags": 4, "matrix": [1, 2], "x": 20, "y": 13 },
+ { "flags": 4, "matrix": [1, 3], "x": 30, "y": 13 },
+ { "flags": 4, "matrix": [1, 4], "x": 40, "y": 13 },
+ { "flags": 4, "matrix": [1, 5], "x": 50, "y": 13 },
+ { "flags": 4, "matrix": [1, 6], "x": 60, "y": 13 },
+ { "flags": 4, "matrix": [1, 7], "x": 70, "y": 13 },
+ { "flags": 4, "matrix": [1, 8], "x": 80, "y": 13 },
+ { "flags": 4, "matrix": [1, 9], "x": 90, "y": 13 },
+ { "flags": 4, "matrix": [1, 10], "x": 100, "y": 13 },
+ { "flags": 4, "matrix": [1, 11], "x": 110, "y": 13 },
+ { "flags": 4, "matrix": [1, 12], "x": 120, "y": 13 },
+ { "flags": 4, "matrix": [1, 13], "x": 140, "y": 13 },
+ { "flags": 4, "matrix": [1, 14], "x": 156, "y": 13 },
+ { "flags": 4, "matrix": [1, 15], "x": 166, "y": 13 },
+ { "flags": 4, "matrix": [1, 16], "x": 176, "y": 13 },
+ { "flags": 4, "matrix": [1, 17], "x": 194, "y": 13 },
+ { "flags": 4, "matrix": [1, 18], "x": 204, "y": 13 },
+ { "flags": 4, "matrix": [1, 19], "x": 214, "y": 13 },
+ { "flags": 4, "matrix": [1, 20], "x": 224, "y": 13 },
+
+ { "flags": 4, "matrix": [2, 0], "x": 0, "y": 26 },
+ { "flags": 4, "matrix": [2, 1], "x": 10, "y": 26 },
+ { "flags": 4, "matrix": [2, 2], "x": 20, "y": 26 },
+ { "flags": 4, "matrix": [2, 3], "x": 30, "y": 26 },
+ { "flags": 4, "matrix": [2, 4], "x": 40, "y": 26 },
+ { "flags": 4, "matrix": [2, 5], "x": 50, "y": 26 },
+ { "flags": 4, "matrix": [2, 6], "x": 60, "y": 26 },
+ { "flags": 4, "matrix": [2, 7], "x": 70, "y": 26 },
+ { "flags": 4, "matrix": [2, 8], "x": 80, "y": 26 },
+ { "flags": 4, "matrix": [2, 9], "x": 90, "y": 26 },
+ { "flags": 4, "matrix": [2, 10], "x": 100, "y": 26 },
+ { "flags": 4, "matrix": [2, 11], "x": 110, "y": 26 },
+ { "flags": 4, "matrix": [2, 12], "x": 128, "y": 26 },
+ { "flags": 4, "matrix": [2, 13], "x": 140, "y": 26 },
+ { "flags": 4, "matrix": [2, 14], "x": 156, "y": 26 },
+ { "flags": 4, "matrix": [2, 15], "x": 166, "y": 26 },
+ { "flags": 4, "matrix": [2, 16], "x": 176, "y": 26 },
+ { "flags": 4, "matrix": [2, 17], "x": 194, "y": 26 },
+ { "flags": 4, "matrix": [2, 18], "x": 204, "y": 26 },
+ { "flags": 4, "matrix": [2, 19], "x": 214, "y": 26 },
+ { "flags": 4, "matrix": [2, 20], "x": 224, "y": 26 },
+
+ { "flags": 4, "matrix": [3, 0], "x": 0, "y": 38 },
+ { "flags": 4, "matrix": [3, 1], "x": 10, "y": 38 },
+ { "flags": 4, "matrix": [3, 2], "x": 20, "y": 38 },
+ { "flags": 4, "matrix": [3, 3], "x": 30, "y": 38 },
+ { "flags": 4, "matrix": [3, 4], "x": 40, "y": 38 },
+ { "flags": 4, "matrix": [3, 5], "x": 50, "y": 38 },
+ { "flags": 4, "matrix": [3, 6], "x": 60, "y": 38 },
+ { "flags": 4, "matrix": [3, 7], "x": 70, "y": 38 },
+ { "flags": 4, "matrix": [3, 8], "x": 80, "y": 38 },
+ { "flags": 4, "matrix": [3, 9], "x": 90, "y": 38 },
+ { "flags": 4, "matrix": [3, 10], "x": 100, "y": 38 },
+ { "flags": 4, "matrix": [3, 11], "x": 110, "y": 38 },
+ { "flags": 4, "matrix": [3, 13], "x": 135, "y": 38 },
+ { "flags": 4, "matrix": [3, 17], "x": 194, "y": 38 },
+ { "flags": 4, "matrix": [3, 18], "x": 204, "y": 38 },
+ { "flags": 4, "matrix": [3, 19], "x": 214, "y": 38 },
+
+ { "flags": 4, "matrix": [4, 0], "x": 5, "y": 51 },
+ { "flags": 4, "matrix": [4, 1], "x": 20, "y": 51 },
+ { "flags": 4, "matrix": [4, 2], "x": 30, "y": 51 },
+ { "flags": 4, "matrix": [4, 3], "x": 40, "y": 51 },
+ { "flags": 4, "matrix": [4, 4], "x": 50, "y": 51 },
+ { "flags": 4, "matrix": [4, 5], "x": 60, "y": 51 },
+ { "flags": 4, "matrix": [4, 6], "x": 70, "y": 51 },
+ { "flags": 4, "matrix": [4, 7], "x": 80, "y": 51 },
+ { "flags": 4, "matrix": [4, 8], "x": 90, "y": 51 },
+ { "flags": 4, "matrix": [4, 9], "x": 100, "y": 51 },
+ { "flags": 4, "matrix": [4, 10], "x": 110, "y": 51 },
+ { "flags": 4, "matrix": [4, 13], "x": 135, "y": 51 },
+ { "flags": 4, "matrix": [4, 15], "x": 166, "y": 51 },
+ { "flags": 4, "matrix": [4, 17], "x": 194, "y": 51 },
+ { "flags": 4, "matrix": [4, 18], "x": 204, "y": 51 },
+ { "flags": 4, "matrix": [4, 19], "x": 214, "y": 51 },
+ { "flags": 4, "matrix": [4, 20], "x": 224, "y": 51 },
+
+ { "flags": 4, "matrix": [5, 0], "x": 0, "y": 64 },
+ { "flags": 4, "matrix": [5, 1], "x": 10, "y": 64 },
+ { "flags": 4, "matrix": [5, 2], "x": 20, "y": 64 },
+ { "flags": 4, "matrix": [5, 5], "x": 60, "y": 64 },
+ { "flags": 4, "matrix": [5, 9], "x": 100, "y": 64 },
+ { "flags": 4, "matrix": [5, 10], "x": 110, "y": 64 },
+ { "flags": 4, "matrix": [5, 11], "x": 130, "y": 64 },
+ { "flags": 4, "matrix": [5, 13], "x": 140, "y": 64 },
+ { "flags": 4, "matrix": [5, 14], "x": 156, "y": 64 },
+ { "flags": 4, "matrix": [5, 15], "x": 166, "y": 64 },
+ { "flags": 4, "matrix": [5, 16], "x": 176, "y": 64 },
+ { "flags": 4, "matrix": [5, 18], "x": 199, "y": 64 },
+ { "flags": 4, "matrix": [5, 19], "x": 214, "y": 64 }
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 2, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 3, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 4, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 5, "y": 0 },
+ { "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 9], "x": 11, "y": 0 },
+ { "label": "F10", "matrix": [0, 10], "x": 12, "y": 0 },
+ { "label": "F11", "matrix": [0, 11], "x": 13, "y": 0 },
+ { "label": "F12", "matrix": [0, 12], "x": 14, "y": 0 },
+ { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 },
+ { "label": "ScrLk", "matrix": [0, 15], "x": 16.25, "y": 0 },
+ { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 },
+ { "label": "Cal", "matrix": [0, 17], "x": 18.5, "y": 0 },
+ { "label": "Mute", "matrix": [0, 18], "x": 19.5, "y": 0 },
+ { "label": "Vold", "matrix": [0, 19], "x": 20.5, "y": 0 },
+ { "label": "Volu", "matrix": [0, 20], "x": 21.5, "y": 0 },
+
+ { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+ { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+ { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+ { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+ { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2 },
+ { "label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+ { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+ { "label": "PgUp", "matrix": [1, 16], "x": 17.25, "y": 1.25 },
+ { "label": "Num", "matrix": [1, 17], "x": 18.5, "y": 1.25 },
+ { "label": "/", "matrix": [1, 18], "x": 19.5, "y": 1.25 },
+ { "label": "*", "matrix": [1, 19], "x": 20.5, "y": 1.25 },
+ { "label": "-", "matrix": [1, 20], "x": 21.5, "y": 1.25 },
+
+ { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 },
+ { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+ { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+ { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+ { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+ { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+ { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+ { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+ { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+ { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+ { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+ { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+ { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+ { "label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 },
+ { "label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+ { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
+ { "label": "PgDn", "matrix": [2, 16], "x": 17.25, "y": 2.25 },
+ { "label": "7", "matrix": [2, 17], "x": 18.5, "y": 2.25 },
+ { "label": "8", "matrix": [2, 18], "x": 19.5, "y": 2.25 },
+ { "label": "9", "matrix": [2, 19], "x": 20.5, "y": 2.25 },
+ { "label": "+", "matrix": [2, 20], "x": 21.5, "y": 2.25, "h": 2 },
+
+ { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 },
+ { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+ { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+ { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+ { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+ { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+ { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+ { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+ { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+ { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+ { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+ { "label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+ { "label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 },
+ { "label": "4", "matrix": [3, 17], "x": 18.5, "y": 3.25 },
+ { "label": "5", "matrix": [3, 18], "x": 19.5, "y": 3.25 },
+ { "label": "6", "matrix": [3, 19], "x": 20.5, "y": 3.25 },
+
+ { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 },
+ { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+ { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+ { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+ { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+ { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+ { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+ { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+ { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+ { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+ { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+ { "label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75 },
+ { "label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.25 },
+ { "label": "1", "matrix": [4, 17], "x": 18.5, "y": 4.25 },
+ { "label": "2", "matrix": [4, 18], "x": 19.5, "y": 4.25 },
+ { "label": "3", "matrix": [4, 19], "x": 20.5, "y": 4.25 },
+ { "label": "Enter", "matrix": [4, 20], "x": 21.5, "y": 4.25, "h": 2 },
+
+ { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 },
+ { "label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 },
+ { "label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 },
+ { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25 },
+ { "label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25 },
+ { "label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25 },
+ { "label": "Left", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+ { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+ { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.25 },
+ { "label": "0", "matrix": [5, 18], "x": 18.5, "y": 5.25, "w": 2 },
+ { "label": ".", "matrix": [5, 19], "x": 20.5, "y": 5.25 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/akko/5108/keymaps/default/keymap.c b/keyboards/akko/5108/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ef92432ff57
--- /dev/null
+++ b/keyboards/akko/5108/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+enum __layers {
+ WIN_B,
+ WIN_W,
+ WIN_FN,
+ MAC_B,
+ MAC_W,
+ MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [WIN_B] = LAYOUT( /* Base */
+ 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_CALC, KC_MUTE, KC_VOLD, KC_VOLU,
+ 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ 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_P7, KC_P8, KC_P9, KC_PPLS,
+ 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_P4, KC_P5, KC_P6,
+ 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
+
+ [WIN_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D, _______, _______),
+
+ [WIN_FN] = LAYOUT( /* FN */
+ _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______,TG(WIN_W),_______,_______,_______,_______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______),
+
+ [MAC_B] = LAYOUT( /* Base */
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU,
+ 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ 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_P7, KC_P8, KC_P9, KC_PPLS,
+ 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_P4, KC_P5, KC_P6,
+ 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
+
+ [MAC_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D, _______, _______),
+
+ [MAC_FN] = LAYOUT( /* FN */
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______,TG(MAC_W),_______,_______,_______,_______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______)
+};
+// clang-format on
diff --git a/keyboards/akko/5108/keymaps/via/keymap.c b/keyboards/akko/5108/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ef92432ff57
--- /dev/null
+++ b/keyboards/akko/5108/keymaps/via/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+enum __layers {
+ WIN_B,
+ WIN_W,
+ WIN_FN,
+ MAC_B,
+ MAC_W,
+ MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [WIN_B] = LAYOUT( /* Base */
+ 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_CALC, KC_MUTE, KC_VOLD, KC_VOLU,
+ 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ 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_P7, KC_P8, KC_P9, KC_PPLS,
+ 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_P4, KC_P5, KC_P6,
+ 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
+
+ [WIN_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D, _______, _______),
+
+ [WIN_FN] = LAYOUT( /* FN */
+ _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______,TG(WIN_W),_______,_______,_______,_______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______),
+
+ [MAC_B] = LAYOUT( /* Base */
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU,
+ 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ 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_P7, KC_P8, KC_P9, KC_PPLS,
+ 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_P4, KC_P5, KC_P6,
+ 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
+
+ [MAC_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D, _______, _______),
+
+ [MAC_FN] = LAYOUT( /* FN */
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______,TG(MAC_W),_______,_______,_______,_______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______)
+};
+// clang-format on
diff --git a/keyboards/akko/5108/keymaps/via/rules.mk b/keyboards/akko/5108/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/akko/5108/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/akko/5108/mcuconf.h b/keyboards/akko/5108/mcuconf.h
new file mode 100644
index 00000000000..0d16f4f04e4
--- /dev/null
+++ b/keyboards/akko/5108/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#include_next
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/akko/5108/readme.md b/keyboards/akko/5108/readme.md
new file mode 100644
index 00000000000..c7140deb5c7
--- /dev/null
+++ b/keyboards/akko/5108/readme.md
@@ -0,0 +1,20 @@
+# 5108
+
+A customizable 100% keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: Akko 5108
+* Hardware Availability: [akko](https://www.akkogear.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make akko/5108:default
+
+Flashing example for this keyboard:
+
+ make akko/5108:default:flash
+
+## Bootloader
+**Reset Key**: Hold down the key located at *K000*, which programmed as *Esc* while plugging in the keyboard.
+
+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/akko/5108/rules.mk b/keyboards/akko/5108/rules.mk
new file mode 100644
index 00000000000..24d5f6f52ec
--- /dev/null
+++ b/keyboards/akko/5108/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/akko/acr87/acr87.c b/keyboards/akko/acr87/acr87.c
new file mode 100644
index 00000000000..e175e21368e
--- /dev/null
+++ b/keyboards/akko/acr87/acr87.c
@@ -0,0 +1,217 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * 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 "quantum.h"
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ /*row0*/
+ {1, A_1, B_1, C_1},
+ {1, A_2, B_2, C_2},
+ {1, A_3, B_3, C_3},
+ {1, A_4, B_4, C_4},
+ {1, A_5, B_5, C_5},
+ {1, A_6, B_6, C_6},
+ {1, A_7, B_7, C_7},
+ {1, A_8, B_8, C_8},
+ {1, A_9, B_9, C_9},
+ {1, A_10, B_10, C_10},
+ {1, A_11, B_11, C_11},
+ {1, A_12, B_12, C_12},
+ {1, A_13, B_13, C_13},
+ {1, A_14, B_14, C_14},
+ {1, A_15, B_15, C_15},
+ {1, A_16, B_16, C_16},
+
+ /*row1*/
+ {0, A_1, B_1, C_1},
+ {0, A_2, B_2, C_2},
+ {0, A_3, B_3, C_3},
+ {0, A_4, B_4, C_4},
+ {0, A_5, B_5, C_5},
+ {0, A_6, B_6, C_6},
+ {0, A_7, B_7, C_7},
+ {0, A_8, B_8, C_8},
+ {0, A_9, B_9, C_9},
+ {0, A_10, B_10, C_10},
+ {0, A_11, B_11, C_11},
+ {0, A_12, B_12, C_12},
+ {0, A_13, B_13, C_13},
+ {0, A_14, B_14, C_14},
+ {1, D_1, E_1, F_1},
+ {1, D_2, E_2, F_2},
+ {1, D_3, E_3, F_3},
+
+ /*row2*/
+ {0, D_1, E_1, F_1},
+ {0, D_2, E_2, F_2},
+ {0, D_3, E_3, F_3},
+ {0, D_4, E_4, F_4},
+ {0, D_5, E_5, F_5},
+ {0, D_6, E_6, F_6},
+ {0, D_7, E_7, F_7},
+ {0, D_8, E_8, F_8},
+ {0, D_9, E_9, F_9},
+ {0, D_10, E_10, F_10},
+ {0, D_11, E_11, F_11},
+ {0, D_12, E_12, F_12},
+ {0, D_13, E_13, F_13},
+ {0, D_14, E_14, F_14},
+ {1, G_1, H_1, I_1},
+ {1, G_2, H_2, I_2},
+ {1, G_3, H_3, I_3},
+
+ /*row3*/
+ {0, G_1, H_1, I_1},
+ {0, G_2, H_2, I_2},
+ {0, G_3, H_3, I_3},
+ {0, G_4, H_4, I_4},
+ {0, G_5, H_5, I_5},
+ {0, G_6, H_6, I_6},
+ {0, G_7, H_7, I_7},
+ {0, G_8, H_8, I_8},
+ {0, G_9, H_9, I_9},
+ {0, G_10, H_10, I_10},
+ {0, G_11, H_11, I_11},
+ {0, G_12, H_12, I_12},
+ {0, G_13, H_13, I_13},
+
+ /*row4*/
+ {0, J_1, K_1, L_1},
+ {0, J_2, K_2, L_2},
+ {0, J_3, K_3, L_3},
+ {0, J_4, K_4, L_4},
+ {0, J_5, K_5, L_5},
+ {0, J_6, K_6, L_6},
+ {0, J_7, K_7, L_7},
+ {0, J_8, K_8, L_8},
+ {0, J_9, K_9, L_9},
+ {0, J_10, K_10, L_10},
+ {0, J_11, K_11, L_11},
+ {0, J_12, K_12, L_12},
+ {1, J_4, K_4, L_4},
+
+ /*row5*/
+ {0, J_13, K_13, L_13},
+ {0, J_14, K_14, L_14},
+ {0, J_15, K_15, L_15},
+ {0, J_16, K_16, L_16},
+ {0, G_14, H_14, I_14},
+ {0, G_15, H_15, I_15},
+ {0, G_16, H_16, I_16},
+ {0, D_15, E_15, F_15},
+ {1, J_1, K_1, L_1},
+ {1, J_2, K_2, L_2},
+ {1, J_3, K_3, L_3},
+
+ {2, J_12, K_12, L_12},
+ {2, J_11, K_11, L_11},
+ {2, J_10, K_10, L_10},
+ {2, J_9, K_9, L_9},
+ {2, J_8, K_8, L_8},
+ {2, J_7, K_7, L_7},
+ {2, J_6, K_6, L_6},
+ {2, J_5, K_5, L_5},
+ {2, J_4, K_4, L_4},
+ {2, J_3, K_3, L_3},
+ {2, J_2, K_2, L_2},
+ {2, J_1, K_1, L_1},
+ {2, G_12, H_12, I_12},
+ {2, G_11, H_11, I_11},
+ {2, G_10, H_10, I_10},
+ {2, G_9, H_9, I_9},
+
+ {2, A_1, B_1, C_1},
+ {2, G_8, H_8, I_8},
+
+ {2, A_2, B_2, C_2},
+ {2, G_7, H_7, I_7},
+
+ {2, A_3, B_3, C_3},
+ {2, G_6, H_6, I_6},
+
+ {2, A_4, B_4, C_4},
+ {2, G_5, H_5, I_5},
+
+ {2, A_5, B_5, C_5},
+ {2, G_4, H_4, I_4},
+
+ {2, A_6, B_6, C_6},
+ {2, G_3, H_3, I_3},
+
+ {2, A_7, B_7, C_7},
+ {2, G_2, H_2, I_2},
+
+ {2, A_8, B_8, C_8},
+ {2, A_9, B_9, C_9},
+ {2, A_10, B_10, C_10},
+ {2, A_11, B_11, C_11},
+ {2, A_12, B_12, C_12},
+ {2, D_1, E_1, F_1},
+ {2, D_2, E_2, F_2},
+ {2, D_3, E_3, F_3},
+ {2, D_4, E_4, F_4},
+ {2, D_5, E_5, F_5},
+ {2, D_6, E_6, F_6},
+ {2, D_7, E_7, F_7},
+ {2, D_8, E_8, F_8},
+ {2, D_9, E_9, F_9},
+ {2, D_10, E_10, F_10},
+ {2, D_11, E_11, F_11},
+ {2, D_12, E_12, F_12},
+ {2, G_1, H_1, I_1},
+};
+
+// clang-format on
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max)
+{
+ if (!rgb_matrix_indicators_advanced_user(led_min, led_max))
+ {
+ return false;
+ }
+ if (host_keyboard_led_state().caps_lock)
+ {
+ RGB_MATRIX_INDICATOR_SET_COLOR(50, 255, 255, 255);
+ }
+ else
+ {
+ if (!rgb_matrix_get_flags())
+ {
+ RGB_MATRIX_INDICATOR_SET_COLOR(50, 0, 0, 0);
+ }
+ }
+ if (keymap_config.no_gui)
+ {
+ RGB_MATRIX_INDICATOR_SET_COLOR(77, 255, 255, 255);
+ }
+ else
+ {
+ if (!rgb_matrix_get_flags())
+ {
+ RGB_MATRIX_INDICATOR_SET_COLOR(77, 0, 0, 0);
+ }
+ }
+
+ return true;
+}
+
+#endif
diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h
new file mode 100644
index 00000000000..221cad86ad1
--- /dev/null
+++ b/keyboards/akko/acr87/config.h
@@ -0,0 +1,53 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+/* Use 5 dynamic keymap layers */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 3
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define DRIVER_ADDR_3 0b1110110
+
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 400000 /* 400000 */
+
+#define RGB_MATRIX_LED_COUNT 135
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_TRIGGER_ON_KEYDOWN
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_KEYRELEASES
diff --git a/keyboards/akko/acr87/halconf.h b/keyboards/akko/acr87/halconf.h
new file mode 100644
index 00000000000..2f64e65393a
--- /dev/null
+++ b/keyboards/akko/acr87/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next
diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/info.json
new file mode 100644
index 00000000000..bcc6b23cb00
--- /dev/null
+++ b/keyboards/akko/acr87/info.json
@@ -0,0 +1,294 @@
+{
+ "keyboard_name": "ACR87",
+ "manufacturer": "Akko",
+ "url":"https://www.akkogear.com",
+ "maintainer": "jonylee@hfd",
+ "usb": {
+ "vid": "0xFFFE",
+ "pid": "0x0010",
+ "device_version": "1.0.1",
+ "suspend_wakeup_delay": 400,
+ "force_nkro": true
+ },
+ "processor": "WB32FQ95",
+ "bootloader": "wb32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"],
+ "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"]
+ },
+ "diode_direction": "ROW2COL",
+ "rgb_matrix": {
+ "driver": "IS31FL3733",
+ "max_brightness": 180,
+ "animations": {
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "raindrops": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "multisplash": true
+ },
+ "layout":[
+ { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+ { "flags": 4, "matrix": [0, 1], "x": 24, "y": 0},
+ { "flags": 4, "matrix": [0, 2], "x": 38, "y": 0},
+ { "flags": 4, "matrix": [0, 3], "x": 52, "y": 0},
+ { "flags": 4, "matrix": [0, 4], "x": 66, "y": 0},
+ { "flags": 4, "matrix": [0, 5], "x": 82, "y": 0},
+ { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0},
+ { "flags": 4, "matrix": [0, 7], "x":110, "y": 0},
+ { "flags": 4, "matrix": [0, 8], "x":124, "y": 0},
+ { "flags": 4, "matrix": [0, 9], "x":140, "y": 0},
+ { "flags": 4, "matrix": [0, 10], "x":154, "y": 0},
+ { "flags": 4, "matrix": [0, 11], "x":168, "y": 0},
+ { "flags": 4, "matrix": [0, 12], "x":182, "y": 0},
+ { "flags": 4, "matrix": [0, 14], "x":196, "y": 0},
+ { "flags": 4, "matrix": [0, 15], "x":210, "y": 0},
+ { "flags": 4, "matrix": [0, 16], "x":224, "y": 0},
+
+ { "flags": 4, "matrix": [1, 0], "x": 0, "y": 12},
+ { "flags": 4, "matrix": [1, 1], "x": 13, "y": 12},
+ { "flags": 4, "matrix": [1, 2], "x": 26, "y": 12},
+ { "flags": 4, "matrix": [1, 3], "x": 39, "y": 12},
+ { "flags": 4, "matrix": [1, 4], "x": 52, "y": 12},
+ { "flags": 4, "matrix": [1, 5], "x": 65, "y": 12},
+ { "flags": 4, "matrix": [1, 6], "x": 79, "y": 12},
+ { "flags": 4, "matrix": [1, 7], "x": 92, "y": 12},
+ { "flags": 4, "matrix": [1, 8], "x":105, "y": 12},
+ { "flags": 4, "matrix": [1, 9], "x":118, "y": 12},
+ { "flags": 4, "matrix": [1, 10], "x":131, "y": 12},
+ { "flags": 4, "matrix": [1, 11], "x":144, "y": 12},
+ { "flags": 4, "matrix": [1, 12], "x":158, "y": 12},
+ { "flags": 4, "matrix": [1, 13], "x":171, "y": 12},
+ { "flags": 4, "matrix": [1, 14], "x":184, "y": 12},
+ { "flags": 4, "matrix": [1, 15], "x":197, "y": 12},
+ { "flags": 4, "matrix": [1, 16], "x":210, "y": 12},
+
+ { "flags": 4, "matrix": [2, 0], "x": 0, "y": 26},
+ { "flags": 4, "matrix": [2, 1], "x": 14, "y": 26},
+ { "flags": 4, "matrix": [2, 2], "x": 28, "y": 26},
+ { "flags": 4, "matrix": [2, 3], "x": 42, "y": 26},
+ { "flags": 4, "matrix": [2, 4], "x": 56, "y": 26},
+ { "flags": 4, "matrix": [2, 5], "x": 70, "y": 26},
+ { "flags": 4, "matrix": [2, 6], "x": 84, "y": 26},
+ { "flags": 4, "matrix": [2, 7], "x": 98, "y": 26},
+ { "flags": 4, "matrix": [2, 8], "x":112, "y": 26},
+ { "flags": 4, "matrix": [2, 9], "x":126, "y": 26},
+ { "flags": 4, "matrix": [2, 10], "x":140, "y": 26},
+ { "flags": 4, "matrix": [2, 11], "x":154, "y": 26},
+ { "flags": 4, "matrix": [2, 12], "x":168, "y": 26},
+ { "flags": 4, "matrix": [2, 13], "x":182, "y": 26},
+ { "flags": 4, "matrix": [2, 14], "x":196, "y": 26},
+ { "flags": 4, "matrix": [2, 15], "x":210, "y": 26},
+ { "flags": 4, "matrix": [2, 16], "x":224, "y": 26},
+
+ { "flags": 4, "matrix": [3, 0], "x": 0, "y": 38},
+ { "flags": 4, "matrix": [3, 1], "x": 14, "y": 38},
+ { "flags": 4, "matrix": [3, 2], "x": 28, "y": 38},
+ { "flags": 4, "matrix": [3, 3], "x": 42, "y": 38},
+ { "flags": 4, "matrix": [3, 4], "x": 56, "y": 38},
+ { "flags": 4, "matrix": [3, 5], "x": 70, "y": 38},
+ { "flags": 4, "matrix": [3, 6], "x": 84, "y": 38},
+ { "flags": 4, "matrix": [3, 7], "x": 98, "y": 38},
+ { "flags": 4, "matrix": [3, 8], "x":112, "y": 38},
+ { "flags": 4, "matrix": [3, 9], "x":126, "y": 38},
+ { "flags": 4, "matrix": [3, 10], "x":140, "y": 38},
+ { "flags": 4, "matrix": [3, 11], "x":154, "y": 38},
+ { "flags": 4, "matrix": [3, 13], "x":182, "y": 38},
+
+ { "flags": 4, "matrix": [4, 0], "x": 0, "y": 51},
+ { "flags": 4, "matrix": [4, 1], "x": 14, "y": 51},
+ { "flags": 4, "matrix": [4, 2], "x": 28, "y": 51},
+ { "flags": 4, "matrix": [4, 3], "x": 42, "y": 51},
+ { "flags": 4, "matrix": [4, 4], "x": 56, "y": 51},
+ { "flags": 4, "matrix": [4, 5], "x": 70, "y": 51},
+ { "flags": 4, "matrix": [4, 6], "x": 84, "y": 51},
+ { "flags": 4, "matrix": [4, 7], "x": 98, "y": 51},
+ { "flags": 4, "matrix": [4, 8], "x":112, "y": 51},
+ { "flags": 4, "matrix": [4, 9], "x":126, "y": 51},
+ { "flags": 4, "matrix": [4, 10], "x":140, "y": 51},
+ { "flags": 4, "matrix": [4, 13], "x":154, "y": 51},
+ { "flags": 4, "matrix": [4, 15], "x":182, "y": 51},
+
+ { "flags": 4, "matrix": [5, 0], "x": 0, "y": 64},
+ { "flags": 4, "matrix": [5, 1], "x": 14, "y": 64},
+ { "flags": 4, "matrix": [5, 2], "x": 28, "y": 64},
+ { "flags": 4, "matrix": [5, 5], "x": 70, "y": 64},
+ { "flags": 4, "matrix": [5, 9], "x":126, "y": 64},
+ { "flags": 4, "matrix": [5, 10], "x":140, "y": 64},
+ { "flags": 4, "matrix": [5, 11], "x":154, "y": 64},
+ { "flags": 4, "matrix": [5, 13], "x":182, "y": 64},
+ { "flags": 4, "matrix": [5, 14], "x":196, "y": 64},
+ { "flags": 4, "matrix": [5, 15], "x":210, "y": 64},
+ { "flags": 4, "matrix": [5, 16], "x":224, "y": 64},
+
+ {"flags": 2, "x":13, "y":0},
+ {"flags": 2, "x":24, "y":0},
+ {"flags": 2, "x":38, "y":0},
+ {"flags": 2, "x":52, "y":0},
+ {"flags": 2, "x":66, "y":0},
+ {"flags": 2, "x":82, "y":0},
+ {"flags": 2, "x":96, "y":0},
+ {"flags": 2, "x":110, "y":0},
+ {"flags": 2, "x":124, "y":0},
+ {"flags": 2, "x":140, "y":0},
+ {"flags": 2, "x":154, "y":0},
+ {"flags": 2, "x":168, "y":0},
+ {"flags": 2, "x":182, "y":0},
+ {"flags": 2, "x":196, "y":0},
+ {"flags": 2, "x":210, "y":0},
+ {"flags": 2, "x":224, "y":0},
+ {"flags": 2, "x":0, "y":8},
+ {"flags": 2, "x":224, "y":8},
+ {"flags": 2, "x":0, "y":16},
+ {"flags": 2, "x":224, "y":16},
+ {"flags": 2, "x":0, "y":24},
+ {"flags": 2, "x":224, "y":24},
+ {"flags": 2, "x":0, "y":32},
+ {"flags": 2, "x":224, "y":32},
+ {"flags": 2, "x":0, "y":40},
+ {"flags": 2, "x":224, "y":40},
+ {"flags": 2, "x":0, "y":48},
+ {"flags": 2, "x":224, "y":48},
+ {"flags": 2, "x":0, "y":56},
+ {"flags": 2, "x":224, "y":56},
+ {"flags": 2, "x":0, "y":64},
+ {"flags": 2, "x":13, "y":64},
+ {"flags": 2, "x":25, "y":64},
+ {"flags": 2, "x":37, "y":64},
+ {"flags": 2, "x":49, "y":64},
+ {"flags": 2, "x":61, "y":64},
+ {"flags": 2, "x":73, "y":64},
+ {"flags": 2, "x":85, "y":64},
+ {"flags": 2, "x":97, "y":64},
+ {"flags": 2, "x":109, "y":64},
+ {"flags": 2, "x":121, "y":64},
+ {"flags": 2, "x":133, "y":64},
+ {"flags": 2, "x":145, "y":64},
+ {"flags": 2, "x":157, "y":64},
+ {"flags": 2, "x":170, "y":64},
+ {"flags": 2, "x":196, "y":64},
+ {"flags": 2, "x":210, "y":64},
+ {"flags": 2, "x":224, "y":64}
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 2, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 3, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 4, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 5, "y": 0 },
+ { "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 9], "x": 11, "y": 0 },
+ { "label": "F10", "matrix": [0, 10], "x": 12, "y": 0 },
+ { "label": "F11", "matrix": [0, 11], "x": 13, "y": 0 },
+ { "label": "F12", "matrix": [0, 12], "x": 14, "y": 0 },
+ { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 },
+ { "label": "ScrLk", "matrix": [0, 15], "x": 16.25, "y": 0 },
+ { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 },
+
+ { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+ { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+ { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+ { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+ { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2 },
+ { "label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25 },
+ { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25 },
+ { "label": "PgUp", "matrix": [1, 16], "x": 17.25, "y": 1.25 },
+
+ { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 },
+ { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
+ { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
+ { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
+ { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
+ { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
+ { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
+ { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
+ { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
+ { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
+ { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
+ { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
+ { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
+ { "label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 },
+ { "label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
+ { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
+ { "label": "PgDn", "matrix": [2, 16], "x": 17.25, "y": 2.25 },
+
+ { "label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 },
+ { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
+ { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
+ { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
+ { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
+ { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
+ { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
+ { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
+ { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
+ { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
+ { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
+ { "label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
+ { "label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 },
+
+ { "label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 },
+ { "label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25 },
+ { "label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25 },
+ { "label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25 },
+ { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25 },
+ { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25 },
+ { "label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25 },
+ { "label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
+ { "label": "<", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
+ { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
+ { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
+ { "label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75 },
+ { "label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.25 },
+
+ { "label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 },
+ { "label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 },
+ { "label": "Space", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25 },
+ { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25 },
+ { "label": "Fn", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25 },
+ { "label": "Ctrl", "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25 },
+ { "label": "Left", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
+ { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
+ { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.25 }
+
+ ]
+ }
+ }
+}
diff --git a/keyboards/akko/acr87/keymaps/default/keymap.c b/keyboards/akko/acr87/keymaps/default/keymap.c
new file mode 100644
index 00000000000..88bfbc8e1fd
--- /dev/null
+++ b/keyboards/akko/acr87/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+enum __layers {
+ WIN_B,
+ WIN_W,
+ WIN_FN,
+ MAC_B,
+ MAC_W,
+ MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [WIN_B] = LAYOUT( /* Base */
+ 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_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, KC_RGUI, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+ _______, _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D),
+
+
+ [WIN_FN] = LAYOUT( /* FN */
+ _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+ _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI,
+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+ [MAC_B] = LAYOUT( /* Base */
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, 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_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_LGUI, KC_SPC, KC_RGUI, KC_RALT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+ _______, _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D),
+ [MAC_FN] = LAYOUT( /* FN */
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+ _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI,
+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI,
+ _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/akko/acr87/keymaps/via/keymap.c b/keyboards/akko/acr87/keymaps/via/keymap.c
new file mode 100644
index 00000000000..88bfbc8e1fd
--- /dev/null
+++ b/keyboards/akko/acr87/keymaps/via/keymap.c
@@ -0,0 +1,79 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+enum __layers {
+ WIN_B,
+ WIN_W,
+ WIN_FN,
+ MAC_B,
+ MAC_W,
+ MAC_FN
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [WIN_B] = LAYOUT( /* Base */
+ 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_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, KC_RGUI, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+ _______, _______, _______, _______, _______, _______, MO(WIN_FN), _______, KC_A, KC_S, KC_D),
+
+
+ [WIN_FN] = LAYOUT( /* FN */
+ _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+ _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI,
+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI),
+
+ [MAC_B] = LAYOUT( /* Base */
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, 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_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_LGUI, KC_SPC, KC_RGUI, KC_RALT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_W] = LAYOUT( /* Base */
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_W,
+ _______, _______, _______, _______, _______, _______, MO(MAC_FN), _______, KC_A, KC_S, KC_D),
+ [MAC_FN] = LAYOUT( /* FN */
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______,
+ _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI,
+ _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_VAI,
+ _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI)
+};
+// clang-format on
diff --git a/keyboards/akko/acr87/keymaps/via/rules.mk b/keyboards/akko/acr87/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/akko/acr87/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/akko/acr87/mcuconf.h b/keyboards/akko/acr87/mcuconf.h
new file mode 100644
index 00000000000..0d16f4f04e4
--- /dev/null
+++ b/keyboards/akko/acr87/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#include_next
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/akko/acr87/readme.md b/keyboards/akko/acr87/readme.md
new file mode 100644
index 00000000000..a4f400ce761
--- /dev/null
+++ b/keyboards/akko/acr87/readme.md
@@ -0,0 +1,19 @@
+# acr87
+
+A customizable 80% encoder keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: acr87
+* Hardware Availability: [akko](https://www.akkogear.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make akko/acr87:default
+
+Flashing example for this keyboard:
+
+ make akko/acr87:default:flash
+
+**Reset Key**: Hold down the key located at *K000*, which programmed as *Esc* while plugging in the keyboard.
+
+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/akko/acr87/rules.mk b/keyboards/akko/acr87/rules.mk
new file mode 100644
index 00000000000..0dc7a331420
--- /dev/null
+++ b/keyboards/akko/acr87/rules.mk
@@ -0,0 +1,3 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
+
diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h
new file mode 100644
index 00000000000..bd849292e6a
--- /dev/null
+++ b/keyboards/akko/top40/config.h
@@ -0,0 +1,52 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+/* Use 5 dynamic keymap layers */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+#define SPI_MOSI_PAL_MODE 5
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 400000 /* 400000 */
+
+#define RGB_MATRIX_LED_COUNT 76
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_KEYRELEASES
+#define RGB_TRIGGER_ON_KEYDOWN
+
diff --git a/keyboards/akko/top40/halconf.h b/keyboards/akko/top40/halconf.h
new file mode 100644
index 00000000000..2f64e65393a
--- /dev/null
+++ b/keyboards/akko/top40/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next
diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/info.json
new file mode 100644
index 00000000000..e7b3a5d01ff
--- /dev/null
+++ b/keyboards/akko/top40/info.json
@@ -0,0 +1,188 @@
+{
+ "keyboard_name": "TOP40",
+ "manufacturer": "Akko",
+ "url":"https://www.akkogear.com",
+ "maintainer": "jonylee@hfd",
+ "usb": {
+ "vid": "0xFFFE",
+ "pid": "0x000E",
+ "device_version": "1.0.2",
+ "suspend_wakeup_delay": 400,
+ "force_nkro": true
+ },
+ "processor": "WB32FQ95",
+ "bootloader": "wb32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4"],
+ "rows": ["C7", "C8", "C9", "A8"]
+ },
+ "diode_direction": "ROW2COL",
+ "rgb_matrix": {
+ "driver": "IS31FL3733",
+ "max_brightness": 180,
+ "animations": {
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "raindrops": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "multisplash": true
+ },
+ "layout":[
+ { "flags": 4, "matrix": [0, 0], "x": 10, "y":10 },
+ { "flags": 4, "matrix": [0, 1], "x": 20, "y":10 },
+ { "flags": 4, "matrix": [0, 2], "x": 40, "y":10 },
+ { "flags": 4, "matrix": [0, 3], "x": 60, "y":10 },
+ { "flags": 4, "matrix": [0, 4], "x": 80, "y":10 },
+ { "flags": 4, "matrix": [0, 5], "x":100 , "y":10 },
+ { "flags": 4, "matrix": [0, 6], "x":120 , "y":10 },
+ { "flags": 4, "matrix": [0, 7], "x":140 , "y":10 },
+ { "flags": 4, "matrix": [0, 8], "x":160 , "y":10 },
+ { "flags": 4, "matrix": [0, 9], "x":180 , "y":10 },
+ { "flags": 4, "matrix": [0, 10], "x":200 , "y":10 },
+ { "flags": 4, "matrix": [0, 11], "x":218 , "y":10 },
+
+ { "flags": 4, "matrix": [1, 0], "x": 10, "y":24 },
+ { "flags": 4, "matrix": [1, 1], "x": 20, "y":24 },
+ { "flags": 4, "matrix": [1, 2], "x": 40, "y":24 },
+ { "flags": 4, "matrix": [1, 3], "x": 60, "y":24 },
+ { "flags": 4, "matrix": [1, 4], "x": 80, "y":24 },
+ { "flags": 4, "matrix": [1, 5], "x":100 , "y":24 },
+ { "flags": 4, "matrix": [1, 6], "x":120 , "y":24 },
+ { "flags": 4, "matrix": [1, 7], "x":140 , "y":24 },
+ { "flags": 4, "matrix": [1, 8], "x":160 , "y":24 },
+ { "flags": 4, "matrix": [1, 9], "x":180 , "y":24 },
+ { "flags": 4, "matrix": [1, 10], "x":200 , "y":24 },
+ { "flags": 4, "matrix": [1, 11], "x":218 , "y":24 },
+
+ { "flags": 4, "matrix": [2, 0], "x": 10, "y":39 },
+ { "flags": 4, "matrix": [2, 1], "x": 20, "y":39 },
+ { "flags": 4, "matrix": [2, 2], "x": 40, "y":39 },
+ { "flags": 4, "matrix": [2, 3], "x": 60, "y":39 },
+ { "flags": 4, "matrix": [2, 4], "x": 80, "y":39 },
+ { "flags": 4, "matrix": [2, 5], "x":100 , "y":39 },
+ { "flags": 4, "matrix": [2, 6], "x":120 , "y":39 },
+ { "flags": 4, "matrix": [2, 7], "x":140 , "y":39 },
+ { "flags": 4, "matrix": [2, 8], "x":160 , "y":39 },
+ { "flags": 4, "matrix": [2, 9], "x":180 , "y":39 },
+ { "flags": 4, "matrix": [2, 10], "x":200 , "y":39 },
+ { "flags": 4, "matrix": [2, 11], "x":218 , "y":39 },
+
+ { "flags": 4, "matrix": [3, 0], "x": 10, "y":54 },
+ { "flags": 4, "matrix": [3, 1], "x": 20, "y":54 },
+ { "flags": 4, "matrix": [3, 2], "x": 40, "y":54 },
+ { "flags": 4, "matrix": [3, 4], "x": 80, "y":54 },
+ { "flags": 4, "matrix": [3, 6], "x":120 , "y":54 },
+ { "flags": 4, "matrix": [3, 8], "x":160 , "y":54 },
+ { "flags": 4, "matrix": [3, 9], "x":180 , "y":54 },
+ { "flags": 4, "matrix": [3, 10], "x":200 , "y":54 },
+ { "flags": 4, "matrix": [3, 11], "x":218 , "y":54 },
+
+ {"flags": 2, "x":0, "y":0},
+ {"flags": 2, "x":15, "y":0},
+ {"flags": 2, "x":25, "y":0},
+ {"flags": 2, "x":45, "y":0},
+ {"flags": 2, "x":65, "y":0},
+ {"flags": 2, "x":85, "y":0},
+ {"flags": 2, "x":105, "y":0},
+ {"flags": 2, "x":125, "y":0},
+ {"flags": 2, "x":145, "y":0},
+ {"flags": 2, "x":165, "y":0},
+ {"flags": 2, "x":185, "y":0},
+ {"flags": 2, "x":205, "y":0},
+ {"flags": 2, "x":224, "y":0},
+ {"flags": 2, "x":0, "y":16},
+ {"flags": 2, "x":224, "y":16},
+ {"flags": 2, "x":0, "y":32},
+ {"flags": 2, "x":224, "y":32},
+ {"flags": 2, "x":0, "y":48},
+ {"flags": 2, "x":224, "y":48},
+ {"flags": 2, "x":0, "y":64},
+ {"flags": 2, "x":15, "y":64},
+ {"flags": 2, "x":40, "y":64},
+ {"flags": 2, "x":62, "y":64},
+ {"flags": 2, "x":80, "y":64},
+ {"flags": 2, "x":100, "y":64},
+ {"flags": 2, "x":125, "y":64},
+ {"flags": 2, "x":145, "y":64},
+ {"flags": 2, "x":165, "y":64},
+ {"flags": 2, "x":185, "y":64},
+ {"flags": 2, "x":205, "y":64},
+ {"flags": 2, "x":224, "y":64}
+ ]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Ese", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "Q", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "W", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "E", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "R", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "T", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "Y", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "U", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "I", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "O", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": "P", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0 , "w": 1.75},
+
+ { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25 },
+ { "label": "A", "matrix": [1, 1], "x": 1.25, "y": 1 },
+ { "label": "S", "matrix": [1, 2], "x": 2.25, "y": 1 },
+ { "label": "D", "matrix": [1, 3], "x": 3.25, "y": 1 },
+ { "label": "F", "matrix": [1, 4], "x": 4.25, "y": 1 },
+ { "label": "G", "matrix": [1, 5], "x": 5.25, "y": 1 },
+ { "label": "H", "matrix": [1, 6], "x": 6.25, "y": 1 },
+ { "label": "J", "matrix": [1, 7], "x": 7.25, "y": 1 },
+ { "label": "K", "matrix": [1, 8], "x": 8.25, "y": 1 },
+ { "label": "L", "matrix": [1, 9], "x": 9.25, "y": 1 },
+ { "label": ":", "matrix": [1, 10], "x": 10.25, "y": 1 },
+ { "label": "Enter", "matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5 },
+
+ { "label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
+ { "label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "X", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "C", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "V", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "B", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "N", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "M", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "<", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": ">", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": "Up", "matrix": [2, 10], "x": 10.75, "y": 2},
+ { "label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2 },
+
+ { "label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25 },
+ { "label": "Win", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25 },
+ { "label": "Alt", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25 },
+ { "label": "Space", "matrix": [3, 4], "x": 3.75, "y": 3, "w": 6.25 },
+ { "label": "Space", "matrix": [3, 6], "x": 6, "y": 3, "w": 2.75 },
+ { "label": "Fn", "matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25 },
+ { "label": "Left", "matrix": [3, 9], "x": 9.75, "y": 3 },
+ { "label": "Down", "matrix": [3, 10], "x": 10.75, "y": 3 },
+ { "label": "Right", "matrix": [3, 11], "x": 11.75, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/akko/top40/keymaps/default/keymap.c b/keyboards/akko/top40/keymaps/default/keymap.c
new file mode 100644
index 00000000000..fb9df162355
--- /dev/null
+++ b/keyboards/akko/top40/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+// clang-format off
+enum __layers {
+ _Base,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_Base] = LAYOUT( /* Base */
+ 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_UP, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, MO(_FN),KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [_FN] = LAYOUT( /* Fn */
+ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
+ _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END, RGB_TOG, RGB_MOD,
+ _______, _______, _______, KC_CALC, _______, AG_TOGG, _______, KC_MUTE, KC_VOLD, KC_VOLU, RGB_VAI, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, RGB_SPI, RGB_VAD, RGB_SAI)
+};
diff --git a/keyboards/akko/top40/keymaps/via/keymap.c b/keyboards/akko/top40/keymaps/via/keymap.c
new file mode 100644
index 00000000000..fb9df162355
--- /dev/null
+++ b/keyboards/akko/top40/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+// clang-format off
+enum __layers {
+ _Base,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_Base] = LAYOUT( /* Base */
+ 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_UP, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, MO(_FN),KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [_FN] = LAYOUT( /* Fn */
+ _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
+ _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, KC_HOME, KC_END, RGB_TOG, RGB_MOD,
+ _______, _______, _______, KC_CALC, _______, AG_TOGG, _______, KC_MUTE, KC_VOLD, KC_VOLU, RGB_VAI, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, RGB_SPI, RGB_VAD, RGB_SAI)
+};
diff --git a/keyboards/akko/top40/keymaps/via/rules.mk b/keyboards/akko/top40/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/akko/top40/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/akko/top40/mcuconf.h b/keyboards/akko/top40/mcuconf.h
new file mode 100644
index 00000000000..0d16f4f04e4
--- /dev/null
+++ b/keyboards/akko/top40/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#include_next
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/akko/top40/readme.md b/keyboards/akko/top40/readme.md
new file mode 100644
index 00000000000..87a2287b934
--- /dev/null
+++ b/keyboards/akko/top40/readme.md
@@ -0,0 +1,19 @@
+# top40
+
+A customizable 40% keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: top40
+* Hardware Availability: [akko](https://www.akkogear.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make akko/top40:default
+
+Flashing example for this keyboard:
+
+ make akko/top40:default:flash
+
+**Reset Key**: Hold down the key located at *K01*, which programmed as *Esc* while plugging in the keyboard.
+
+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/akko/top40/rules.mk b/keyboards/akko/top40/rules.mk
new file mode 100644
index 00000000000..b753f0682e5
--- /dev/null
+++ b/keyboards/akko/top40/rules.mk
@@ -0,0 +1,6 @@
+# Build Options
+# change yes to no to disable
+#
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
+
diff --git a/keyboards/akko/top40/top40.c b/keyboards/akko/top40/top40.c
new file mode 100644
index 00000000000..7fe193447dc
--- /dev/null
+++ b/keyboards/akko/top40/top40.c
@@ -0,0 +1,125 @@
+/* Copyright (C) 2022 jonylee@hfd
+ *
+ * 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 "quantum.h"
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, A_1, B_1, C_1},
+ {0, A_2, B_2, C_2},
+ {0, A_3, B_3, C_3},
+ {0, A_4, B_4, C_4},
+ {0, A_5, B_5, C_5},
+ {0, A_6, B_6, C_6},
+ {0, A_7, B_7, C_7},
+ {0, A_8, B_8, C_8},
+ {0, A_9, B_9, C_9},
+ {0, A_10, B_10, C_10},
+ {0, A_11, B_11, C_11},
+ {0, A_12, B_12, C_12},
+
+ {0, D_1, E_1, F_1},
+ {0, D_2, E_2, F_2},
+ {0, D_3, E_3, F_3},
+ {0, D_4, E_4, F_4},
+ {0, D_5, E_5, F_5},
+ {0, D_6, E_6, F_6},
+ {0, D_7, E_7, F_7},
+ {0, D_8, E_8, F_8},
+ {0, D_9, E_9, F_9},
+ {0, D_10, E_10, F_10},
+ {0, D_11, E_11, F_11},
+ {0, D_12, E_12, F_12},
+
+ {0, G_1, H_1, I_1},
+ {0, G_2, H_2, I_2},
+ {0, G_3, H_3, I_3},
+ {0, G_4, H_4, I_4},
+ {0, G_5, H_5, I_5},
+ {0, G_6, H_6, I_6},
+ {0, G_7, H_7, I_7},
+ {0, G_8, H_8, I_8},
+ {0, G_9, H_9, I_9},
+ {0, G_10, H_10, I_10},
+ {0, G_11, H_11, I_11},
+ {0, G_12, H_12, I_12},
+
+ {0, J_1, K_1, L_1},
+ {0, J_2, K_2, L_2},
+ {0, J_3, K_3, L_3},
+ {0, J_5, K_5, L_5},
+ {0, J_7, K_7, L_7},
+ {0, J_9, K_9, L_9},
+ {0, J_10, K_10, L_10},
+ {0, J_11, K_11, L_11},
+ {0, J_12, K_12, L_12},
+
+ {1, A_1, B_1, C_1},
+ {1, A_2, B_2, C_2},
+ {1, A_3, B_3, C_3},
+ {1, J_7, K_7, L_7},
+ {1, J_6, K_6, L_6},
+ {1, J_5, K_5, L_5},
+ {1, J_4, K_4, L_4},
+ {1, J_3, K_3, L_3},
+ {1, J_2, K_2, L_2},
+ {1, J_1, K_1, L_1},
+ {1, G_8, H_8, I_8},
+ {1, G_7, H_7, I_7},
+ {1, G_6, H_6, I_6},
+
+ {1, A_4, B_4, C_4},
+ {1, G_5, H_5, I_5},
+
+ {1, A_5, B_5, C_5},
+ {1, G_4, H_4, I_4},
+
+ {1, A_6, B_6, C_6},
+ {1, G_3, H_3, I_3},
+
+ {1, A_7, B_7, C_7},
+ {1, A_8, B_8, C_8},
+ {1, D_1, E_1, F_1},
+ {1, D_2, E_2, F_2},
+ {1, D_3, E_3, F_3},
+ {1, D_4, E_4, F_4},
+ {1, D_5, E_5, F_5},
+ {1, D_6, E_6, F_6},
+ {1, D_7, E_7, F_7},
+ {1, D_8, E_8, F_8},
+ {1, G_2, H_2, I_2},
+ {1, G_1, H_1, I_1},
+
+};
+
+// clang-format on
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+ if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+ return false;
+ }
+ if (keymap_config.no_gui) {
+ rgb_matrix_set_color(37, 200, 200, 200);
+ }
+ return true;
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/artemis/paragon/hotswap/info.json b/keyboards/artemis/paragon/hotswap/info.json
new file mode 100644
index 00000000000..c57b49a047d
--- /dev/null
+++ b/keyboards/artemis/paragon/hotswap/info.json
@@ -0,0 +1,6 @@
+{
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "B3", "B6", "B5", "B4", "D7", "D4", "D6"],
+ "rows": ["D2", "D1", "D0", "B2", "B1", "C6"]
+ }
+}
diff --git a/keyboards/artemis/paragon/hotswap/rules.mk b/keyboards/artemis/paragon/hotswap/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/artemis/paragon/hotswap/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/artemis/paragon/info.json b/keyboards/artemis/paragon/info.json
new file mode 100644
index 00000000000..2a2cf046a85
--- /dev/null
+++ b/keyboards/artemis/paragon/info.json
@@ -0,0 +1,122 @@
+{
+ "manufacturer": "Artemis",
+ "keyboard_name": "Paragon",
+ "maintainer": "Sleepdealr",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "encoder": true
+ },
+ "build": {
+ "lto": true
+ },
+ "processor": "atmega32u4",
+ "url": "",
+ "encoder": {
+ "rotary": [
+ { "pin_a": "D3", "pin_b": "D5" }
+ ]
+ },
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x3449",
+ "vid": "0x8C27"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 2], "x": 1.5, "y": 0 },
+ { "matrix": [0, 3], "x": 2.5, "y": 0 },
+ { "matrix": [0, 4], "x": 3.5, "y": 0 },
+ { "matrix": [0, 5], "x": 4.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.5, "y": 0 },
+ { "matrix": [0, 11], "x": 11.5, "y": 0 },
+ { "matrix": [0, 12], "x": 12.5, "y": 0 },
+ { "matrix": [0, 13], "x": 13.5, "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": [1, 9], "x": 9, "y": 1.5 },
+ { "matrix": [1, 10], "x": 10, "y": 1.5 },
+ { "matrix": [1, 11], "x": 11, "y": 1.5 },
+ { "matrix": [1, 12], "x": 12, "y": 1.5 },
+ { "matrix": [1, 13], "x": 13, "y": 1.5 },
+ { "matrix": [1, 14], "x": 14, "y": 1.5 },
+ { "matrix": [1, 15], "x": 15, "y": 1.5 },
+ { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.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": [2, 9], "x": 9.5, "y": 2.5 },
+ { "matrix": [2, 10], "x": 10.5, "y": 2.5 },
+ { "matrix": [2, 11], "x": 11.5, "y": 2.5 },
+ { "matrix": [2, 12], "x": 12.5, "y": 2.5 },
+ { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 },
+ { "matrix": [2, 15], "x": 15, "y": 2.5 },
+ { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 },
+ { "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": [3, 9], "x": 9.75, "y": 3.5 },
+ { "matrix": [3, 10], "x": 10.75, "y": 3.5 },
+ { "matrix": [3, 11], "x": 11.75, "y": 3.5 },
+ { "matrix": [3, 12], "x": 12.75, "y": 3.5 },
+ { "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.5 },
+ { "matrix": [3, 15], "x": 15, "y": 3.5 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 },
+ { "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": [4, 9], "x": 9.25, "y": 4.5 },
+ { "matrix": [4, 10], "x": 10.25, "y": 4.5 },
+ { "matrix": [4, 11], "x": 11.25, "y": 4.5 },
+ { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.5 },
+ { "matrix": [4, 13], "x": 14, "y": 4.5 },
+ { "matrix": [4, 15], "x": 15, "y": 4.5 },
+ { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 },
+ { "matrix": [5, 2], "w": 1.25, "x": 1.25, "y": 5.5 },
+ { "matrix": [5, 3], "w": 1.25, "x": 2.5, "y": 5.5 },
+ { "matrix": [5, 4], "w": 2.25, "x": 3.75, "y": 5.5 },
+ { "matrix": [5, 6], "w": 1.25, "x": 6, "y": 5.5 },
+ { "matrix": [5, 8], "w": 2.75, "x": 7.25, "y": 5.5 },
+ { "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.5 },
+ { "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.5 },
+ { "matrix": [5, 12], "x": 13, "y": 5.5 },
+ { "matrix": [5, 13], "x": 14, "y": 5.5 },
+ { "matrix": [5, 15], "x": 15, "y": 5.5 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/artemis/paragon/keymaps/default/keymap.c b/keyboards/artemis/paragon/keymaps/default/keymap.c
new file mode 100644
index 00000000000..d980180a347
--- /dev/null
+++ b/keyboards/artemis/paragon/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 Sleepdealer
+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_BSPC, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }
+};
+#endif
diff --git a/keyboards/artemis/paragon/keymaps/default/rules.mk b/keyboards/artemis/paragon/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/artemis/paragon/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/artemis/paragon/keymaps/via/keymap.c b/keyboards/artemis/paragon/keymaps/via/keymap.c
new file mode 100644
index 00000000000..84f5735d97b
--- /dev/null
+++ b/keyboards/artemis/paragon/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 Sleepdealer
+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_BSPC, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_NUHS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }
+};
+#endif
diff --git a/keyboards/artemis/paragon/keymaps/via/rules.mk b/keyboards/artemis/paragon/keymaps/via/rules.mk
new file mode 100644
index 00000000000..f1adcab005e
--- /dev/null
+++ b/keyboards/artemis/paragon/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/artemis/paragon/readme.md b/keyboards/artemis/paragon/readme.md
new file mode 100644
index 00000000000..287d141ccc6
--- /dev/null
+++ b/keyboards/artemis/paragon/readme.md
@@ -0,0 +1,23 @@
+# Artemis/Paragon
+
+* Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr)
+* Hardware Supported: Paragon PCB
+* Hardware Availability: GB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make artemis/paragon/hotswap:default
+
+Flashing example for this keyboard:
+
+ make artemis/paragon/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 - 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/artemis/paragon/soldered/info.json b/keyboards/artemis/paragon/soldered/info.json
new file mode 100644
index 00000000000..5158add71e2
--- /dev/null
+++ b/keyboards/artemis/paragon/soldered/info.json
@@ -0,0 +1,6 @@
+{
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B3", "D0", "D1", "D2", "D3", "D7", "D5"],
+ "rows": ["B2", "C7", "C6", "B6", "B5", "B4"]
+ }
+}
diff --git a/keyboards/artemis/paragon/soldered/rules.mk b/keyboards/artemis/paragon/soldered/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/artemis/paragon/soldered/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/cannonkeys/leviatan/info.json b/keyboards/cannonkeys/leviatan/info.json
new file mode 100644
index 00000000000..7e8d6c6fdd1
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/info.json
@@ -0,0 +1,311 @@
+{
+ "manufacturer": "CannonKeys",
+ "url": "https://cannonkeys.com",
+ "maintainer": "awkannan",
+ "keyboard_name": "Leviatan",
+ "usb": {
+ "vid": "0xCA04",
+ "pid": "0x0024",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+ "rows": ["B1", "B0", "A7", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["60_ansi", "60_tsangan_hhkb", "60_iso"],
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"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, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+ {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
+
+ {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+ {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+ {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+ {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+ {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+ {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"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, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "matrix": [0, 13]},
+ {"x": 14, "y": 0, "matrix": [0, 14]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+ {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+ {"x": 14, "y": 3, "matrix": [3, 14]},
+
+ {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+ {"x": 1.5, "y": 4, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+ {"x": 4, "y": 4, "w": 7, "matrix": [4, 6]},
+ {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "matrix": [4, 12]},
+ {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"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, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "matrix": [2, 12]},
+ {"x": 13.75, "y": 1, "w": 1.25, "h": 2, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+ {"x": 1.25, "y": 3, "matrix": [3, 1]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
+
+ {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+ {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+ {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+ {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+ {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+ {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"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, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "matrix": [0, 13]},
+ {"x": 14, "y": 0, "matrix": [0, 14]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+ {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "matrix": [2, 12]},
+ {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+ {"x": 1.25, "y": 3, "matrix": [3, 1]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+ {"x": 14, "y": 3, "matrix": [3, 14]},
+
+ {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+ {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+ {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+ {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+ {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+ {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
+ ]
+ }
+ }
+}
diff --git a/keyboards/cannonkeys/leviatan/keymaps/default/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/default/keymap.c
new file mode 100644
index 00000000000..317eeab093d
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2012,2013 Jun Wako
+
+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
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+ _BASE,
+ _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_60_ansi(
+ QK_GESC, 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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
+ ),
+
+ [_FN1] = LAYOUT_60_ansi(
+ QK_GESC, 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_DEL,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT
+ )
+};
diff --git a/keyboards/cannonkeys/leviatan/keymaps/iso/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/iso/keymap.c
new file mode 100644
index 00000000000..a0cacca0f5c
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/keymaps/iso/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2012,2013 Jun Wako
+
+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
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+ _BASE,
+ _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_60_iso(
+ QK_GESC, 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_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
+ ),
+
+ [_FN1] = LAYOUT_60_iso(
+ QK_GESC, 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_DEL,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_UP, _______, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT
+ )
+};
diff --git a/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c
new file mode 100644
index 00000000000..d280f72d1ec
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/keymaps/tsangan/keymap.c
@@ -0,0 +1,46 @@
+/*
+Copyright 2012,2013 Jun Wako
+
+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
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+ _BASE,
+ _FN1
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_60_tsangan_hhkb(
+ QK_GESC, 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_BSLS, KC_DEL,
+ 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_BSPC,
+ 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, MO(_FN1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
+ ),
+
+ [_FN1] = LAYOUT_60_tsangan_hhkb(
+ KC_GRV, 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_DEL, _______,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, QK_BOOT
+ )
+};
diff --git a/keyboards/cannonkeys/leviatan/keymaps/via/keymap.c b/keyboards/cannonkeys/leviatan/keymaps/via/keymap.c
new file mode 100644
index 00000000000..b3b684cf198
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2012,2013 Jun Wako
+
+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
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+ _BASE,
+ _FN1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_all(
+ QK_GESC, 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_BSPC,
+ 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
+ ),
+
+ [_FN1] = LAYOUT_all(
+ KC_GRV, 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_DEL, KC_DEL,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, QK_BOOT
+ )
+};
diff --git a/keyboards/cannonkeys/leviatan/keymaps/via/rules.mk b/keyboards/cannonkeys/leviatan/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/leviatan/readme.md b/keyboards/cannonkeys/leviatan/readme.md
new file mode 100644
index 00000000000..70b90e95516
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/readme.md
@@ -0,0 +1,25 @@
+# CannonKeys Leviatan for LaminarDesigns
+
+Leviatan Keyboard
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6 (or equivalent)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make cannonkeys/leviatan:default
+
+
+Flashing example for this keyboard:
+
+ make cannonkeys/leviatan: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**: Toggle the switch on the back of the pcb to "0" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cannonkeys/leviatan/rules.mk b/keyboards/cannonkeys/leviatan/rules.mk
new file mode 100644
index 00000000000..2a5031cd320
--- /dev/null
+++ b/keyboards/cannonkeys/leviatan/rules.mk
@@ -0,0 +1,5 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/custommk/ergostrafer/config.h b/keyboards/custommk/ergostrafer/config.h
new file mode 100644
index 00000000000..c5a0ec75b57
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/config.h
@@ -0,0 +1,26 @@
+// Copyright 2023 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// FRAM configuration
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B7
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 4 // 48MHz / 4 = 12MHz; max supported by MB85R64 is 20MHz
+
+// SPI configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B3
+#define SPI_SCK_PAL_MODE 5
+#define SPI_MOSI_PIN B5
+#define SPI_MOSI_PAL_MODE 5
+#define SPI_MISO_PIN B4
+#define SPI_MISO_PAL_MODE 5
+
+#define TAP_CODE_DELAY 10
+
+// Audio configuration
+#define AUDIO_PIN B8
+#define AUDIO_PWM_DRIVER PWMD4
+#define AUDIO_PWM_CHANNEL 3
+#define AUDIO_PWM_PAL_MODE 2
+#define AUDIO_STATE_TIMER GPTD5
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/halconf.h b/keyboards/custommk/ergostrafer/halconf.h
new file mode 100644
index 00000000000..aed037ba2a4
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2023 customMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#define SERIAL_BUFFERS_SIZE 256
+
+// This enables interrupt-driven mode
+#define SPI_USE_WAIT TRUE
+
+#include_next
diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/info.json
new file mode 100644
index 00000000000..66f1562fd98
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/info.json
@@ -0,0 +1,83 @@
+{
+ "manufacturer": "customMK",
+ "keyboard_name": "ErgoStrafer",
+ "maintainer": "customMK",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "encoder": true,
+ "audio": true
+ },
+ "matrix_pins": {
+ "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"],
+ "rows": ["C13", "C14", "C15", "B1", "A7", "A5"]
+ },
+ "processor": "STM32F411",
+ "url": "https://shop.custommk.com/collections/ergostrafer/products/ergostrafer",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0xFAB8",
+ "vid": "0xF35B"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "matrix": [0, 0], "label":"F9", "x":7.5, "y":0 },
+ { "matrix": [0, 1], "label":"7", "x":1.5, "y":1.25 },
+ { "matrix": [0, 2], "label":"8", "x":2.5, "y":1.25 },
+ { "matrix": [0, 3], "label":"9", "x":3.5, "y":1.25 },
+ { "matrix": [0, 4], "label":"0", "x":4.5, "y":1.25 },
+ { "matrix": [0, 5], "label":"-", "x":5.5, "y":1.25 },
+ { "matrix": [0, 6], "label":"T", "x":7.25, "y":3.25, "w":1.5 },
+
+ { "matrix": [1, 0], "label":"PrtScr", "x":7.5, "y":1 },
+ { "matrix": [1, 1], "label":"1", "x":1, "y":2.25 },
+ { "matrix": [1, 2], "label":"2", "x":2, "y":2.25 },
+ { "matrix": [1, 3], "label":"3", "x":3, "y":2.25 },
+ { "matrix": [1, 4], "label":"5", "x":5, "y":2.25 },
+ { "matrix": [1, 5], "label":"6", "x":6, "y":2.25 },
+ { "matrix": [1, 6], "label":"G", "x":7.25, "y":4.25, "w":1.5 },
+
+ { "matrix": [2, 0], "label":"F5", "x":7.5, "y":2 },
+ { "matrix": [2, 1], "label":"Tab", "x":1, "y":3.5 },
+ { "matrix": [2, 2], "label":"Q", "x":2.5, "y":3.4 },
+ { "matrix": [2, 3], "label":"4", "x":4, "y":2.25 },
+ { "matrix": [2, 4], "label":"E", "x":4.5, "y":3.4 },
+ { "matrix": [2, 5], "label":"R", "x":6, "y":3.3 },
+ { "matrix": [2, 6], "label":"B", "x":6.5, "y":5.75, "w":1.5 },
+
+ { "matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.5 },
+ { "matrix": [3, 1], "label":"L Alt", "x":0.25, "y":4.75, "w":1.5 },
+ { "matrix": [3, 2], "label":"A", "x":2.5, "y":4.5 },
+ { "matrix": [3, 3], "label":"W", "x":3.5, "y":3.4 },
+ { "matrix": [3, 4], "label":"D", "x":4.5, "y":4.5 },
+ { "matrix": [3, 5], "label":"F", "x":6, "y":4.3 },
+ { "matrix": [3, 6], "label":"P", "x":8, "y":5.75 },
+
+ { "matrix": [4, 1], "label":"L Shift", "x":0.25, "y":5.75, "w":1.5 },
+ { "matrix": [4, 2], "label":"Z", "x":2.5, "y":5.6 },
+ { "matrix": [4, 3], "label":"S", "x":3.5, "y":4.5 },
+ { "matrix": [4, 5], "label":"V", "x":5, "y":5.75, "w":1.5 },
+ { "matrix": [4, 6], "label":"Space", "x":6.5, "y":6.85, "w":1.75 }
+
+ { "matrix": [5, 1], "label":"L Ctrl Duck", "x":0.25, "y":6.75, "w":1.5 },
+ { "matrix": [5, 3], "label":"X", "x":3.5, "y":5.6 },
+ { "matrix": [5, 5], "label":"C", "x":4.75, "y":6.85, "w":1.75 },
+ { "matrix": [5, 6], "label":"L Ctrl", "x":9.5, "y":5.75 }
+ ]
+ }
+ },
+ "encoder": {
+ "rotary": [
+ { "pin_a": "A8", "pin_b": "A4"},
+ { "pin_a": "B12", "pin_b": "B14"},
+ { "pin_a": "B15", "pin_b": "A15"}
+ ]
+ }
+}
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/keymaps/default/keymap.c b/keyboards/custommk/ergostrafer/keymaps/default/keymap.c
new file mode 100644
index 00000000000..31ceb4f1e69
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F9, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_T,
+ KC_PSCR, KC_1, KC_2, KC_3, KC_5, KC_6, KC_G,
+ KC_F5, KC_TAB, KC_Q, KC_4, KC_E, KC_R, KC_B,
+ KC_CAPS, KC_LALT, KC_A, KC_W, KC_D, KC_F, KC_P,
+ KC_LSFT, KC_Z, KC_S, KC_V, KC_SPC,
+ KC_LCTL, KC_X, KC_C, KC_LCTL
+ )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/keymaps/default/rules.mk b/keyboards/custommk/ergostrafer/keymaps/default/rules.mk
new file mode 100644
index 00000000000..a40474b4d5c
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/keymaps/via/config.h b/keyboards/custommk/ergostrafer/keymaps/via/config.h
new file mode 100644
index 00000000000..81f399d46ba
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/keymaps/via/config.h
@@ -0,0 +1,13 @@
+// Copyright 2023 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// With 8k FRAM, max out dynamic keymap layers and macros
+// 7x6 matrix (84 bytes) and three encoders (12 bytes) consume 96 bytes per layer
+// 32 layers consumes 3072 bytes
+#define DYNAMIC_KEYMAP_LAYER_COUNT 32
+
+// Most of the remaining space can be used for macros
+// QMK Macro keycode range allows up to 128 macros
+#define DYNAMIC_KEYMAP_MACRO_COUNT 128
diff --git a/keyboards/custommk/ergostrafer/keymaps/via/keymap.c b/keyboards/custommk/ergostrafer/keymaps/via/keymap.c
new file mode 100644
index 00000000000..68f1df1c26d
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ KC_F9, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_T,
+ KC_PSCR, KC_1, KC_2, KC_3, KC_5, KC_6, KC_G,
+ KC_F5, KC_TAB, KC_Q, KC_4, KC_E, KC_R, KC_B,
+ KC_CAPS, KC_LALT, KC_A, KC_W, KC_D, KC_F, KC_P,
+ KC_LSFT, KC_Z, KC_S, KC_V, KC_SPC,
+ KC_LCTL, KC_X, KC_C, KC_LCTL
+ )
+};
+
+//#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
+};
+//#endif
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/keymaps/via/rules.mk b/keyboards/custommk/ergostrafer/keymaps/via/rules.mk
new file mode 100644
index 00000000000..4253f570f0b
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/mcuconf.h b/keyboards/custommk/ergostrafer/mcuconf.h
new file mode 100644
index 00000000000..160b94f786e
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 customMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#include_next
+
+// Used for audio
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+// Used for FRAM
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer/readme.md b/keyboards/custommk/ergostrafer/readme.md
new file mode 100644
index 00000000000..dab089647ff
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/readme.md
@@ -0,0 +1,27 @@
+# ergostrafer
+
+
+
+ErgoStrafer is a gaming mechanical keyboard that reproduces the layout of the discontinued SteelSeries Merc Stealth a.k.a. Zboard.
+
+* Keyboard Maintainer: [customMK](https://github.com/customMK)
+* Hardware Supported: ErgoStrafer
+* Hardware Availability: [customMK](https://shop.custommk.com/collections/ergostrafer/products/ergostrafer)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make custommk/ergostrafer:default
+
+Flashing example for this keyboard:
+
+ make custommk/ergostrafer: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 (the "Load" key in the top right corner) 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 `QK_BOOT` if it is available
diff --git a/keyboards/custommk/ergostrafer/rules.mk b/keyboards/custommk/ergostrafer/rules.mk
new file mode 100644
index 00000000000..ee519ea8b55
--- /dev/null
+++ b/keyboards/custommk/ergostrafer/rules.mk
@@ -0,0 +1,3 @@
+EEPROM_DRIVER = spi
+
+AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/doio/kb30/info.json b/keyboards/doio/kb30/info.json
index 3f3fa1c3327..71a300b9cd8 100644
--- a/keyboards/doio/kb30/info.json
+++ b/keyboards/doio/kb30/info.json
@@ -2,7 +2,7 @@
"keyboard_name": "KB30-01",
"manufacturer": "DOIO",
"url": "",
- "maintainer": "Alice",
+ "maintainer": "DOIO2022",
"usb": {
"vid": "0xD010",
"pid": "0x3001",
@@ -49,33 +49,31 @@
{"matrix": [1, 5], "x": 5.25, "y": 1},
{"matrix": [1, 6], "x": 6.25, "y": 1},
- {"matrix": [2, 0], "x": 8.25, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
- {"matrix": [2, 1], "x": 0, "y": 2},
- {"matrix": [2, 2], "x": 1, "y": 2},
- {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
- {"matrix": [2, 4], "x": 4.25, "y": 2},
- {"matrix": [2, 5], "x": 5.25, "y": 2},
- {"matrix": [3, 0], "x": 6.25, "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, "h": 2},
- {"matrix": [3, 1], "x": 11, "y": 2},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
- {"matrix": [3, 2], "x": 0, "y": 3},
- {"matrix": [3, 3], "x": 1, "y": 3},
- {"matrix": [3, 5], "x": 2, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 1], "x": 2, "y": 4},
- {"matrix": [4, 0], "x": 4.25, "y": 3, "h": 2},
- {"matrix": [4, 1], "x": 5.25, "y": 3},
+ {"matrix": [4, 2], "x": 4.25, "y": 4},
+ {"matrix": [4, 3], "x": 5.25, "y": 4},
+ {"matrix": [4, 4], "x": 6.25, "y": 4},
- {"matrix": [4, 2], "x": 9, "y": 4},
-
- {"matrix": [4, 3], "x": 0, "y": 4, "w": 2},
- {"matrix": [4, 4], "x": 2, "y": 4},
-
- {"matrix": [5, 4], "x": 4.25, "y": 4},
- {"matrix": [5, 5], "x": 5.25, "y": 4},
- {"matrix": [5, 6], "x": 6.25, "y": 4}
+ {"matrix": [5, 4], "x": 7.75, "y": 1},
+ {"matrix": [5, 5], "x": 9.75, "y": 1},
+ {"matrix": [5, 6], "x": 7.75, "y": 2, "w": 3, "h": 3}
]
}
}
diff --git a/keyboards/doio/kb30/keymaps/default/keymap.c b/keyboards/doio/kb30/keymaps/default/keymap.c
index fb06acfd803..2e385d24e30 100644
--- a/keyboards/doio/kb30/keymaps/default/keymap.c
+++ b/keyboards/doio/kb30/keymaps/default/keymap.c
@@ -15,65 +15,47 @@
* along with this program. If not, see .
*/
-
#include QMK_KEYBOARD_H
-
enum layer_names {
-_LAY0,
-_LAY1,
-_LAY2,
-_LAY3
+ _LAY0,
+ _LAY1,
+ _LAY2,
+ _LAY3
};
-
-
-
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAY0] = LAYOUT(
- KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUSE,
- KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
- KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN,
- KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP,
- KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT,
- KC_MPLY, TO(1), KC_TRNS),
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUS,
+ KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
+ KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN,
+ KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP,
+ KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT,
+ KC_MPLY, TO(1), KC_TRNS),
[_LAY1] = 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, TO(2), KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, TO(2), KC_TRNS),
[_LAY2] = 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, TO(3), KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, TO(3), KC_TRNS),
[_LAY3] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
- KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI,
- KC_TRNS, TO(0), KC_TRNS)
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
+ KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI,
+ KC_TRNS, TO(0), KC_TRNS)
};
-
-
-
-
-
-
-
-
-
-
-
-
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_LAY0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
diff --git a/keyboards/doio/kb30/keymaps/via/keymap.c b/keyboards/doio/kb30/keymaps/via/keymap.c
index 2890fe604a1..2e385d24e30 100644
--- a/keyboards/doio/kb30/keymaps/via/keymap.c
+++ b/keyboards/doio/kb30/keymaps/via/keymap.c
@@ -15,54 +15,47 @@
* along with this program. If not, see .
*/
-
#include QMK_KEYBOARD_H
-
enum layer_names {
-_LAY0,
-_LAY1,
-_LAY2,
-_LAY3
+ _LAY0,
+ _LAY1,
+ _LAY2,
+ _LAY3
};
-
-
-
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAY0] = LAYOUT(
- KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUSE,
- KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
- KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN,
- KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP,
- KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT,
- KC_MPLY, TO(1), KC_TRNS),
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PSCR, KC_SCRL, KC_PAUS,
+ KC_P7, KC_P8, KC_P9, KC_PPLS, KC_INS, KC_HOME, KC_PGUP,
+ KC_P4, KC_P5, KC_P6, KC_DEL, KC_END, KC_PGDN,
+ KC_P1, KC_P2, KC_P3, LT(3,KC_PENT), KC_UP,
+ KC_P0, KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT,
+ KC_MPLY, TO(1), KC_TRNS),
[_LAY1] = 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, TO(2), KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, TO(2), KC_TRNS),
[_LAY2] = 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, TO(3), KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, TO(3), KC_TRNS),
[_LAY3] = LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
- KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI,
- KC_TRNS, TO(0), KC_TRNS)
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_SAI, RGB_SPI,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_SAD, RGB_SPD,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD,
+ KC_TRNS, KC_TRNS, RGB_VAD, RGB_TOG, RGB_VAI,
+ KC_TRNS, TO(0), KC_TRNS)
};
-
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_LAY0] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
diff --git a/keyboards/doio/kb30/readme.md b/keyboards/doio/kb30/readme.md
new file mode 100644
index 00000000000..9e66c8993fa
--- /dev/null
+++ b/keyboards/doio/kb30/readme.md
@@ -0,0 +1,27 @@
+# Megalodon DOIO 30% Designer Keyboard
+
+
+
+A hotswappable 30-key macropad with 3 rotary encoders (2 are clickable), an OLED screen, and RGB lighting.
+
+* Keyboard Maintainer: [DOIO2022](https://github.com/DOIO2022)
+* Hardware Supported: Megalodon DOIO 30% Designer Keyboard with STM32F103
+* Hardware Availability: [KeebMonkey](https://www.keebmonkey.com/products/megalodon-doio-30-designer-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make doio/kb30:default
+
+## Accessing Bootloader Mode and Flashing
+
+To access Bootloader Mode, do one of the following:
+
+* **Bootmagic reset**: Hold the top left key of the keyboard while connecting the USB cable.
+* **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.
+
+Flashing example for this keyboard:
+
+ make doio/kb30: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).
diff --git a/keyboards/dztech/pluto/info.json b/keyboards/dztech/pluto/info.json
new file mode 100644
index 00000000000..ab201befa31
--- /dev/null
+++ b/keyboards/dztech/pluto/info.json
@@ -0,0 +1,191 @@
+{
+ "manufacturer": "DZTECH",
+ "keyboard_name": "PLUTO",
+ "maintainer": "moyi4681",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP16", "GP15", "GP14", "GP13", "GP0"],
+ "rows": ["GP1", "GP18", "GP17", "GP12", "GP11"]
+ },
+ "processor": "RP2040",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0006",
+ "vid": "0x445A"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "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": [0, 12], "x": 12, "y": 0 },
+ { "matrix": [0, 13], "x": 13, "y": 0 },
+ { "matrix": [0, 14], "x": 14, "y": 0 },
+ { "matrix": [0, 15], "x": 15.25, "y": 0 },
+ { "matrix": [2, 12], "x": 16.25, "y": 0 },
+ { "matrix": [2, 13], "x": 17.25, "y": 0 },
+
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "matrix": [1, 13], "x": 12.75, "y": 2 },
+ { "matrix": [1, 15], "x": 15.25, "y": 1 },
+ { "matrix": [2, 14], "x": 16.25, "y": 1 },
+ { "matrix": [2, 15], "x": 17.25, "y": 1 },
+
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "matrix": [1, 14], "w": 1.25, "x": 12.75, "y": 1 },
+
+ { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [3, 13], "x": 15.25, "y": 3 },
+ { "matrix": [3, 14], "x": 16.25, "y": 3 },
+
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+ { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+ { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+ { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 },
+ { "matrix": [3, 15], "x": 15.25, "y": 4 },
+ { "matrix": [4, 14], "x": 16.25, "y": 4 },
+ { "matrix": [4, 15], "x": 17.25, "y": 4 }
+ ]
+ },
+ "LAYOUT_iso": {
+ "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": [0, 12], "x": 12, "y": 0 },
+ { "matrix": [0, 13], "x": 13, "y": 0 },
+ { "matrix": [0, 14], "x": 14, "y": 0 },
+ { "matrix": [0, 15], "x": 15.25, "y": 0 },
+ { "matrix": [2, 12], "x": 16.25, "y": 0 },
+ { "matrix": [2, 13], "x": 17.25, "y": 0 },
+
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "h": 2, "matrix": [1, 14], "w": 1.25, "x": 13.75, "y": 1 },
+ { "matrix": [1, 15], "x": 15.25, "y": 1 },
+ { "matrix": [2, 14], "x": 16.25, "y": 1 },
+ { "matrix": [2, 15], "x": 17.25, "y": 1 },
+
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "matrix": [1, 13], "x": 12.75, "y": 2 },
+
+ { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [3, 13], "x": 15.25, "y": 3 },
+ { "matrix": [3, 14], "x": 16.25, "y": 3 },
+
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [4, 7], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+ { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+ { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+ { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 },
+ { "matrix": [3, 15], "x": 15.25, "y": 4 },
+ { "matrix": [4, 14], "x": 16.25, "y": 4 },
+ { "matrix": [4, 15], "x": 17.25, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/dztech/pluto/keymaps/default/keymap.c b/keyboards/dztech/pluto/keymaps/default/keymap.c
new file mode 100644
index 00000000000..9edd2f178f0
--- /dev/null
+++ b/keyboards/dztech/pluto/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 DZTECH
+ *
+ * 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_all(
+ 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_DEL, 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_NUHS, 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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
diff --git a/keyboards/dztech/pluto/keymaps/via/keymap.c b/keyboards/dztech/pluto/keymaps/via/keymap.c
new file mode 100644
index 00000000000..9edd2f178f0
--- /dev/null
+++ b/keyboards/dztech/pluto/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 DZTECH
+ *
+ * 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_all(
+ 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_DEL, 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_NUHS, 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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
diff --git a/keyboards/dztech/pluto/keymaps/via/rules.mk b/keyboards/dztech/pluto/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/dztech/pluto/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dztech/pluto/readme.md b/keyboards/dztech/pluto/readme.md
new file mode 100644
index 00000000000..e4db0deb39f
--- /dev/null
+++ b/keyboards/dztech/pluto/readme.md
@@ -0,0 +1,30 @@
+# PLUTO
+
+
+
+The main purpose of this board is to introduce more people to the best layout.
+This board was originally designed to be O-ring gasket mount only, Top mount was added to make the board whole.
+Sticking with a mimal design, the engraving of planets was replaced with the Logo surrounding with pluto moons and planets.
+Pluto now also features an accent Piece with an engraving of Pluto Symbol below the nav cluster.
+
+* Keyboard Maintainer: [DZTECH](https://github.com/moyi4681)
+* Hardware Supported: DZTECH
+* Hardware Availability: KBDFANS
+
+Make example for this keyboard (after setting up your build environment):
+
+ make dztech/pluto:default
+
+Flashing example for this keyboard:
+
+ make dztech/pluto: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/dztech/pluto/rules.mk b/keyboards/dztech/pluto/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/dztech/pluto/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottofrog/info.json b/keyboards/handwired/scottokeebs/scottofrog/info.json
new file mode 100644
index 00000000000..202626b70ff
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottofrog/info.json
@@ -0,0 +1,54 @@
+{
+ "manufacturer": "ScottoKeebs",
+ "keyboard_name": "ScottoFrog",
+ "maintainer": "joe-scotto",
+ "diode_direction": "COL2ROW",
+ "development_board": "promicro",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "matrix_pins": {
+ "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["B1", "B3", "B2", "B6"]
+ },
+ "url": "https://scottokeebs.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0017",
+ "vid": "0x534B"
+ },
+ "layouts": {
+ "LAYOUT_ortho_3x5_5": {
+ "layout": [
+ { "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": [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": [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": [3, 0], "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1, "y": 3 },
+ { "matrix": [3, 3], "x": 3, "y": 3 },
+ { "matrix": [3, 5], "x": 5, "y": 3 },
+ { "matrix": [3, 6], "x": 6, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/mode/m75h/m75h.c b/keyboards/handwired/scottokeebs/scottofrog/keymaps/default/keymap.c
similarity index 57%
rename from keyboards/mode/m75h/m75h.c
rename to keyboards/handwired/scottokeebs/scottofrog/keymaps/default/keymap.c
index 2f2bfbfa4bf..9a220170e49 100644
--- a/keyboards/mode/m75h/m75h.c
+++ b/keyboards/handwired/scottokeebs/scottofrog/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
/*
- Copyright 2020 Álvaro "Gondolindrim" Volpato
+Copyright 2023 Joe Scotto
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
@@ -8,15 +8,21 @@ the Free Software Foundation, either version 2 of the License, or
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
+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 "quantum.h"
+#include QMK_KEYBOARD_H
-void board_init(void) {
- setPinInput(B10);
-}
+// Keymap
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ortho_3x5_5(
+ KC_Q, KC_W, KC_E, KC_W, KC_R,
+ KC_A, KC_S, KC_D, KC_F, KC_G,
+ KC_Z, KC_X, KC_C, KC_V, KC_B,
+ KC_NO, KC_NO, KC_NO, KC_LCTL, KC_SPC
+ )
+};
diff --git a/keyboards/handwired/scottokeebs/scottofrog/readme.md b/keyboards/handwired/scottokeebs/scottofrog/readme.md
new file mode 100644
index 00000000000..59b7f2e8280
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottofrog/readme.md
@@ -0,0 +1,27 @@
+# ScottoFrog
+
+
+
+A 17-key macropad. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+- Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+- Hardware Supported: ATmega32U4
+- Hardware Availability: [Amazon](https://amazon.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/scottokeebs/scottofrog:default
+
+Flashing example for this keyboard:
+
+ make handwired/scottokeebs/scottofrog: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/handwired/scottokeebs/scottofrog/rules.mk b/keyboards/handwired/scottokeebs/scottofrog/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottofrog/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottonum/info.json b/keyboards/handwired/scottokeebs/scottonum/info.json
new file mode 100644
index 00000000000..2907b47af86
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottonum/info.json
@@ -0,0 +1,56 @@
+{
+ "manufacturer": "ScottoKeebs",
+ "keyboard_name": "ScottoNum",
+ "maintainer": "joe-scotto",
+ "diode_direction": "COL2ROW",
+ "development_board": "promicro",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "matrix_pins": {
+ "direct": [
+ ["D3", "D2", "D1", "D0"],
+ ["D4", "C6", "D7", "E6"],
+ ["B4", "B5", "F4"],
+ ["F5", "F6", "F7", "B1"],
+ ["B3", "B2"]
+ ]
+ },
+ "url": "https://scottokeebs.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0014",
+ "vid": "0x534B"
+ },
+ "layouts": {
+ "LAYOUT_numpad_4x5": {
+ "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": [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": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "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": [4, 0], "x": 0, "y": 4 },
+ { "matrix": [4, 1], "x": 1, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/scottokeebs/scottonum/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottonum/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a4b50f7769d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottonum/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2023 Joe Scotto
+
+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
+
+// Keymap
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_numpad_4x5(
+ KC_CIRCUMFLEX, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
+ KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,
+ KC_KP_4, KC_KP_5, KC_KP_6,
+ KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,
+ KC_KP_0, KC_KP_DOT
+ )
+};
diff --git a/keyboards/handwired/scottokeebs/scottonum/readme.md b/keyboards/handwired/scottokeebs/scottonum/readme.md
new file mode 100644
index 00000000000..66cbff80608
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottonum/readme.md
@@ -0,0 +1,27 @@
+# ScottoNum
+
+
+
+A 17-key macropad. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+- Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+- Hardware Supported: ATmega32U4
+- Hardware Availability: [Amazon](https://amazon.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/scottokeebs/scottonum:default
+
+Flashing example for this keyboard:
+
+ make handwired/scottokeebs/scottonum: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/handwired/scottokeebs/scottonum/rules.mk b/keyboards/handwired/scottokeebs/scottonum/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottonum/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/jaykeeb/orba/info.json b/keyboards/jaykeeb/orba/info.json
new file mode 100644
index 00000000000..192bb385ce2
--- /dev/null
+++ b/keyboards/jaykeeb/orba/info.json
@@ -0,0 +1,109 @@
+{
+ "manufacturer": "Alabahuy",
+ "keyboard_name": "orba",
+ "maintainer": "Alabahuy",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["GP17", "GP16", "GP14", "GP13", "GP12", "GP15", "GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20"],
+ "rows": ["GP11", "GP10", "GP18", "GP19", "GP0" ]
+ },
+ "processor": "RP2040",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0769",
+ "vid": "0x414C"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+ {"label": "`", "matrix": [0, 6], "x": 6, "y": 0 },
+ {"label": "-", "matrix": [0, 7], "x": 7, "y": 0 },
+ {"label": "=", "matrix": [0, 8], "x": 8, "y": 0 },
+ {"label": "6", "matrix": [0, 9], "x": 9, "y": 0 },
+ {"label": "7", "matrix": [0, 10], "x": 10, "y": 0 },
+ {"label": "8", "matrix": [0, 11], "x": 11, "y": 0 },
+ {"label": "9", "matrix": [0, 12], "x": 12, "y": 0 },
+ {"label": "0", "matrix": [0, 13], "x": 13, "y": 0 },
+ {"label": "Delete", "matrix": [0, 14], "x": 13, "y": 0 },
+ {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0 },
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1 },
+ {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1 },
+ {"label": "W", "matrix": [1, 2], "x": 2, "y": 1 },
+ {"label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
+ {"label": "R", "matrix": [1, 4], "x": 4, "y": 1 },
+ {"label": "T", "matrix": [1, 5], "x": 5, "y": 1 },
+ {"label": "P7", "matrix": [1, 6], "x": 6, "y": 1 },
+ {"label": "P8", "matrix": [1, 7], "x": 7, "y": 1 },
+ {"label": "P9", "matrix": [1, 8], "x": 8, "y": 1 },
+ {"label": "Y", "matrix": [1, 9], "x": 9, "y": 1 },
+ {"label": "U", "matrix": [1, 10], "x": 10, "y": 1 },
+ {"label": "I", "matrix": [1, 11], "x": 11, "y": 1 },
+ {"label": "O", "matrix": [1, 12], "x": 12, "y": 1 },
+ {"label": "P", "matrix": [1, 13], "x": 13, "y": 1 },
+ {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1 },
+ {"label": "Page Up", "matrix": [1, 15], "x": 15, "y": 1 },
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2 },
+ {"label": "A", "matrix": [2, 1], "x": 1, "y": 2 },
+ {"label": "S", "matrix": [2, 2], "x": 2, "y": 2 },
+ {"label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
+ {"label": "F", "matrix": [2, 4], "x": 4, "y": 2 },
+ {"label": "G", "matrix": [2, 5], "x": 5, "y": 2 },
+ {"label": "P4", "matrix": [2, 6], "x": 6, "y": 2 },
+ {"label": "P5", "matrix": [2, 7], "x": 7, "y": 2 },
+ {"label": "P6", "matrix": [2, 8], "x": 8, "y": 2 },
+ {"label": "H", "matrix": [2, 9], "x": 9, "y": 2 },
+ {"label": "J", "matrix": [2, 10], "x": 10, "y": 2 },
+ {"label": "K", "matrix": [2, 11], "x": 11, "y": 2 },
+ {"label": "L", "matrix": [2, 12], "x": 12, "y": 2 },
+ {"label": ":", "matrix": [2, 13], "x": 13, "y": 2 },
+ {"label": "", "matrix": [2, 14], "x": 13, "y": 2 },
+ {"label": "Page Down", "matrix": [2, 15], "x": 15, "y": 2 },
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3 },
+ {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3 },
+ {"label": "X", "matrix": [3, 2], "x": 2, "y": 3 },
+ {"label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
+ {"label": "V", "matrix": [3, 4], "x": 4, "y": 3 },
+ {"label": "B", "matrix": [3, 5], "x": 5, "y": 3 },
+ {"label": "P1", "matrix": [3, 6], "x": 6, "y": 3 },
+ {"label": "P2", "matrix": [3, 7], "x": 7, "y": 3 },
+ {"label": "P3", "matrix": [3, 8], "x": 8, "y": 3 },
+ {"label": "N", "matrix": [3, 9], "x": 9, "y": 3 },
+ {"label": "M", "matrix": [3, 10], "x": 10, "y": 3 },
+ {"label": ",", "matrix": [3, 11], "x": 11, "y": 3 },
+ {"label": ".", "matrix": [3, 12], "x": 12, "y": 3 },
+ {"label": "/", "matrix": [3, 13], "x": 13, "y": 3 },
+ {"label": "\u2191", "matrix": [3, 14], "x": 13, "y": 3 },
+ {"label": "Enter", "matrix": [3, 15], "x": 15, "y": 3 },
+
+ {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ {"label": "GUI", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ {"label": "Space", "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ {"label": "Fn", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+ {"label": "Ctrl","matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+ {"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4 },
+ {"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4 },
+ {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4 }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/jaykeeb/orba/keymaps/default/keymap.c b/keyboards/jaykeeb/orba/keymaps/default/keymap.c
new file mode 100644
index 00000000000..96710a95aad
--- /dev/null
+++ b/keyboards/jaykeeb/orba/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Alabahuy (@Alabahuy)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ ~ │ - │ = │ 6 │ 7 │ 8 │ 9 │ 0 │Del│Hom│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Tab│ Q │ W │ E │ R │ T │ 7 │ 8 │ 9 │ Y │ U │ I │ O │ P │Bsc│PgU│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Cap│ A │ S │ D │ F │ G │ 4 │ 5 │ 6 │ H │ J │ k │ L │ : │ " │PgD│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Shf│ Z │ X │ C │ V │ B │ 1 │ 2 │ 3 │ N │ M │ < │ > │ ? │ │Ent│
+ * ├───┴┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┼───┼───┼───┤
+ * │Ctrl│GUI │Alt │ │ FN │Ctrl│ │ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ */
+ [0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P1, KC_P2, KC_P3, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_ENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+
+ [1] = LAYOUT(
+ _______, 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_DEL, QK_RBT, QK_BOOT,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/jaykeeb/orba/keymaps/via/keymap.c b/keyboards/jaykeeb/orba/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c567537ce59
--- /dev/null
+++ b/keyboards/jaykeeb/orba/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2023 Alabahuy (@Alabahuy)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ ~ │ - │ + │ 6 │ 7 │ 8 │ 9 │ 0 │Del│Hom│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Tab│ Q │ W │ E │ R │ T │ 7 │ 8 │ 9 │ Y │ U │ I │ O │ P │Bsc│PgU│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Cap│ A │ S │ D │ F │ G │ 4 │ 5 │ 6 │ H │ J │ k │ L │ : │ " │PgD│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │Shf│ Z │ X │ C │ V │ B │ 1 │ 2 │ 3 │ N │ M │ < │ > │ ? │ │Ent│
+ * ├───┴┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┼───┼───┼───┤
+ * │Ctrl│GUI │Alt │ │ FN │Ctrl│ │ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ */
+ [0] = LAYOUT(
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_P7, KC_P8, KC_P9, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_P4, KC_P5, KC_P6, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_P1, KC_P2, KC_P3, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_ENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+
+ [1] = LAYOUT(
+ _______, 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_DEL, QK_RBT, QK_BOOT,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+
+
+};
diff --git a/keyboards/jaykeeb/orba/keymaps/via/rules.mk b/keyboards/jaykeeb/orba/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/jaykeeb/orba/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jaykeeb/orba/readme.md b/keyboards/jaykeeb/orba/readme.md
new file mode 100644
index 00000000000..23efe28b519
--- /dev/null
+++ b/keyboards/jaykeeb/orba/readme.md
@@ -0,0 +1,27 @@
+# orba
+
+
+
+PCB like 65% with ortho 16x4 and bottom ansi or tsangan
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/Alabahuy)
+* Hardware Supported: orba PCB, RP2040
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make jaykeeb/orba:default
+
+Flashing example for this keyboard:
+
+ make jaykeeb/orba: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/jaykeeb/orba/rules.mk b/keyboards/jaykeeb/orba/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/jaykeeb/orba/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/jaykeeb/skyline/info.json b/keyboards/jaykeeb/skyline/info.json
new file mode 100644
index 00000000000..14b596ebba1
--- /dev/null
+++ b/keyboards/jaykeeb/skyline/info.json
@@ -0,0 +1,563 @@
+{
+ "manufacturer": "Jaykeeb",
+ "keyboard_name": "Skyline",
+ "maintainer": "Alabahuy",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "indicators": {
+ "caps_lock": "GP24",
+ "scroll_lock": "GP12",
+ "on_state": 0
+ },
+ "matrix_pins": {
+ "cols": ["GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0", "GP29", "GP28", "GP16", "GP15", "GP14"],
+ "rows": ["GP13", "GP27", "GP26", "GP25", "GP22", "GP23"]
+ },
+ "processor": "RP2040",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0799",
+ "vid": "0x414C"
+ },
+ "community_layouts": [
+ "tkl_ansi_tsangan",
+ "tkl_ansi_tsangan_split_bs_rshift",
+ "tkl_iso_tsangan",
+ "tkl_iso_tsangan_split_bs_rshift"
+ ],
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "\\", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "|", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 13.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\u2298", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Fn1", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "|", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "\\", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "|", "matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Fn1", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 4], "x": 4, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 9], "x": 11, "y": 5.25, "w": 1.5},
+ {"label": "Fn", "matrix": [5, 10], "x": 12.5, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 12], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 7], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_iso_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"label": "Delete", "matrix": [2, 13], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 14], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 15], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 14], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "\\", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [2, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"label": "Page Up", "matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"label": "Page Down", "matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Fn1", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7},
+ {"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25},
+ {"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/jaykeeb/skyline/keymaps/default/keymap.c b/keyboards/jaykeeb/skyline/keymaps/default/keymap.c
new file mode 100644
index 00000000000..78cf4b4c44d
--- /dev/null
+++ b/keyboards/jaykeeb/skyline/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Alabahuy
+ * 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_all(
+ 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_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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+
+};
\ No newline at end of file
diff --git a/keyboards/jaykeeb/skyline/keymaps/via/keymap.c b/keyboards/jaykeeb/skyline/keymaps/via/keymap.c
new file mode 100644
index 00000000000..78cf4b4c44d
--- /dev/null
+++ b/keyboards/jaykeeb/skyline/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2023 Alabahuy
+ * 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_all(
+ 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_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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+
+};
\ No newline at end of file
diff --git a/keyboards/jaykeeb/skyline/keymaps/via/rules.mk b/keyboards/jaykeeb/skyline/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/jaykeeb/skyline/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jaykeeb/skyline/matrix_diagram.md b/keyboards/jaykeeb/skyline/matrix_diagram.md
new file mode 100644
index 00000000000..419567fab54
--- /dev/null
+++ b/keyboards/jaykeeb/skyline/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Skyline
+
+```
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+│00 │ │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │0F │0G │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐ ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D │ │1E │1F │1G │ │1D │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤ └─┬─────┤
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3D │ │2E │2F │2G │ │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐3D │ ISO Enter
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │ │3C │ │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ └───┴────┘
+│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │ │4F │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ┌───┼───┼───┐
+│50 │51 │52 │57 │5B │5C │5D │ │5E │5F │5G │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ └───┴───┴───┘
+┌────────┐ ┌──────────┐
+│40 │ 2.25u LShift 2.75u RShift │4C │
+└────────┘ └──────────┘
+```
diff --git a/keyboards/jaykeeb/skyline/readme.md b/keyboards/jaykeeb/skyline/readme.md
new file mode 100644
index 00000000000..92291310e04
--- /dev/null
+++ b/keyboards/jaykeeb/skyline/readme.md
@@ -0,0 +1,27 @@
+#Skyline
+
+
+
+PCB for "Skyline" TKL Mechanical Keyboard
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: Skyline PCB, RP2040
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make jaykeeb/skyline:default
+
+Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+
+ make jaykeeb/skyline: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
\ No newline at end of file
diff --git a/keyboards/jaykeeb/skyline/rules.mk b/keyboards/jaykeeb/skyline/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/jaykeeb/skyline/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/keebio/sinc/keymaps/default/keymap.c b/keyboards/keebio/sinc/keymaps/default/keymap.c
index 20c12a4a6e4..171b7a7d057 100644
--- a/keyboards/keebio/sinc/keymaps/default/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keebio/sinc/keymaps/iso/keymap.c b/keyboards/keebio/sinc/keymaps/iso/keymap.c
index f7ad1047bf2..f3eaaa5bca0 100644
--- a/keyboards/keebio/sinc/keymaps/iso/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/iso/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keebio/sinc/keymaps/via/keymap.c b/keyboards/keebio/sinc/keymaps/via/keymap.c
index 2a54d1aa5a3..a1299ce112b 100644
--- a/keyboards/keebio/sinc/keymaps/via/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/via/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keebio/sinc/rev4/config.h b/keyboards/keebio/sinc/rev4/config.h
new file mode 100644
index 00000000000..b6c5785f4cf
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/config.h
@@ -0,0 +1,72 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SPLIT_HAND_PIN GP4
+#define USB_VBUS_PIN GP14
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+#define SERIAL_USART_PIN_SWAP
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+#define I2C_DRIVER I2CD1
+#define I2C1_SDA_PIN GP22
+#define I2C1_SCL_PIN GP23
+
+// RGB Matrix
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_LED_COUNT 117
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/keebio/sinc/rev4/halconf.h b/keyboards/keebio/sinc/rev4/halconf.h
new file mode 100644
index 00000000000..64036dec35f
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next
diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/info.json
new file mode 100644
index 00000000000..f985f64e48f
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/info.json
@@ -0,0 +1,1146 @@
+{
+ "keyboard_name": "Sinc Rev. 4",
+ "usb": {
+ "pid": "0x4267",
+ "device_version": "4.0.0"
+ },
+ "processor": "RP2040",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "console": true,
+ "rgb_matrix": true
+ },
+ "split": {
+ "enabled": true,
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "GP5", "pin_b": "GP6"}
+ ]
+ }
+ },
+ "matrix_pins": {
+ "right": {
+ "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
+ "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
+ }
+ }
+ },
+ "matrix_pins": {
+ "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
+ "rows": ["GP25", "GP19", "GP24", "GP17", "GP16", "GP26"]
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {"pin_a": "GP21", "pin_b": "GP20"}
+ ]
+ },
+ "ws2812": {
+ "pin": "GP18",
+ "driver": "vendor"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "split_count": [58, 59],
+ "layout": [
+ {"flags": 4, "matrix": [5, 2], "x": 30, "y": 0},
+ {"flags": 2, "x": 42, "y": 6},
+ {"flags": 4, "matrix": [5, 3], "x": 45, "y": 0},
+ {"flags": 4, "matrix": [5, 4], "x": 58, "y": 0},
+ {"flags": 2, "x": 67, "y": 6},
+ {"flags": 4, "matrix": [5, 5], "x": 70, "y": 0},
+ {"flags": 4, "matrix": [5, 6], "x": 82, "y": 0},
+ {"flags": 4, "matrix": [5, 7], "x": 97, "y": 0},
+ {"flags": 2, "x": 103, "y": 6},
+ {"flags": 4, "matrix": [5, 8], "x": 109, "y": 0},
+
+ {"flags": 4, "matrix": [0, 8], "x": 103, "y": 15},
+ {"flags": 4, "matrix": [0, 7], "x": 91, "y": 15},
+ {"flags": 4, "matrix": [0, 6], "x": 79, "y": 15},
+ {"flags": 4, "matrix": [0, 5], "x": 67, "y": 15},
+ {"flags": 4, "matrix": [0, 4], "x": 54, "y": 15},
+ {"flags": 4, "matrix": [0, 3], "x": 42, "y": 15},
+ {"flags": 4, "matrix": [0, 2], "x": 30, "y": 15},
+
+ {"flags": 4, "matrix": [1, 2], "x": 33, "y": 27},
+ {"flags": 4, "matrix": [1, 3], "x": 48, "y": 27},
+ {"flags": 4, "matrix": [1, 4], "x": 61, "y": 27},
+ {"flags": 4, "matrix": [1, 5], "x": 73, "y": 27},
+ {"flags": 4, "matrix": [1, 6], "x": 85, "y": 27},
+ {"flags": 4, "matrix": [1, 7], "x": 97, "y": 27},
+
+ {"flags": 4, "matrix": [2, 7], "x": 100, "y": 40},
+ {"flags": 4, "matrix": [2, 6], "x": 88, "y": 40},
+ {"flags": 4, "matrix": [2, 5], "x": 76, "y": 40},
+ {"flags": 4, "matrix": [2, 4], "x": 64, "y": 40},
+ {"flags": 4, "matrix": [2, 3], "x": 51, "y": 40},
+ {"flags": 4, "matrix": [2, 2], "x": 35, "y": 40},
+
+ {"flags": 4, "matrix": [3, 2], "x": 38, "y": 52},
+ {"flags": 4, "matrix": [3, 4], "x": 58, "y": 52},
+ {"flags": 4, "matrix": [3, 5], "x": 70, "y": 52},
+ {"flags": 4, "matrix": [3, 6], "x": 82, "y": 52},
+ {"flags": 4, "matrix": [3, 7], "x": 94, "y": 52},
+ {"flags": 2, "x": 100, "y": 55},
+ {"flags": 4, "matrix": [3, 8], "x": 106, "y": 52},
+
+ {"flags": 4, "x": 107, "y": 64},
+ {"flags": 4, "matrix": [4, 7], "x": 97, "y": 64},
+ {"flags": 4, "matrix": [4, 6], "x": 85, "y": 64},
+ {"flags": 4, "matrix": [4, 5], "x": 75, "y": 64},
+ {"flags": 2, "x": 70, "y": 64},
+ {"flags": 4, "matrix": [4, 4], "x": 62, "y": 64},
+ {"flags": 4, "matrix": [4, 3], "x": 47, "y": 64},
+ {"flags": 2, "x": 39, "y": 64},
+ {"flags": 4, "matrix": [4, 2], "x": 32, "y": 64},
+
+ {"flags": 4, "matrix": [4, 1], "x": 12, "y": 64},
+ {"flags": 2, "x": 6, "y": 64},
+ {"flags": 4, "matrix": [4, 0], "x": 0, "y": 64},
+
+ {"flags": 4, "matrix": [3, 0], "x": 0, "y": 52},
+ {"flags": 4, "matrix": [3, 1], "x": 12, "y": 52},
+ {"flags": 4, "matrix": [2, 1], "x": 12, "y": 40},
+ {"flags": 4, "matrix": [2, 0], "x": 0, "y": 40},
+ {"flags": 4, "matrix": [1, 0], "x": 0, "y": 27},
+ {"flags": 4, "matrix": [1, 1], "x": 12, "y": 27},
+ {"flags": 4, "matrix": [0, 1], "x": 12, "y": 15},
+ {"flags": 4, "matrix": [0, 0], "x": 0, "y": 15},
+ {"flags": 4, "matrix": [5, 0], "x": 0, "y": 0},
+ {"flags": 2, "x": 9, "y": 0},
+
+ {"flags": 2, "x": 224, "y": 6},
+ {"flags": 4, "matrix": [11, 8], "x": 224, "y": 0},
+ {"flags": 4, "matrix": [11, 7], "x": 212, "y": 0},
+ {"flags": 4, "matrix": [11, 6], "x": 197, "y": 0},
+ {"flags": 2, "x": 191, "y": 6},
+ {"flags": 4, "matrix": [11, 5], "x": 185, "y": 0},
+ {"flags": 4, "matrix": [11, 4], "x": 173, "y": 0},
+ {"flags": 2, "x": 166, "y": 6},
+ {"flags": 4, "matrix": [11, 3], "x": 160, "y": 0},
+ {"flags": 4, "matrix": [11, 2], "x": 145, "y": 0},
+ {"flags": 2, "x": 139, "y": 6},
+ {"flags": 4, "matrix": [11, 1], "x": 133, "y": 0},
+
+ {"flags": 4, "matrix": [6, 0], "x": 127, "y": 15},
+ {"flags": 4, "matrix": [6, 1], "x": 139, "y": 15},
+ {"flags": 4, "matrix": [6, 2], "x": 151, "y": 15},
+ {"flags": 4, "matrix": [6, 3], "x": 163, "y": 15},
+ {"flags": 4, "matrix": [6, 4], "x": 176, "y": 15},
+ {"flags": 4, "matrix": [6, 5], "x": 188, "y": 15},
+ {"flags": 4, "matrix": [6, 6], "x": 200, "y": 15},
+ {"flags": 4, "matrix": [6, 7], "x": 212, "y": 15},
+ {"flags": 4, "matrix": [6, 8], "x": 224, "y": 15},
+
+ {"flags": 4, "matrix": [7, 8], "x": 224, "y": 27},
+ {"flags": 4, "matrix": [7, 7], "x": 209, "y": 27},
+ {"flags": 4, "matrix": [7, 6], "x": 194, "y": 27},
+ {"flags": 4, "matrix": [7, 5], "x": 182, "y": 27},
+ {"flags": 4, "matrix": [7, 4], "x": 170, "y": 27},
+ {"flags": 4, "matrix": [7, 3], "x": 157, "y": 27},
+ {"flags": 4, "matrix": [7, 2], "x": 145, "y": 27},
+ {"flags": 4, "matrix": [7, 1], "x": 133, "y": 27},
+ {"flags": 4, "matrix": [7, 0], "x": 121, "y": 27},
+
+ {"flags": 4, "matrix": [8, 0], "x": 124, "y": 40},
+ {"flags": 4, "matrix": [8, 1], "x": 136, "y": 40},
+ {"flags": 4, "matrix": [8, 2], "x": 148, "y": 40},
+ {"flags": 4, "matrix": [8, 3], "x": 160, "y": 40},
+ {"flags": 4, "matrix": [8, 4], "x": 173, "y": 40},
+ {"flags": 4, "matrix": [8, 5], "x": 185, "y": 40},
+ {"flags": 4, "matrix": [8, 7], "x": 204, "y": 40},
+ {"flags": 4, "matrix": [8, 8], "x": 224, "y": 40},
+
+ {"flags": 4, "matrix": [9, 8], "x": 224, "y": 52},
+ {"flags": 4, "matrix": [9, 7], "x": 212, "y": 52},
+ {"flags": 4, "matrix": [9, 6], "x": 195, "y": 52},
+ {"flags": 4, "matrix": [9, 4], "x": 179, "y": 52},
+ {"flags": 4, "matrix": [9, 3], "x": 166, "y": 52},
+ {"flags": 4, "matrix": [9, 2], "x": 154, "y": 52},
+ {"flags": 4, "matrix": [9, 1], "x": 142, "y": 52},
+ {"flags": 4, "matrix": [9, 0], "x": 130, "y": 52},
+
+ {"flags": 2, "x": 136, "y": 55},
+ {"flags": 4, "matrix": [10, 0], "x": 132, "y": 64},
+ {"flags": 4, "matrix": [10, 1], "x": 139, "y": 64},
+ {"flags": 4, "x": 148, "y": 64},
+ {"flags": 2, "x": 154, "y": 64},
+ {"flags": 4, "matrix": [10, 2], "x": 163, "y": 64},
+ {"flags": 4, "matrix": [10, 3], "x": 176, "y": 64},
+ {"flags": 4, "matrix": [10, 4], "x": 188, "y": 64},
+ {"flags": 2, "x": 194, "y": 64},
+ {"flags": 4, "matrix": [10, 6], "x": 200, "y": 64},
+ {"flags": 4, "matrix": [10, 7], "x": 212, "y": 64},
+ {"flags": 4, "matrix": [10, 8], "x": 224, "y": 64},
+ {"flags": 2, "x": 224, "y": 55}
+ ]
+ },
+ "layouts": {
+ "LAYOUT_75": {
+ "layout": [
+ {"matrix": [5, 2], "x": 0, "y": 0},
+ {"matrix": [5, 3], "x": 1.25, "y": 0},
+ {"matrix": [5, 4], "x": 2.25, "y": 0},
+ {"matrix": [5, 5], "x": 3.25, "y": 0},
+ {"matrix": [5, 6], "x": 4.25, "y": 0},
+ {"matrix": [5, 7], "x": 5.5, "y": 0},
+ {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+ {"matrix": [11, 1], "x": 8.5, "y": 0},
+ {"matrix": [11, 2], "x": 9.5, "y": 0},
+ {"matrix": [11, 3], "x": 10.75, "y": 0},
+ {"matrix": [11, 4], "x": 11.75, "y": 0},
+ {"matrix": [11, 5], "x": 12.75, "y": 0},
+ {"matrix": [11, 6], "x": 13.75, "y": 0},
+ {"matrix": [11, 7], "x": 15, "y": 0},
+
+ {"matrix": [0, 2], "x": 0, "y": 1.25},
+ {"matrix": [0, 3], "x": 1, "y": 1.25},
+ {"matrix": [0, 4], "x": 2, "y": 1.25},
+ {"matrix": [0, 5], "x": 3, "y": 1.25},
+ {"matrix": [0, 6], "x": 4, "y": 1.25},
+ {"matrix": [0, 7], "x": 5, "y": 1.25},
+ {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 8, "y": 1.25},
+ {"matrix": [6, 1], "x": 9, "y": 1.25},
+ {"matrix": [6, 2], "x": 10, "y": 1.25},
+ {"matrix": [6, 3], "x": 11, "y": 1.25},
+ {"matrix": [6, 4], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.25},
+ {"matrix": [6, 6], "x": 14, "y": 1.25},
+ {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+ {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+ {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+ {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+ {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+ {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+ {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+ {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+ {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+ {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+ {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+ {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+ {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+ {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+ {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 5.25},
+ {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 11, "y": 5.25},
+ {"matrix": [10, 3], "x": 12, "y": 5.25},
+ {"matrix": [10, 4], "x": 13, "y": 5.25},
+ {"matrix": [10, 6], "x": 14, "y": 5.25},
+ {"matrix": [10, 7], "x": 15, "y": 5.25}
+ ]
+ },
+ "LAYOUT_75_iso": {
+ "layout": [
+ {"matrix": [5, 2], "x": 0, "y": 0},
+ {"matrix": [5, 3], "x": 1.25, "y": 0},
+ {"matrix": [5, 4], "x": 2.25, "y": 0},
+ {"matrix": [5, 5], "x": 3.25, "y": 0},
+ {"matrix": [5, 6], "x": 4.25, "y": 0},
+ {"matrix": [5, 7], "x": 5.5, "y": 0},
+ {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+ {"matrix": [11, 1], "x": 8.5, "y": 0},
+ {"matrix": [11, 2], "x": 9.5, "y": 0},
+ {"matrix": [11, 3], "x": 10.75, "y": 0},
+ {"matrix": [11, 4], "x": 11.75, "y": 0},
+ {"matrix": [11, 5], "x": 12.75, "y": 0},
+ {"matrix": [11, 6], "x": 13.75, "y": 0},
+ {"matrix": [11, 7], "x": 15, "y": 0},
+
+ {"matrix": [0, 2], "x": 0, "y": 1.25},
+ {"matrix": [0, 3], "x": 1, "y": 1.25},
+ {"matrix": [0, 4], "x": 2, "y": 1.25},
+ {"matrix": [0, 5], "x": 3, "y": 1.25},
+ {"matrix": [0, 6], "x": 4, "y": 1.25},
+ {"matrix": [0, 7], "x": 5, "y": 1.25},
+ {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 8, "y": 1.25},
+ {"matrix": [6, 1], "x": 9, "y": 1.25},
+ {"matrix": [6, 2], "x": 10, "y": 1.25},
+ {"matrix": [6, 3], "x": 11, "y": 1.25},
+ {"matrix": [6, 4], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.25},
+ {"matrix": [6, 6], "x": 14, "y": 1.25},
+ {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+ {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+ {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+ {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+
+ {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+ {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+ {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+ {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+ {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+ {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+ {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+ {"matrix": [7, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+ {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+ {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+ {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+ {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 5.25},
+ {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 11, "y": 5.25},
+ {"matrix": [10, 3], "x": 12, "y": 5.25},
+ {"matrix": [10, 4], "x": 13, "y": 5.25},
+ {"matrix": [10, 6], "x": 14, "y": 5.25},
+ {"matrix": [10, 7], "x": 15, "y": 5.25}
+ ]
+ },
+ "LAYOUT_75_iso_with_macro": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 2.25, "y": 0},
+ {"matrix": [5, 3], "x": 3.5, "y": 0},
+ {"matrix": [5, 4], "x": 4.5, "y": 0},
+ {"matrix": [5, 5], "x": 5.5, "y": 0},
+ {"matrix": [5, 6], "x": 6.5, "y": 0},
+ {"matrix": [5, 7], "x": 7.75, "y": 0},
+ {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+ {"matrix": [11, 1], "x": 10.75, "y": 0},
+ {"matrix": [11, 2], "x": 11.75, "y": 0},
+ {"matrix": [11, 3], "x": 13, "y": 0},
+ {"matrix": [11, 4], "x": 14, "y": 0},
+ {"matrix": [11, 5], "x": 15, "y": 0},
+ {"matrix": [11, 6], "x": 16, "y": 0},
+ {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+ {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+ {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+ {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+ {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+ {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+ {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+ {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+ {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+ {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 3.25},
+ {"matrix": [2, 4], "x": 5, "y": 3.25},
+ {"matrix": [2, 5], "x": 6, "y": 3.25},
+ {"matrix": [2, 6], "x": 7, "y": 3.25},
+ {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 10, "y": 3.25},
+ {"matrix": [8, 1], "x": 11, "y": 3.25},
+ {"matrix": [8, 2], "x": 12, "y": 3.25},
+ {"matrix": [8, 3], "x": 13, "y": 3.25},
+ {"matrix": [8, 4], "x": 14, "y": 3.25},
+ {"matrix": [8, 5], "x": 15, "y": 3.25},
+ {"matrix": [8, 6], "x": 16, "y": 3.25},
+ {"matrix": [7, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.25},
+ {"matrix": [3, 1], "x": 1, "y": 4.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+ {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.25},
+ {"matrix": [4, 1], "x": 1, "y": 5.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+ {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+ {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_75_with_macro": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 2.25, "y": 0},
+ {"matrix": [5, 3], "x": 3.5, "y": 0},
+ {"matrix": [5, 4], "x": 4.5, "y": 0},
+ {"matrix": [5, 5], "x": 5.5, "y": 0},
+ {"matrix": [5, 6], "x": 6.5, "y": 0},
+ {"matrix": [5, 7], "x": 7.75, "y": 0},
+ {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+ {"matrix": [11, 1], "x": 10.75, "y": 0},
+ {"matrix": [11, 2], "x": 11.75, "y": 0},
+ {"matrix": [11, 3], "x": 13, "y": 0},
+ {"matrix": [11, 4], "x": 14, "y": 0},
+ {"matrix": [11, 5], "x": 15, "y": 0},
+ {"matrix": [11, 6], "x": 16, "y": 0},
+ {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+ {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+ {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+ {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+ {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+ {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+ {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+ {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+ {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+ {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+ {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 3.25},
+ {"matrix": [2, 4], "x": 5, "y": 3.25},
+ {"matrix": [2, 5], "x": 6, "y": 3.25},
+ {"matrix": [2, 6], "x": 7, "y": 3.25},
+ {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 10, "y": 3.25},
+ {"matrix": [8, 1], "x": 11, "y": 3.25},
+ {"matrix": [8, 2], "x": 12, "y": 3.25},
+ {"matrix": [8, 3], "x": 13, "y": 3.25},
+ {"matrix": [8, 4], "x": 14, "y": 3.25},
+ {"matrix": [8, 5], "x": 15, "y": 3.25},
+ {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.25},
+ {"matrix": [3, 1], "x": 1, "y": 4.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+ {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.25},
+ {"matrix": [4, 1], "x": 1, "y": 5.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+ {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+ {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_80": {
+ "layout": [
+ {"matrix": [5, 2], "x": 0, "y": 0},
+ {"matrix": [5, 3], "x": 1.25, "y": 0},
+ {"matrix": [5, 4], "x": 2.25, "y": 0},
+ {"matrix": [5, 5], "x": 3.25, "y": 0},
+ {"matrix": [5, 6], "x": 4.25, "y": 0},
+ {"matrix": [5, 7], "x": 5.5, "y": 0},
+ {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+ {"matrix": [11, 1], "x": 8.5, "y": 0},
+ {"matrix": [11, 2], "x": 9.5, "y": 0},
+ {"matrix": [11, 3], "x": 10.75, "y": 0},
+ {"matrix": [11, 4], "x": 11.75, "y": 0},
+ {"matrix": [11, 5], "x": 12.75, "y": 0},
+ {"matrix": [11, 6], "x": 13.75, "y": 0},
+ {"matrix": [11, 7], "x": 15, "y": 0},
+ {"matrix": [11, 8], "x": 16, "y": 0},
+
+ {"matrix": [0, 2], "x": 0, "y": 1.25},
+ {"matrix": [0, 3], "x": 1, "y": 1.25},
+ {"matrix": [0, 4], "x": 2, "y": 1.25},
+ {"matrix": [0, 5], "x": 3, "y": 1.25},
+ {"matrix": [0, 6], "x": 4, "y": 1.25},
+ {"matrix": [0, 7], "x": 5, "y": 1.25},
+ {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 8, "y": 1.25},
+ {"matrix": [6, 1], "x": 9, "y": 1.25},
+ {"matrix": [6, 2], "x": 10, "y": 1.25},
+ {"matrix": [6, 3], "x": 11, "y": 1.25},
+ {"matrix": [6, 4], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.25},
+ {"matrix": [6, 6], "x": 14, "y": 1.25},
+ {"matrix": [6, 7], "x": 15, "y": 1.25},
+ {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+ {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+ {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+ {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+ {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+ {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+ {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+ {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+ {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+ {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+ {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+ {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+ {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+ {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+ {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+ {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+ {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+ {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+ {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 15, "y": 4.25},
+ {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 5.25},
+ {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 11, "y": 5.25},
+ {"matrix": [10, 3], "x": 12, "y": 5.25},
+ {"matrix": [10, 4], "x": 13, "y": 5.25},
+ {"matrix": [10, 6], "x": 14, "y": 5.25},
+ {"matrix": [10, 7], "x": 15, "y": 5.25},
+ {"matrix": [10, 8], "x": 16, "y": 5.25}
+ ]
+ },
+ "LAYOUT_80_iso": {
+ "layout": [
+ {"matrix": [5, 2], "x": 0, "y": 0},
+ {"matrix": [5, 3], "x": 1.25, "y": 0},
+ {"matrix": [5, 4], "x": 2.25, "y": 0},
+ {"matrix": [5, 5], "x": 3.25, "y": 0},
+ {"matrix": [5, 6], "x": 4.25, "y": 0},
+ {"matrix": [5, 7], "x": 5.5, "y": 0},
+ {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+ {"matrix": [11, 1], "x": 8.5, "y": 0},
+ {"matrix": [11, 2], "x": 9.5, "y": 0},
+ {"matrix": [11, 3], "x": 10.75, "y": 0},
+ {"matrix": [11, 4], "x": 11.75, "y": 0},
+ {"matrix": [11, 5], "x": 12.75, "y": 0},
+ {"matrix": [11, 6], "x": 13.75, "y": 0},
+ {"matrix": [11, 7], "x": 15, "y": 0},
+ {"matrix": [11, 8], "x": 16, "y": 0},
+
+ {"matrix": [0, 2], "x": 0, "y": 1.25},
+ {"matrix": [0, 3], "x": 1, "y": 1.25},
+ {"matrix": [0, 4], "x": 2, "y": 1.25},
+ {"matrix": [0, 5], "x": 3, "y": 1.25},
+ {"matrix": [0, 6], "x": 4, "y": 1.25},
+ {"matrix": [0, 7], "x": 5, "y": 1.25},
+ {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 8, "y": 1.25},
+ {"matrix": [6, 1], "x": 9, "y": 1.25},
+ {"matrix": [6, 2], "x": 10, "y": 1.25},
+ {"matrix": [6, 3], "x": 11, "y": 1.25},
+ {"matrix": [6, 4], "x": 12, "y": 1.25},
+ {"matrix": [6, 5], "x": 13, "y": 1.25},
+ {"matrix": [6, 6], "x": 14, "y": 1.25},
+ {"matrix": [6, 7], "x": 15, "y": 1.25},
+ {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+ {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+ {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+ {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+ {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+ {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+ {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+ {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+ {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+ {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+ {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+ {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+ {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+ {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+ {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+ {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+ {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+ {"matrix": [7, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+ {"matrix": [8, 8], "x": 16, "y": 3.25},
+
+ {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+ {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+ {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+ {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+ {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+ {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+ {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 15, "y": 4.25},
+ {"matrix": [9, 8], "x": 16, "y": 4.25},
+
+ {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 5.25},
+ {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 11, "y": 5.25},
+ {"matrix": [10, 3], "x": 12, "y": 5.25},
+ {"matrix": [10, 4], "x": 13, "y": 5.25},
+ {"matrix": [10, 6], "x": 14, "y": 5.25},
+ {"matrix": [10, 7], "x": 15, "y": 5.25},
+ {"matrix": [10, 8], "x": 16, "y": 5.25}
+ ]
+ },
+ "LAYOUT_80_iso_with_macro": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 2.25, "y": 0},
+ {"matrix": [5, 3], "x": 3.5, "y": 0},
+ {"matrix": [5, 4], "x": 4.5, "y": 0},
+ {"matrix": [5, 5], "x": 5.5, "y": 0},
+ {"matrix": [5, 6], "x": 6.5, "y": 0},
+ {"matrix": [5, 7], "x": 7.75, "y": 0},
+ {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+ {"matrix": [11, 1], "x": 10.75, "y": 0},
+ {"matrix": [11, 2], "x": 11.75, "y": 0},
+ {"matrix": [11, 3], "x": 13, "y": 0},
+ {"matrix": [11, 4], "x": 14, "y": 0},
+ {"matrix": [11, 5], "x": 15, "y": 0},
+ {"matrix": [11, 6], "x": 16, "y": 0},
+ {"matrix": [11, 7], "x": 17.25, "y": 0},
+ {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+ {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+ {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+ {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+ {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+ {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+ {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+ {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+ {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+ {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+ {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+ {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 3.25},
+ {"matrix": [2, 4], "x": 5, "y": 3.25},
+ {"matrix": [2, 5], "x": 6, "y": 3.25},
+ {"matrix": [2, 6], "x": 7, "y": 3.25},
+ {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 10, "y": 3.25},
+ {"matrix": [8, 1], "x": 11, "y": 3.25},
+ {"matrix": [8, 2], "x": 12, "y": 3.25},
+ {"matrix": [8, 3], "x": 13, "y": 3.25},
+ {"matrix": [8, 4], "x": 14, "y": 3.25},
+ {"matrix": [8, 5], "x": 15, "y": 3.25},
+ {"matrix": [8, 6], "x": 16, "y": 3.25},
+ {"matrix": [7, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+ {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.25},
+ {"matrix": [3, 1], "x": 1, "y": 4.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+ {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+ {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.25},
+ {"matrix": [4, 1], "x": 1, "y": 5.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+ {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+ {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_80_with_macro": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 2.25, "y": 0},
+ {"matrix": [5, 3], "x": 3.5, "y": 0},
+ {"matrix": [5, 4], "x": 4.5, "y": 0},
+ {"matrix": [5, 5], "x": 5.5, "y": 0},
+ {"matrix": [5, 6], "x": 6.5, "y": 0},
+ {"matrix": [5, 7], "x": 7.75, "y": 0},
+ {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+ {"matrix": [11, 1], "x": 10.75, "y": 0},
+ {"matrix": [11, 2], "x": 11.75, "y": 0},
+ {"matrix": [11, 3], "x": 13, "y": 0},
+ {"matrix": [11, 4], "x": 14, "y": 0},
+ {"matrix": [11, 5], "x": 15, "y": 0},
+ {"matrix": [11, 6], "x": 16, "y": 0},
+ {"matrix": [11, 7], "x": 17.25, "y": 0},
+ {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+ {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+ {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+ {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+ {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+ {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+ {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+ {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+ {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+ {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+ {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+ {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+ {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 3.25},
+ {"matrix": [2, 4], "x": 5, "y": 3.25},
+ {"matrix": [2, 5], "x": 6, "y": 3.25},
+ {"matrix": [2, 6], "x": 7, "y": 3.25},
+ {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 10, "y": 3.25},
+ {"matrix": [8, 1], "x": 11, "y": 3.25},
+ {"matrix": [8, 2], "x": 12, "y": 3.25},
+ {"matrix": [8, 3], "x": 13, "y": 3.25},
+ {"matrix": [8, 4], "x": 14, "y": 3.25},
+ {"matrix": [8, 5], "x": 15, "y": 3.25},
+ {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+ {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.25},
+ {"matrix": [3, 1], "x": 1, "y": 4.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+ {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+ {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.25},
+ {"matrix": [4, 1], "x": 1, "y": 5.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+ {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+ {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 2], "x": 2.25, "y": 0},
+ {"matrix": [5, 3], "x": 3.5, "y": 0},
+ {"matrix": [5, 4], "x": 4.5, "y": 0},
+ {"matrix": [5, 5], "x": 5.5, "y": 0},
+ {"matrix": [5, 6], "x": 6.5, "y": 0},
+ {"matrix": [5, 7], "x": 7.75, "y": 0},
+ {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+ {"matrix": [11, 1], "x": 10.75, "y": 0},
+ {"matrix": [11, 2], "x": 11.75, "y": 0},
+ {"matrix": [11, 3], "x": 13, "y": 0},
+ {"matrix": [11, 4], "x": 14, "y": 0},
+ {"matrix": [11, 5], "x": 15, "y": 0},
+ {"matrix": [11, 6], "x": 16, "y": 0},
+ {"matrix": [11, 7], "x": 17.25, "y": 0},
+ {"matrix": [11, 8], "x": 18.25, "y": 0},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.25},
+ {"matrix": [0, 1], "x": 1, "y": 1.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+ {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+ {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+ {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+ {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+ {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+ {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+ {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+ {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+ {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+ {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+ {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+ {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+ {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+ {"matrix": [6, 8], "x": 18.25, "y": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.25},
+ {"matrix": [1, 1], "x": 1, "y": 2.25},
+ {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+ {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+ {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+ {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+ {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+ {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+ {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+ {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+ {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+ {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+ {"matrix": [7, 8], "x": 18.25, "y": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 3.25},
+ {"matrix": [2, 1], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 3.25},
+ {"matrix": [2, 4], "x": 5, "y": 3.25},
+ {"matrix": [2, 5], "x": 6, "y": 3.25},
+ {"matrix": [2, 6], "x": 7, "y": 3.25},
+ {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 10, "y": 3.25},
+ {"matrix": [8, 1], "x": 11, "y": 3.25},
+ {"matrix": [8, 2], "x": 12, "y": 3.25},
+ {"matrix": [8, 3], "x": 13, "y": 3.25},
+ {"matrix": [8, 4], "x": 14, "y": 3.25},
+ {"matrix": [8, 5], "x": 15, "y": 3.25},
+ {"matrix": [8, 6], "x": 16, "y": 3.25},
+ {"matrix": [8, 7], "x": 17, "y": 3.25, "w": 1.25},
+ {"matrix": [8, 8], "x": 18.25, "y": 3.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.25},
+ {"matrix": [3, 1], "x": 1, "y": 4.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+ {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+ {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+ {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+ {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+ {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+ {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+ {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+ {"matrix": [9, 8], "x": 18.25, "y": 4.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 5.25},
+ {"matrix": [4, 1], "x": 1, "y": 5.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+ {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+ {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+ {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+ {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+ {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 18.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keebio/sinc/rev4/mcuconf.h b/keyboards/keebio/sinc/rev4/mcuconf.h
new file mode 100644
index 00000000000..8b26af41319
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next
+
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keebio/sinc/rev4/rules.mk b/keyboards/keebio/sinc/rev4/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/lily58/keymaps/gaston/keymap.c b/keyboards/lily58/keymaps/gaston/keymap.c
index b7129b71e00..4f8654b41bd 100644
--- a/keyboards/lily58/keymaps/gaston/keymap.c
+++ b/keyboards/lily58/keymaps/gaston/keymap.c
@@ -26,6 +26,7 @@ enum layer_number {
#define EN_LOWER LT(_LOWER, KC_SPC)
#define EN_MOUSE MO(_MOUSE)
+#define MT_CESC LCTL_T(KC_ESC)
/* See the readme.md file for an ASCII representation of this keymap. */
@@ -34,13 +35,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ MT_CESC, 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, EN_MOUSE,KC_EQL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
KC_RALT, KC_LALT, KC_LGUI, EN_LOWER,EN_LOWER, KC_LBRC, KC_RBRC, KC_BSLS
),
[_LOWER] = 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_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_TRNS, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, KC_F12,
KC_TRNS, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, XXXXXXX,
KC_TRNS, XXXXXXX, XXXXXXX, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_DEL, XXXXXXX, XXXXXXX, XXXXXXX,
diff --git a/keyboards/lily58/keymaps/gaston/readme.md b/keyboards/lily58/keymaps/gaston/readme.md
index 8edd92cc3ff..cf8b13786e3 100644
--- a/keyboards/lily58/keymaps/gaston/readme.md
+++ b/keyboards/lily58/keymaps/gaston/readme.md
@@ -10,6 +10,7 @@ The main characteristics of this keymap are:
* The main thumb buttons are spaces when tapped and enable the LOWER layer
when held.
* Vim style arrow keys.
+ * Left Control is ESC when tapped.
* Left and right ALT in case you need different behaviors. (For example, the
default Option and readline's Alt behavior in macOS.)
* The LOWER layer has mostly meta keys.
@@ -23,7 +24,7 @@ The main characteristics of this keymap are:
|------+------+------+------+------+------| |------+------+------+------+------+------|
| TAB | Q | W | E | R | T | | Y | U | I | O | P | - |
|------+------+------+------+------+------| |------+------+------+------+------+------|
-|LCTRL | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
+|C_ESC | A | S | D | F | G |-------. ,-------| H | J | K | L | ; | ' |
|------+------+------+------+------+------| MOUSE | | = |------+------+------+------+------+------|
| LSFT | Z | X | C | V | B |-------| |-------| N | M | , | . | / | ENT |
`-----------------------------------------/ LT / \ LT \----------------------------------------'
@@ -36,7 +37,7 @@ The main characteristics of this keymap are:
```plain
,-----------------------------------------. ,-----------------------------------------.
-| ESC | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
+| TRNS | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
|------+------+------+------+------+------| |------+------+------+------+------+------|
| TRNS | | MUTE | VOLD | VOLU | | | HOME | PGDN | PGUP | END | | F12 |
|------+------+------+------+------+------| |------+------+------+------+------+------|
diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h
index 640cc43a5ac..c6d7d037ec8 100644
--- a/keyboards/mode/m75h/config.h
+++ b/keyboards/mode/m75h/config.h
@@ -17,33 +17,5 @@ along with this program. If not, see .
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-#define EEPROM_I2C_24LC256
-//#define I2C1_CLOCK_SPEED 400000
-//#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-#define TAP_CODE_DELAY 50
-
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383 // Overriding to use more EEPROM
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE 4096
diff --git a/keyboards/mode/m75h/halconf.h b/keyboards/mode/m75h/halconf.h
index 6c53f594c76..d4831df0d73 100644
--- a/keyboards/mode/m75h/halconf.h
+++ b/keyboards/mode/m75h/halconf.h
@@ -21,6 +21,4 @@
#pragma once
-#define HAL_USE_I2C TRUE
-
#include_next
diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json
index 1ebbb8f29fa..f57aac383ef 100644
--- a/keyboards/mode/m75h/info.json
+++ b/keyboards/mode/m75h/info.json
@@ -1,5 +1,5 @@
{
- "keyboard_name": "75H",
+ "keyboard_name": "M75H",
"manufacturer": "Mode",
"url": "",
"maintainer": "Gondolindrim",
diff --git a/keyboards/mode/m75h/rules.mk b/keyboards/mode/m75h/rules.mk
index ee752a964b3..5302cbfc192 100644
--- a/keyboards/mode/m75h/rules.mk
+++ b/keyboards/mode/m75h/rules.mk
@@ -1,16 +1,15 @@
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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
+NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-EEPROM_DRIVER = i2c
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h
index b8307f43960..c17bf51b35c 100644
--- a/keyboards/mode/m75s/config.h
+++ b/keyboards/mode/m75s/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see .
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define BACKLIGHT_DEFAULT_LEVEL 20
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/mokey/mokey12x2/info.json b/keyboards/mokey/mokey12x2/info.json
new file mode 100644
index 00000000000..6f22429e72c
--- /dev/null
+++ b/keyboards/mokey/mokey12x2/info.json
@@ -0,0 +1,47 @@
+{
+ "keyboard_name": "Mokey12x2",
+ "manufacturer": "Mokey",
+ "url": "",
+ "maintainer": "Mokey",
+ "development_board": "bluepill",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["A6", "A5", "A4", "A3", "B9"],
+ "rows": ["A2", "A1", "A0", "A7"]
+ },
+ "usb": {
+ "device_version": "0.0.1",
+ "vid": "0x6653",
+ "pid": "0x012A"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0,0], "x":0.25, "y":2.75},
+ {"matrix": [0,1], "x":1.25, "y":2.75},
+ {"matrix": [0,2], "x":2.25, "y":2.75},
+ {"matrix": [0,3], "x":3.25, "y":2.75},
+ {"matrix": [0,4], "x":0.25, "y":0, "w":1.5, "h":1.5},
+ {"matrix": [1,0], "x":0.25, "y":3.75},
+ {"matrix": [1,1], "x":1.25, "y":3.75},
+ {"matrix": [1,2], "x":2.25, "y":3.75},
+ {"matrix": [1,3], "x":3.25, "y":3.75},
+ {"matrix": [1,4], "x":2.75, "y":0, "w":1.5, "h":1.5},
+ {"matrix": [2,0], "x":0.25, "y":4.75},
+ {"matrix": [2,1], "x":1.25, "y":4.75},
+ {"matrix": [2,2], "x":2.25, "y":4.75},
+ {"matrix": [2,3], "x":3.25, "y":4.75},
+ {"matrix": [3,0], "x":0, "y":1.5},
+ {"matrix": [3,1], "x":1, "y":1.5},
+ {"matrix": [3,2], "x":2.5, "y":1.5},
+ {"matrix": [3,3], "x":3.5, "y":1.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mokey/mokey12x2/keymaps/default/keymap.c b/keyboards/mokey/mokey12x2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..74fbf1e9479
--- /dev/null
+++ b/keyboards/mokey/mokey12x2/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 Mokey12×2
+ *
+ * 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_A, KC_B, KC_C, KC_D, KC_1,
+ KC_E, KC_F, KC_G, KC_H, KC_2,
+ KC_I, KC_J, KC_K, KC_L,
+ KC_I, KC_J, KC_K, KC_L)
+};
diff --git a/keyboards/mokey/mokey12x2/keymaps/via/keymap.c b/keyboards/mokey/mokey12x2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..74fbf1e9479
--- /dev/null
+++ b/keyboards/mokey/mokey12x2/keymaps/via/keymap.c
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 Mokey12×2
+ *
+ * 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_A, KC_B, KC_C, KC_D, KC_1,
+ KC_E, KC_F, KC_G, KC_H, KC_2,
+ KC_I, KC_J, KC_K, KC_L,
+ KC_I, KC_J, KC_K, KC_L)
+};
diff --git a/keyboards/mokey/mokey12x2/keymaps/via/rules.mk b/keyboards/mokey/mokey12x2/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/mokey/mokey12x2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mokey/mokey12x2/readme.md b/keyboards/mokey/mokey12x2/readme.md
new file mode 100644
index 00000000000..75a87062c98
--- /dev/null
+++ b/keyboards/mokey/mokey12x2/readme.md
@@ -0,0 +1,23 @@
+# mokey12x2
+
+A Blue Pill STM32F103C8T6-based keyboard.
+
+* Keyboard Maintainer: [rhmokey](https://github.com/rhmokey)
+* Hardware Supported: [rhmokey](https://github.com/rhmokey)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mokey/mokey12x2:default
+
+Flashing example for this keyboard:
+
+ make mokey/mokey12x2: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 2 ways:
+
+* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/mokey/mokey12x2/rules.mk b/keyboards/mokey/mokey12x2/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/mokey/mokey12x2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rainkeebs/trailmix/info.json b/keyboards/rainkeebs/trailmix/info.json
new file mode 100644
index 00000000000..7b3cfdfcdd3
--- /dev/null
+++ b/keyboards/rainkeebs/trailmix/info.json
@@ -0,0 +1,96 @@
+{
+ "manufacturer": "rainkeebs",
+ "keyboard_name": "trailmix",
+ "maintainer": "ATron789",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B4"}
+ ]
+ },
+ "matrix_pins": {
+ "cols": ["F6", "D4", "F5", "D0", "F4", "B6"],
+ "rows": ["D1", "D7", "F7", "C6"]
+ },
+ "processor": "atmega32u4",
+ "split": {
+ "enabled": true,
+ "encoder": {
+ "right": {
+ "rotary": [
+ {"pin_a": "B2", "pin_b": "B4"}
+ ]
+ }
+ },
+ "soft_serial_pin": "D3"
+ },
+ "url": "https://www.rainkeebs.mx",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x7363",
+ "vid": "0x726B"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0},
+
+ {"label": "R04", "matrix": [4, 4], "x": 8, "y": 0},
+ {"label": "R03", "matrix": [4, 3], "x": 9, "y": 0},
+ {"label": "R02", "matrix": [4, 2], "x": 10, "y": 0},
+ {"label": "R01", "matrix": [4, 1], "x": 11, "y": 0},
+ {"label": "R00", "matrix": [4, 0], "x": 12, "y": 0},
+
+ {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1},
+
+ {"label": "R14", "matrix": [5, 4], "x": 8, "y": 1},
+ {"label": "R13", "matrix": [5, 3], "x": 9, "y": 1},
+ {"label": "R12", "matrix": [5, 2], "x": 10, "y": 1},
+ {"label": "R11", "matrix": [5, 1], "x": 11, "y": 1},
+ {"label": "R10", "matrix": [5, 0], "x": 12, "y": 1},
+
+ {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2},
+ {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2},
+ {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2},
+ {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2},
+ {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2},
+ {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2},
+
+ {"label": "R25", "matrix": [6, 5], "x": 7, "y": 2},
+ {"label": "R24", "matrix": [6, 4], "x": 8, "y": 2},
+ {"label": "R23", "matrix": [6, 3], "x": 9, "y": 2},
+ {"label": "R22", "matrix": [6, 2], "x": 10, "y": 2},
+ {"label": "R21", "matrix": [6, 1], "x": 11, "y": 2},
+ {"label": "R20", "matrix": [6, 0], "x": 12, "y": 2},
+
+ {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3},
+ {"label": "L31", "matrix": [3, 1], "x": 1, "y": 3},
+ {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3},
+ {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3},
+ {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+ {"label": "R34", "matrix": [7, 4], "x": 7, "y": 3, "w": 2},
+ {"label": "R33", "matrix": [7, 3], "x": 9, "y": 3},
+ {"label": "R32", "matrix": [7, 2], "x": 10, "y": 3},
+ {"label": "R31", "matrix": [7, 1], "x": 11, "y": 3},
+ {"label": "R30", "matrix": [7, 0], "x": 12, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/rainkeebs/trailmix/keymaps/default/keymap.c b/keyboards/rainkeebs/trailmix/keymaps/default/keymap.c
new file mode 100644
index 00000000000..77418f9cd63
--- /dev/null
+++ b/keyboards/rainkeebs/trailmix/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2021 Regan Palmer
+ *
+ * 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
+
+enum layers {
+ _BASE,
+ _LOWER,
+ _RAISE,
+ _ADJUST,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_BASE] = LAYOUT(
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENTER,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MPLY, KC_PSCR, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSPC,
+ KC_LCTL, KC_LALT, KC_LGUI, LOWER,KC_LSFT, KC_SPC, RAISE, KC_RGUI, KC_ESC, KC_TAB
+ ),
+
+ [_LOWER] = LAYOUT(
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_ESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_TRNS,
+ KC_TAB, KC_INSERT, KC_DELETE, KC_BACKSLASH,KC_MINUS, KC_TRNS, KC_TRNS, KC_PLUS, KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RGUI, KC_TRNS, KC_TRNS
+ ),
+
+ [_RAISE] = LAYOUT(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+ KC_GRAVE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_LCBR, KC_RCBR, KC_COLN, KC_DQT, KC_TRNS,
+ KC_TRNS, KC_CAPS, KC_TRNS, KC_PIPE, KC_UNDS, KC_TRNS, KC_TRNS, KC_EQUAL, KC_QUESTION, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ADJUST, KC_TRNS, KC_TRNS
+ ),
+
+ [_ADJUST] = LAYOUT(
+ 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_PRINT_SCREEN, KC_SCROLL_LOCK, KC_PAUSE, KC_H, KC_J, KC_K, KC_L, KC_ENTER,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MPLY, KC_PSCR, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSPC,
+ KC_LCTL, KC_LALT, ADJUST, RAISE, KC_SPC, KC_LSFT, LOWER, ADJUST, KC_RALT, KC_RCTL
+ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)},
+ [_LOWER] = {ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_HOME, KC_END)},
+ [_RAISE] = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R)},
+ [_ADJUST] = {ENCODER_CCW_CW(KC_MS_LEFT, KC_MS_RIGHT), ENCODER_CCW_CW(KC_MS_UP, KC_MS_DOWN)},
+};
+#endif
diff --git a/keyboards/rainkeebs/trailmix/keymaps/default/rules.mk b/keyboards/rainkeebs/trailmix/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/rainkeebs/trailmix/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rainkeebs/trailmix/readme.md b/keyboards/rainkeebs/trailmix/readme.md
new file mode 100644
index 00000000000..2b2b6437e68
--- /dev/null
+++ b/keyboards/rainkeebs/trailmix/readme.md
@@ -0,0 +1,28 @@
+# Trailmix
+
+
+
+
+Ortho split 40% keyboard by rainkeenbs with encoders.
+
+* Keyboard Maintainer: [ATron789](https://github.com/atron789)
+* Hardware Supported: `Elite Pi`, `Pro Micro Type-C USB`, `Elite-C (v4)`, `nice!nano v2` controllers
+
+
+Make example for this keyboard (after setting up your build environment):
+
+ make rainkeebs/trailmix:default
+
+Flashing example for this keyboard:
+
+ make rainkeebs/rainkeeb:default:flash
+
+(Flash one side of the keyboard at the time)
+
+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:
+
+* **Physical reset button**: reset button located next to the encoder slot, one on each side of the keyboard.
diff --git a/keyboards/rainkeebs/trailmix/rules.mk b/keyboards/rainkeebs/trailmix/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/rainkeebs/trailmix/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/rainkeebs/trailmix/trailmix.c b/keyboards/rainkeebs/trailmix/trailmix.c
new file mode 100644
index 00000000000..105d988dadb
--- /dev/null
+++ b/keyboards/rainkeebs/trailmix/trailmix.c
@@ -0,0 +1,91 @@
+/*
+Copyright 2023 Alberto Pavano "ATron789"
+
+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 "quantum.h"
+
+enum layers { _BASE, _LOWER, _RAISE, _ADJUST };
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ if (!encoder_update_user(index, clockwise)) {
+ return false;
+ }
+ switch (get_highest_layer(layer_state)) {
+ case _BASE:
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ } else if (index == 1) {
+ if (clockwise) {
+ tap_code(KC_MS_WH_DOWN);
+ } else {
+ tap_code(KC_MS_WH_UP);
+ }
+ }
+ break;
+ case _RAISE:
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_MNXT);
+ } else {
+ tap_code(KC_MPRV);
+ }
+ } else if (index == 1) {
+ if (clockwise) {
+ tap_code(KC_WH_R);
+ } else {
+ tap_code(KC_WH_L);
+ }
+ }
+ break;
+ case _LOWER:
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_PGUP);
+ } else {
+ tap_code(KC_PGDN);
+ }
+ } else if (index == 1) {
+ if (clockwise) {
+ tap_code(KC_END);
+ } else {
+ tap_code(KC_HOME);
+ }
+ }
+ break;
+ case _ADJUST:
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_MS_RIGHT);
+ } else {
+ tap_code(KC_MS_LEFT);
+ }
+ } else if (index == 1) {
+ if (clockwise) {
+ tap_code(KC_MS_DOWN);
+ } else {
+ tap_code(KC_MS_UP);
+ }
+ }
+ break;
+ }
+ return true;
+}
+#endif
diff --git a/keyboards/viktus/osav2_numpad_topre/ec.c b/keyboards/viktus/osav2_numpad_topre/ec.c
new file mode 100644
index 00000000000..e4f59c3b6bf
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/ec.c
@@ -0,0 +1,181 @@
+/* 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 .
+ */
+
+#include "quantum.h"
+#include "ec.h"
+#include "analog.h"
+//#include "debug.h" // needed for debugging
+
+// sensing channel definitions
+#define A0 0
+#define A1 1
+#define A2 2
+#define A3 3
+#define A4 4
+#define A5 5
+#define A6 6
+#define A7 7
+
+// analog connection settings
+#define DISCHARGE_PIN B5
+#define ANALOG_PORT B6
+
+#ifndef MUX_SEL_PIN
+# define MUX_SEL_PINS \
+ { D6, D7, B4 }
+#endif
+
+// pin connections
+const uint8_t row_channels[] = MATRIX_ROW_PINS;
+const uint8_t col_pins[] = MATRIX_COL_PINS;
+const uint8_t mux_sel_pins[] = MUX_SEL_PINS;
+
+_Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
+
+static ec_config_t config;
+static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
+
+static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
+static inline void charge_capacitor(uint8_t col) {
+ setPinInput(DISCHARGE_PIN);
+ writePinHigh(col_pins[col]);
+}
+
+static inline void clear_all_col_pins(void) {
+ for (int col = 0; col < sizeof(col_pins); col++) {
+ writePinLow(col_pins[col]);
+ }
+}
+
+void init_mux_sel(void) {
+ for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
+ setPinOutput(mux_sel_pins[idx]);
+ }
+}
+
+void select_mux(uint8_t row) {
+ uint8_t ch = row_channels[row];
+ writePin(mux_sel_pins[0], ch & 1);
+ writePin(mux_sel_pins[1], ch & 2);
+ writePin(mux_sel_pins[2], ch & 4);
+}
+
+void init_col(void) {
+ for (int idx = 0; idx < sizeof(col_pins); idx++) {
+ setPinOutput(col_pins[idx]);
+ writePinLow(col_pins[idx]);
+ }
+}
+
+void ec_init(ec_config_t const* const ec_config) {
+ // save config
+ config = *ec_config;
+
+ // initialize discharge pin as discharge mode
+ writePinLow(DISCHARGE_PIN);
+ setPinOutput(DISCHARGE_PIN);
+
+ // set analog reference
+ analogReference(ADC_REF_POWER);
+
+ // initialize drive lines
+ init_col();
+
+ // initialize multiplexer select pin
+ init_mux_sel();
+
+ // set discharge pin to charge mode
+ setPinInput(DISCHARGE_PIN);
+}
+
+uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
+ uint16_t sw_value = 0;
+
+ discharge_capacitor();
+
+ select_mux(row);
+
+ clear_all_col_pins();
+
+ cli();
+
+ charge_capacitor(col);
+
+ sw_value = analogReadPin(ANALOG_PORT);
+
+ sei();
+
+ return sw_value;
+}
+
+bool ec_update_key(matrix_row_t* current_row, matrix_row_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt) {
+ bool current_state = (*current_row >> col) & 1;
+
+ // press to release
+ if (current_state && sw_value < reset_pt) {
+ *current_row &= ~(MATRIX_ROW_SHIFTER << col);
+ return true;
+ }
+
+ // rest to press
+ if ((!current_state) && sw_value > actuation_pt) {
+ *current_row |= (MATRIX_ROW_SHIFTER << col);
+ return true;
+ }
+
+ return false;
+}
+
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+ bool updated = false;
+
+ for (int row = 0; row < sizeof(row_channels); row++) {
+ for (int col = 0; col < sizeof(col_pins); col++) {
+ uint16_t reset_pt = config.reset_pt;
+ uint16_t actuation_pt = config.actuation_pt;
+
+ //Modifying threshold values for overlapping pads
+ switch(row) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ switch(col) {
+ case 3: // lower threshold for plus and enter: (37 rest, 61 btm)
+ reset_pt = 45;
+ actuation_pt = 50;
+ break;
+ }
+ break;
+ }
+
+ ec_sw_value[col][row] = ec_readkey_raw(col, row);
+ updated |= ec_update_key(¤t_matrix[row], col, ec_sw_value[col][row], reset_pt, actuation_pt);
+ }
+ }
+
+ return updated;
+}
+
+// console debugging for pad values
+/*void ec_dprint_matrix(void) {
+ for (int row = 0; row < sizeof(row_channels); row++) {
+ for (int col = 0; col < sizeof(col_pins); col++) {
+ dprintf("%5d", ec_sw_value[col][row]);
+ }
+ dprintf("\n");
+ }
+}*/
diff --git a/keyboards/viktus/osav2_numpad_topre/ec.h b/keyboards/viktus/osav2_numpad_topre/ec.h
new file mode 100644
index 00000000000..33bdb2d5eff
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/ec.h
@@ -0,0 +1,31 @@
+/* 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 .
+ */
+
+#include
+#include
+
+#include "matrix.h"
+
+typedef struct {
+ uint16_t reset_pt;
+ uint16_t actuation_pt;
+} ec_config_t;
+
+void ec_init(ec_config_t const* const ec_config);
+bool ec_matrix_scan(matrix_row_t current_matrix[]);
+//void ec_dprint_matrix(void); // needed for debugging
+uint16_t ec_readkey_raw(uint8_t col, uint8_t row);
+bool ec_update_key(matrix_row_t* current_row, uint8_t col, uint16_t sw_value, uint16_t reset_pt, uint16_t actuation_pt);
diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/info.json
new file mode 100644
index 00000000000..55ca939e3f4
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/info.json
@@ -0,0 +1,100 @@
+{
+ "manufacturer": "Viktus Design LLC",
+ "keyboard_name": "OSAv2 Numpad - Topre",
+ "maintainer": "BlindAssassin111",
+ "url": "https://viktus.design",
+ "usb": {
+ "device_version": "1.1.0",
+ "vid": "0x5644",
+ "pid": "0x4E54"
+ },
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["F5", "F6", "D3", "D2"],
+ "rows": ["A1", "A0", "A3", "A2", "A4"]
+ },
+ "layouts": {
+ "LAYOUT_ortho_5x4": {
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
+ { "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
+ { "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
+ { "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
+ { "label": "K33", "matrix": [3, 3], "x": 3, "y": 3 },
+ { "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
+ { "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
+ { "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 },
+ { "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 }
+ ]
+ },
+ "LAYOUT_split_plus_2u_enter": {
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 },
+ { "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
+ { "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
+ { "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
+ { "label": "K33", "matrix": [3, 3], "h": 2, "x": 3, "y": 3 },
+ { "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
+ { "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
+ { "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 }
+ ]
+ },
+ "LAYOUT_2u_plus_2u_enter": {
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 },
+ { "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 },
+ { "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 },
+ { "label": "K23", "matrix": [2, 3], "h": 2, "x": 3, "y": 1 },
+ { "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 },
+ { "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 },
+ { "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 },
+ { "label": "K33", "matrix": [3, 3], "h": 2, "x": 3, "y": 3 },
+ { "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 },
+ { "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 },
+ { "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/osav2_numpad_topre/keymaps/default/keymap.c b/keyboards/viktus/osav2_numpad_topre/keymaps/default/keymap.c
new file mode 100644
index 00000000000..7545c946c3f
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ortho_5x4(
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, KC_PEQL,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_P0, KC_P0, KC_PDOT, KC_DEL
+ )
+};
diff --git a/keyboards/viktus/osav2_numpad_topre/keymaps/via/keymap.c b/keyboards/viktus/osav2_numpad_topre/keymaps/via/keymap.c
new file mode 100644
index 00000000000..7545c946c3f
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ortho_5x4(
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, KC_PEQL,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_P0, KC_P0, KC_PDOT, KC_DEL
+ )
+};
diff --git a/keyboards/viktus/osav2_numpad_topre/keymaps/via/rules.mk b/keyboards/viktus/osav2_numpad_topre/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/viktus/osav2_numpad_topre/osav2_numpad_topre.c b/keyboards/viktus/osav2_numpad_topre/osav2_numpad_topre.c
new file mode 100644
index 00000000000..2337fc55f39
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/osav2_numpad_topre.c
@@ -0,0 +1,49 @@
+/* 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 .
+ */
+
+#include "quantum.h"
+#include "ec.h"
+#include "matrix.h"
+//#include "debug.h" // needed for debugging
+
+#define RESET_PT 55
+#define ACTUATION_PT 65
+
+// console debugging for pad values
+void keyboard_post_init_kb() {
+ debug_enable = true;
+ debug_matrix = true;
+}
+
+void matrix_init_custom(void) {
+ ec_config_t ec_config = {.reset_pt = RESET_PT, .actuation_pt = ACTUATION_PT};
+
+ ec_init(&ec_config);
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ bool updated = ec_matrix_scan(current_matrix);
+
+ // console debugging for pad values
+ /*static int cnt = 0;
+ if (cnt++ == 1000) {
+ cnt = 0;
+ ec_dprint_matrix();
+ dprintf("\n");
+ }*/
+
+ return updated;
+}
diff --git a/keyboards/viktus/osav2_numpad_topre/readme.md b/keyboards/viktus/osav2_numpad_topre/readme.md
new file mode 100644
index 00000000000..990bfe04fe7
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/readme.md
@@ -0,0 +1,27 @@
+# OSAv2 Numpad - Topre
+
+
+
+An OSAv2 Numpad in topre flavor.
+
+- Keyboard Maintainer: BlindAssassin111
+- Hardware Supported: OSAv2 Numpad Topre PCB
+- Hardware Availability: Viktus Design LLC
+
+Make example for this keyboard (after setting up your build environment):
+
+ make viktus/osav2_numpad_topre:default
+
+Flashing example for this keyboard:
+
+ make viktus/osav2_numpad_topre: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/osav2_numpad_topre/rules.mk b/keyboards/viktus/osav2_numpad_topre/rules.mk
new file mode 100644
index 00000000000..037e26c530c
--- /dev/null
+++ b/keyboards/viktus/osav2_numpad_topre/rules.mk
@@ -0,0 +1,3 @@
+CUSTOM_MATRIX = lite
+QUANTUM_LIB_SRC += analog.c
+SRC += ec.c