diff options
| -rw-r--r-- | keyboards/meow65/info.json | 143 | ||||
| -rw-r--r-- | keyboards/meow65/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/meow65/keymaps/via/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/meow65/meow65.h | 2 | ||||
| -rw-r--r-- | keyboards/meow65/rules.mk | 2 |
5 files changed, 84 insertions, 75 deletions
diff --git a/keyboards/meow65/info.json b/keyboards/meow65/info.json index 90153257a6..7221a518bd 100644 --- a/keyboards/meow65/info.json +++ b/keyboards/meow65/info.json @@ -2,76 +2,83 @@ "keyboard_name": "meow65", "url": "https://github.com/mrninhvn/meow65-pcb", "maintainer": "mrninhvn", + "layout_aliases": { + "LAYOUT": "LAYOUT_65_ansi_blocker" + }, "layouts": { - "LAYOUT": { + "LAYOUT_65_ansi_blocker": { "layout": [ - { "label": "K00 (C6,F5)", "x": 0, "y": 0 }, - { "label": "K01 (C6,F6)", "x": 1, "y": 0 }, - { "label": "K02 (C6,B0)", "x": 2, "y": 0 }, - { "label": "K03 (C6,F4)", "x": 3, "y": 0 }, - { "label": "K04 (C6,F1)", "x": 4, "y": 0 }, - { "label": "K05 (C6,D0)", "x": 5, "y": 0 }, - { "label": "K06 (C6,D1)", "x": 6, "y": 0 }, - { "label": "K07 (C6,D2)", "x": 7, "y": 0 }, - { "label": "K08 (C6,D3)", "x": 8, "y": 0 }, - { "label": "K09 (C6,D5)", "x": 9, "y": 0 }, - { "label": "K0A (C6,D4)", "x": 10, "y": 0 }, - { "label": "K0B (C6,D6)", "x": 11, "y": 0 }, - { "label": "K0C (C6,D7)", "x": 12, "y": 0 }, - { "label": "K0D (C6,B4)", "x": 13, "y": 0, "w": 2 }, - { "label": "K0E (C6,C7)", "x": 15, "y": 0 }, - { "label": "K10 (B6,F5)", "x": 0, "y": 1, "w": 1.5 }, - { "label": "K11 (B6,F6)", "x": 1.5, "y": 1 }, - { "label": "K12 (B6,B0)", "x": 2.5, "y": 1 }, - { "label": "K13 (B6,F4)", "x": 3.5, "y": 1 }, - { "label": "K14 (B6,F1)", "x": 4.5, "y": 1 }, - { "label": "K15 (B6,D0)", "x": 5.5, "y": 1 }, - { "label": "K16 (B6,D1)", "x": 6.5, "y": 1 }, - { "label": "K17 (B6,D2)", "x": 7.5, "y": 1 }, - { "label": "K18 (B6,D3)", "x": 8.5, "y": 1 }, - { "label": "K19 (B6,D5)", "x": 9.5, "y": 1 }, - { "label": "K1A (B6,D4)", "x": 10.5, "y": 1 }, - { "label": "K1B (B6,D6)", "x": 11.5, "y": 1 }, - { "label": "K1C (B6,D7)", "x": 12.5, "y": 1 }, - { "label": "K1D (B6,B4)", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "K1E (B6,C7)", "x": 15, "y": 1 }, - { "label": "K20 (B5,F5)", "x": 0, "y": 2, "w": 1.75 }, - { "label": "K21 (B5,F6)", "x": 1.75, "y": 2 }, - { "label": "K22 (B5,B0)", "x": 2.75, "y": 2 }, - { "label": "K23 (B5,F4)", "x": 3.75, "y": 2 }, - { "label": "K24 (B5,F1)", "x": 4.75, "y": 2 }, - { "label": "K25 (B5,D0)", "x": 5.75, "y": 2 }, - { "label": "K26 (B5,D1)", "x": 6.75, "y": 2 }, - { "label": "K27 (B5,D2)", "x": 7.75, "y": 2 }, - { "label": "K28 (B5,D3)", "x": 8.75, "y": 2 }, - { "label": "K29 (B5,D5)", "x": 9.75, "y": 2 }, - { "label": "K2A (B5,D4)", "x": 10.75, "y": 2 }, - { "label": "K2B (B5,D6)", "x": 11.75, "y": 2 }, - { "label": "K2D (B5,B4)", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "K2E (B5,C7)", "x": 15, "y": 2 }, - { "label": "K30 (B7,F5)", "x": 0, "y": 3, "w": 2.25 }, - { "label": "K31 (B7,F6)", "x": 2.25, "y": 3 }, - { "label": "K32 (B7,B0)", "x": 3.25, "y": 3 }, - { "label": "K33 (B7,F4)", "x": 4.25, "y": 3 }, - { "label": "K34 (B7,F1)", "x": 5.25, "y": 3 }, - { "label": "K35 (B7,D0)", "x": 6.25, "y": 3 }, - { "label": "K36 (B7,D1)", "x": 7.25, "y": 3 }, - { "label": "K37 (B7,D2)", "x": 8.25, "y": 3 }, - { "label": "K38 (B7,D3)", "x": 9.25, "y": 3 }, - { "label": "K39 (B7,D5)", "x": 10.25, "y": 3 }, - { "label": "K3A (B7,D4)", "x": 11.25, "y": 3 }, - { "label": "K3C (B7,D7)", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "K3D (B7,B4)", "x": 14, "y": 3 }, - { "label": "K3E (B7,C7)", "x": 15, "y": 3 }, - { "label": "K40 (F7,F5)", "x": 0, "y": 4, "w": 1.25 }, - { "label": "K41 (F7,F6)", "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "K42 (F7,B0)", "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "K45 (F7,D0)", "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "K49 (F7,D5)", "x": 10, "y": 4, "w": 1.25 }, - { "label": "K4A (F7,D4)", "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "K4C (F7,D7)", "x": 13, "y": 4 }, - { "label": "K4D (F7,B4)", "x": 14, "y": 4 }, - { "label": "K4E (F7,C7)", "x": 15, "y": 4 } + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "1!", "x": 1, "y": 0 }, + { "label": "2@", "x": 2, "y": 0 }, + { "label": "3#", "x": 3, "y": 0 }, + { "label": "4$", "x": 4, "y": 0 }, + { "label": "5%", "x": 5, "y": 0 }, + { "label": "6^", "x": 6, "y": 0 }, + { "label": "7&", "x": 7, "y": 0 }, + { "label": "8*", "x": 8, "y": 0 }, + { "label": "9(", "x": 9, "y": 0 }, + { "label": "0)", "x": 10, "y": 0 }, + { "label": "-_", "x": 11, "y": 0 }, + { "label": "=+", "x": 12, "y": 0 }, + { "label": "Backspace", "x": 13, "y": 0, "w": 2 }, + { "label": "Home", "x": 15, "y": 0 }, + + { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 1 }, + { "label": "W", "x": 2.5, "y": 1 }, + { "label": "E", "x": 3.5, "y": 1 }, + { "label": "R", "x": 4.5, "y": 1 }, + { "label": "T", "x": 5.5, "y": 1 }, + { "label": "Y", "x": 6.5, "y": 1 }, + { "label": "U", "x": 7.5, "y": 1 }, + { "label": "I", "x": 8.5, "y": 1 }, + { "label": "O", "x": 9.5, "y": 1 }, + { "label": "P", "x": 10.5, "y": 1 }, + { "label": "[{", "x": 11.5, "y": 1 }, + { "label": "]}", "x": 12.5, "y": 1 }, + { "label": "\\|", "x": 13.5, "y": 1, "w": 1.5 }, + { "label": "PageUp", "x": 15, "y": 1 }, + + { "label": "Caps", "x": 0, "y": 2, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 2 }, + { "label": "S", "x": 2.75, "y": 2 }, + { "label": "D", "x": 3.75, "y": 2 }, + { "label": "F", "x": 4.75, "y": 2 }, + { "label": "G", "x": 5.75, "y": 2 }, + { "label": "H", "x": 6.75, "y": 2 }, + { "label": "J", "x": 7.75, "y": 2 }, + { "label": "K", "x": 8.75, "y": 2 }, + { "label": "L", "x": 9.75, "y": 2 }, + { "label": ";:", "x": 10.75, "y": 2 }, + { "label": "'\"", "x": 11.75, "y": 2 }, + { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, + { "label": "Page Down", "x": 15, "y": 2 }, + + { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, + { "label": "Z", "x": 2.25, "y": 3 }, + { "label": "X", "x": 3.25, "y": 3 }, + { "label": "C", "x": 4.25, "y": 3 }, + { "label": "V", "x": 5.25, "y": 3 }, + { "label": "B", "x": 6.25, "y": 3 }, + { "label": "N", "x": 7.25, "y": 3 }, + { "label": "M", "x": 8.25, "y": 3 }, + { "label": ",<", "x": 9.25, "y": 3 }, + { "label": ".>", "x": 10.25, "y": 3 }, + { "label": "/?", "x": 11.25, "y": 3 }, + { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, + { "label": "\u2191", "x": 14, "y": 3 }, + { "label": "End", "x": 15, "y": 3 }, + + { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, + { "label": "GUI", "x": 1.25, "y": 4, "w": 1.25 }, + { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, + { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 }, + { "label": "Alt", "x": 10, "y": 4, "w": 1.25 }, + { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 }, + { "label": "\u2190", "x": 13, "y": 4 }, + { "label": "\u2193", "x": 14, "y": 4 }, + { "label": "\u2192", "x": 15, "y": 4 } ] } } diff --git a/keyboards/meow65/keymaps/default/keymap.c b/keyboards/meow65/keymaps/default/keymap.c index b93abee723..3a5c4b76a8 100644 --- a/keyboards/meow65/keymaps/default/keymap.c +++ b/keyboards/meow65/keymaps/default/keymap.c @@ -23,14 +23,14 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT( + [_BASE] = LAYOUT_65_ansi_blocker( 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_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_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [_FN] = LAYOUT( + [_FN] = LAYOUT_65_ansi_blocker( RESET, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/meow65/keymaps/via/keymap.c b/keyboards/meow65/keymaps/via/keymap.c index b765673ca1..ef7dd62071 100644 --- a/keyboards/meow65/keymaps/via/keymap.c +++ b/keyboards/meow65/keymaps/via/keymap.c @@ -23,28 +23,28 @@ enum layer_names { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_L0] = LAYOUT( + [_L0] = LAYOUT_65_ansi_blocker( 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_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_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_L1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [_L1] = LAYOUT( + [_L1] = LAYOUT_65_ansi_blocker( RESET, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_L2] = LAYOUT( + [_L2] = LAYOUT_65_ansi_blocker( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_L3] = LAYOUT( + [_L3] = LAYOUT_65_ansi_blocker( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/meow65/meow65.h b/keyboards/meow65/meow65.h index 2e25bd9758..2643158342 100644 --- a/keyboards/meow65/meow65.h +++ b/keyboards/meow65/meow65.h @@ -26,7 +26,7 @@ * The second converts the arguments into a two-dimensional array which * represents the switch matrix. */ -#define LAYOUT( \ +#define LAYOUT_65_ansi_blocker( \ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k214, \ diff --git a/keyboards/meow65/rules.mk b/keyboards/meow65/rules.mk index 476cf49f27..22b16cb763 100644 --- a/keyboards/meow65/rules.mk +++ b/keyboards/meow65/rules.mk @@ -16,3 +16,5 @@ 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 + +LAYOUTS = 65_ansi_blocker |