diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2023-04-30 13:50:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-30 13:50:18 -0700 |
| commit | 3bc4aeac6cc940d10bc73589ea67e0eaa7c7a878 (patch) | |
| tree | d4b7893c93200e46bb6206d09c1d39e98ba0689e | |
| parent | dedacb079f717a75bbaaa8916ad350ebabdf1126 (diff) | |
GrayStudio Aero 75 Refactor and Touch-Up (#20640)
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_ansi_blocker
Existing codebase only supports the Hotswap version, but there is a Soldered version that supports additional layouts.
* refactor keymaps
- use four-space indent
- update grid-alignment of keycodes
- remove trailing spaces
* flesh-out keyboard readme
| -rw-r--r-- | keyboards/gray_studio/aero75/info.json | 167 | ||||
| -rw-r--r-- | keyboards/gray_studio/aero75/keymaps/default/keymap.c | 73 | ||||
| -rw-r--r-- | keyboards/gray_studio/aero75/keymaps/via/keymap.c | 73 | ||||
| -rw-r--r-- | keyboards/gray_studio/aero75/matrix_diagram.md | 18 | ||||
| -rw-r--r-- | keyboards/gray_studio/aero75/readme.md | 27 |
5 files changed, 204 insertions, 154 deletions
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json index eb4ee2bad2..f87e0a76b3 100644 --- a/keyboards/gray_studio/aero75/info.json +++ b/keyboards/gray_studio/aero75/info.json | |||
| @@ -18,100 +18,103 @@ | |||
| 18 | "diode_direction": "COL2ROW", | 18 | "diode_direction": "COL2ROW", |
| 19 | "processor": "STM32F103", | 19 | "processor": "STM32F103", |
| 20 | "bootloader": "stm32duino", | 20 | "bootloader": "stm32duino", |
| 21 | "layout_aliases": { | ||
| 22 | "LAYOUT_all": "LAYOUT_ansi_blocker" | ||
| 23 | }, | ||
| 21 | "layouts": { | 24 | "layouts": { |
| 22 | "LAYOUT_all": { | 25 | "LAYOUT_ansi_blocker": { |
| 23 | "layout": [ | 26 | "layout": [ |
| 24 | {"matrix": [0, 0], "x": 0, "y": 0}, | 27 | {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, |
| 25 | 28 | ||
| 26 | {"matrix": [0, 1], "x": 1.5, "y": 0}, | 29 | {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0}, |
| 27 | {"matrix": [0, 2], "x": 2.5, "y": 0}, | 30 | {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0}, |
| 28 | {"matrix": [0, 3], "x": 3.5, "y": 0}, | 31 | {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, |
| 29 | {"matrix": [0, 4], "x": 4.5, "y": 0}, | 32 | {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, |
| 30 | 33 | ||
| 31 | {"matrix": [0, 5], "x": 6, "y": 0}, | 34 | {"label": "F5", "matrix": [0, 5], "x": 6, "y": 0}, |
| 32 | {"matrix": [0, 6], "x": 7, "y": 0}, | 35 | {"label": "F6", "matrix": [0, 6], "x": 7, "y": 0}, |
| 33 | {"matrix": [0, 7], "x": 8, "y": 0}, | 36 | {"label": "F7", "matrix": [0, 7], "x": 8, "y": 0}, |
| 34 | {"matrix": [0, 8], "x": 9, "y": 0}, | 37 | {"label": "F8", "matrix": [0, 8], "x": 9, "y": 0}, |
| 35 | 38 | ||
| 36 | {"matrix": [0, 9], "x": 10.5, "y": 0}, | 39 | {"label": "F9", "matrix": [0, 9], "x": 10.5, "y": 0}, |
| 37 | {"matrix": [0, 10], "x": 11.5, "y": 0}, | 40 | {"label": "F10", "matrix": [0, 10], "x": 11.5, "y": 0}, |
| 38 | {"matrix": [0, 11], "x": 12.5, "y": 0}, | 41 | {"label": "F11", "matrix": [0, 11], "x": 12.5, "y": 0}, |
| 39 | {"matrix": [0, 13], "x": 13.5, "y": 0}, | 42 | {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0}, |
| 40 | 43 | ||
| 41 | {"matrix": [0, 15], "x": 15, "y": 0}, | 44 | {"label": "PrtSc", "matrix": [0, 15], "x": 15, "y": 0}, |
| 42 | 45 | ||
| 43 | {"matrix": [1, 0], "x": 0, "y": 1.25}, | 46 | {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, |
| 44 | {"matrix": [1, 1], "x": 1, "y": 1.25}, | 47 | {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, |
| 45 | {"matrix": [1, 2], "x": 2, "y": 1.25}, | 48 | {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, |
| 46 | {"matrix": [1, 3], "x": 3, "y": 1.25}, | 49 | {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, |
| 47 | {"matrix": [1, 4], "x": 4, "y": 1.25}, | 50 | {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, |
| 48 | {"matrix": [1, 5], "x": 5, "y": 1.25}, | 51 | {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, |
| 49 | {"matrix": [1, 6], "x": 6, "y": 1.25}, | 52 | {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, |
| 50 | {"matrix": [1, 7], "x": 7, "y": 1.25}, | 53 | {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, |
| 51 | {"matrix": [1, 8], "x": 8, "y": 1.25}, | 54 | {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, |
| 52 | {"matrix": [1, 9], "x": 9, "y": 1.25}, | 55 | {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, |
| 53 | {"matrix": [1, 10], "x": 10, "y": 1.25}, | 56 | {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, |
| 54 | {"matrix": [1, 11], "x": 11, "y": 1.25}, | 57 | {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, |
| 55 | {"matrix": [1, 12], "x": 12, "y": 1.25}, | 58 | {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, |
| 56 | {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, | 59 | {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, |
| 57 | {"matrix": [1, 15], "x": 15, "y": 1.25}, | 60 | {"label": "Home", "matrix": [1, 15], "x": 15, "y": 1.25}, |
| 58 | 61 | ||
| 59 | {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, | 62 | {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, |
| 60 | {"matrix": [2, 2], "x": 1.5, "y": 2.25}, | 63 | {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2.25}, |
| 61 | {"matrix": [2, 3], "x": 2.5, "y": 2.25}, | 64 | {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25}, |
| 62 | {"matrix": [2, 4], "x": 3.5, "y": 2.25}, | 65 | {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2.25}, |
| 63 | {"matrix": [2, 5], "x": 4.5, "y": 2.25}, | 66 | {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2.25}, |
| 64 | {"matrix": [2, 6], "x": 5.5, "y": 2.25}, | 67 | {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2.25}, |
| 65 | {"matrix": [2, 7], "x": 6.5, "y": 2.25}, | 68 | {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2.25}, |
| 66 | {"matrix": [2, 8], "x": 7.5, "y": 2.25}, | 69 | {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2.25}, |
| 67 | {"matrix": [2, 9], "x": 8.5, "y": 2.25}, | 70 | {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2.25}, |
| 68 | {"matrix": [2, 10], "x": 9.5, "y": 2.25}, | 71 | {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2.25}, |
| 69 | {"matrix": [2, 11], "x": 10.5, "y": 2.25}, | 72 | {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2.25}, |
| 70 | {"matrix": [2, 12], "x": 11.5, "y": 2.25}, | 73 | {"label": "[", "matrix": [2, 12], "x": 11.5, "y": 2.25}, |
| 71 | {"matrix": [2, 13], "x": 12.5, "y": 2.25}, | 74 | {"label": "]", "matrix": [2, 13], "x": 12.5, "y": 2.25}, |
| 72 | {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, | 75 | {"label": "\\", "matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, |
| 73 | {"matrix": [2, 15], "x": 15, "y": 2.25}, | 76 | {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2.25}, |
| 74 | 77 | ||
| 75 | {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, | 78 | {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, |
| 76 | {"matrix": [3, 2], "x": 1.75, "y": 3.25}, | 79 | {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3.25}, |
| 77 | {"matrix": [3, 3], "x": 2.75, "y": 3.25}, | 80 | {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3.25}, |
| 78 | {"matrix": [3, 4], "x": 3.75, "y": 3.25}, | 81 | {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3.25}, |
| 79 | {"matrix": [3, 5], "x": 4.75, "y": 3.25}, | 82 | {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3.25}, |
| 80 | {"matrix": [3, 6], "x": 5.75, "y": 3.25}, | 83 | {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3.25}, |
| 81 | {"matrix": [3, 7], "x": 6.75, "y": 3.25}, | 84 | {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3.25}, |
| 82 | {"matrix": [3, 8], "x": 7.75, "y": 3.25}, | 85 | {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3.25}, |
| 83 | {"matrix": [3, 9], "x": 8.75, "y": 3.25}, | 86 | {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3.25}, |
| 84 | {"matrix": [3, 10], "x": 9.75, "y": 3.25}, | 87 | {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3.25}, |
| 85 | {"matrix": [3, 11], "x": 10.75, "y": 3.25}, | 88 | {"label": ";", "matrix": [3, 11], "x": 10.75, "y": 3.25}, |
| 86 | {"matrix": [3, 12], "x": 11.75, "y": 3.25}, | 89 | {"label": "'", "matrix": [3, 12], "x": 11.75, "y": 3.25}, |
| 87 | {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, | 90 | {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, |
| 88 | {"matrix": [3, 15], "x": 15, "y": 3.25}, | 91 | {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3.25}, |
| 89 | 92 | ||
| 90 | {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, | 93 | {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, |
| 91 | {"matrix": [4, 2], "x": 2.25, "y": 4.25}, | 94 | {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25}, |
| 92 | {"matrix": [4, 3], "x": 3.25, "y": 4.25}, | 95 | {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25}, |
| 93 | {"matrix": [4, 4], "x": 4.25, "y": 4.25}, | 96 | {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25}, |
| 94 | {"matrix": [4, 5], "x": 5.25, "y": 4.25}, | 97 | {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25}, |
| 95 | {"matrix": [4, 6], "x": 6.25, "y": 4.25}, | 98 | {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25}, |
| 96 | {"matrix": [4, 7], "x": 7.25, "y": 4.25}, | 99 | {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25}, |
| 97 | {"matrix": [4, 8], "x": 8.25, "y": 4.25}, | 100 | {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25}, |
| 98 | {"matrix": [4, 9], "x": 9.25, "y": 4.25}, | 101 | {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25}, |
| 99 | {"matrix": [4, 10], "x": 10.25, "y": 4.25}, | 102 | {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25}, |
| 100 | {"matrix": [4, 11], "x": 11.25, "y": 4.25}, | 103 | {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25}, |
| 101 | {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, | 104 | {"label": "Shift", "matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, |
| 102 | {"matrix": [4, 14], "x": 14, "y": 4.25}, | 105 | {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4.25}, |
| 103 | {"matrix": [4, 15], "x": 15, "y": 4.25}, | 106 | {"label": "End", "matrix": [4, 15], "x": 15, "y": 4.25}, |
| 104 | 107 | ||
| 105 | {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, | 108 | {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, |
| 106 | {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, | 109 | {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, |
| 107 | {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25}, | 110 | {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25}, |
| 108 | {"matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25}, | 111 | {"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 6.25}, |
| 109 | {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, | 112 | {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, |
| 110 | {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, | 113 | {"label": "Fn", "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, |
| 111 | 114 | ||
| 112 | {"matrix": [5, 13], "x": 13, "y": 5.25}, | 115 | {"label": "\u2190", "matrix": [5, 13], "x": 13, "y": 5.25}, |
| 113 | {"matrix": [5, 14], "x": 14, "y": 5.25}, | 116 | {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5.25}, |
| 114 | {"matrix": [5, 15], "x": 15, "y": 5.25} | 117 | {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5.25} |
| 115 | ] | 118 | ] |
| 116 | } | 119 | } |
| 117 | } | 120 | } |
diff --git a/keyboards/gray_studio/aero75/keymaps/default/keymap.c b/keyboards/gray_studio/aero75/keymaps/default/keymap.c index 7fa8c15c95..106cfcb17d 100644 --- a/keyboards/gray_studio/aero75/keymaps/default/keymap.c +++ b/keyboards/gray_studio/aero75/keymaps/default/keymap.c | |||
| @@ -5,45 +5,46 @@ | |||
| 5 | 5 | ||
| 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 7 | 7 | ||
| 8 | [0] = LAYOUT_all( | 8 | [0] = LAYOUT_ansi_blocker( |
| 9 | 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_DEL, | 9 | 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_DEL, |
| 10 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, | 10 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, |
| 11 | 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, | 11 | 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, |
| 12 | 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, | 12 | 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, |
| 13 | 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, | 13 | 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, |
| 14 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | 14 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
| 15 | ), | 15 | ), |
| 16 | 16 | ||
| 17 | [1] = LAYOUT_all( | 17 | [1] = LAYOUT_ansi_blocker( |
| 18 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, | 18 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, |
| 19 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 19 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 20 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, | 20 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, |
| 21 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 21 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 22 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 22 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 23 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | 23 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 24 | ), | 24 | ), |
| 25 | 25 | ||
| 26 | [2] = LAYOUT_all( | 26 | [2] = LAYOUT_ansi_blocker( |
| 27 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 27 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 28 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 28 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 33 | ), | 33 | ), |
| 34 | 34 | ||
| 35 | [3] = LAYOUT_all( | 35 | [3] = LAYOUT_ansi_blocker( |
| 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 42 | ), | 42 | ), |
| 43 | |||
| 43 | }; | 44 | }; |
| 44 | const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( | 45 | const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( |
| 45 | {0,1, HSV_WHITE} | 46 | {0,1, HSV_WHITE} |
| 46 | ); | 47 | ); |
| 47 | const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( | 48 | const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( |
| 48 | my_capslock_layer | 49 | my_capslock_layer |
| 49 | ); | 50 | ); |
diff --git a/keyboards/gray_studio/aero75/keymaps/via/keymap.c b/keyboards/gray_studio/aero75/keymaps/via/keymap.c index 7fa8c15c95..106cfcb17d 100644 --- a/keyboards/gray_studio/aero75/keymaps/via/keymap.c +++ b/keyboards/gray_studio/aero75/keymaps/via/keymap.c | |||
| @@ -5,45 +5,46 @@ | |||
| 5 | 5 | ||
| 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 7 | 7 | ||
| 8 | [0] = LAYOUT_all( | 8 | [0] = LAYOUT_ansi_blocker( |
| 9 | 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_DEL, | 9 | 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_DEL, |
| 10 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, | 10 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, |
| 11 | 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, | 11 | 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, |
| 12 | 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, | 12 | 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, |
| 13 | 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, | 13 | 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, |
| 14 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | 14 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
| 15 | ), | 15 | ), |
| 16 | 16 | ||
| 17 | [1] = LAYOUT_all( | 17 | [1] = LAYOUT_ansi_blocker( |
| 18 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, | 18 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, |
| 19 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 19 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 20 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, | 20 | _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, |
| 21 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 21 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 22 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 22 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 23 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | 23 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 24 | ), | 24 | ), |
| 25 | 25 | ||
| 26 | [2] = LAYOUT_all( | 26 | [2] = LAYOUT_ansi_blocker( |
| 27 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 27 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 28 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 28 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 33 | ), | 33 | ), |
| 34 | 34 | ||
| 35 | [3] = LAYOUT_all( | 35 | [3] = LAYOUT_ansi_blocker( |
| 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | 41 | _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 42 | ), | 42 | ), |
| 43 | |||
| 43 | }; | 44 | }; |
| 44 | const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( | 45 | const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( |
| 45 | {0,1, HSV_WHITE} | 46 | {0,1, HSV_WHITE} |
| 46 | ); | 47 | ); |
| 47 | const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( | 48 | const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( |
| 48 | my_capslock_layer | 49 | my_capslock_layer |
| 49 | ); | 50 | ); |
diff --git a/keyboards/gray_studio/aero75/matrix_diagram.md b/keyboards/gray_studio/aero75/matrix_diagram.md new file mode 100644 index 0000000000..64bb3af675 --- /dev/null +++ b/keyboards/gray_studio/aero75/matrix_diagram.md | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | # Matrix Diagram for GrayStudio Aero 75 Hotswap | ||
| 2 | |||
| 3 | ``` | ||
| 4 | ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐ | ||
| 5 | │00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0D │ │0F │ | ||
| 6 | └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘ | ||
| 7 | ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ | ||
| 8 | │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1F │ | ||
| 9 | ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ | ||
| 10 | │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │ | ||
| 11 | ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ | ||
| 12 | │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3F │ | ||
| 13 | ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ | ||
| 14 | │40 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D │4E │4F │ | ||
| 15 | ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ | ||
| 16 | │50 │51 │53 │57 │5A │5B │ │5D │5E │5F │ | ||
| 17 | └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ | ||
| 18 | ``` | ||
diff --git a/keyboards/gray_studio/aero75/readme.md b/keyboards/gray_studio/aero75/readme.md index fbab90c9ed..c27ce195b3 100644 --- a/keyboards/gray_studio/aero75/readme.md +++ b/keyboards/gray_studio/aero75/readme.md | |||
| @@ -1 +1,28 @@ | |||
| 1 | # Gray Studio Aero 75 | 1 | # Gray Studio Aero 75 |
| 2 | |||
| 3 |  | ||
| 4 | |||
| 5 | A 75% keyboard featuring an anodized aluminum case around a gasket-mounted, flex-cut PCB. | ||
| 6 | |||
| 7 | * Keyboard Maintainer: [edwardslau](https://github.com/edwardslau) | ||
| 8 | * Hardware Supported: Aero 75 Hotswap (STM32F103) | ||
| 9 | * Aero 75 Soldered version is **not currently supported**. | ||
| 10 | * Hardware Availability: [GrayStudio](https://graystudio.site/en/aero75/) | ||
| 11 | |||
| 12 | Make example for this keyboard (after setting up your build environment): | ||
| 13 | |||
| 14 | make gray_studio/aero75:default | ||
| 15 | |||
| 16 | Flashing example for this keyboard: | ||
| 17 | |||
| 18 | make gray_studio/aero75:default:flash | ||
| 19 | |||
| 20 | ## Bootloader | ||
| 21 | |||
| 22 | Enter the bootloader in 3 ways: | ||
| 23 | |||
| 24 | * **Bootmagic reset**: Hold down the top-left key (Escape) and plug in the keyboard | ||
| 25 | * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead | ||
| 26 | * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (top-right on the Function layer by default) | ||
| 27 | |||
| 28 | 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). | ||
