Skip to content

Commit

Permalink
Eason Aeroboard Refactor (qmk#21271)
Browse files Browse the repository at this point in the history 
* [refactor] refactor keymaps

- grid-align keycodes
- use four-space indent
- remove trailing whitespace

* [refactor] physically arrange layout macro

Arrange the layout macro and keymaps in the QMK-desired order.

Breaks compatibility with out-of-tree keymaps.

Key sequence swaps in this commit:

- `KC_GRV` <-> `KC_1`
- `KC_TAB` <-> `KC_Q`

* [refactor] rename LAYOUT to LAYOUT_split_space

* [enhancement] add LAYOUT_7u_space

* [chore] correct maintainer value

Reference the keyboard maintainer's GitHub username.
  • Loading branch information
@noroadsleft @thismarvin
noroadsleft authored and thismarvin committed Sep 27, 2023
1 parent e3aa235 commit 97ce107
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 48 deletions.
96 changes: 90 additions & 6 deletions keyboards/eason/aeroboard/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"keyboard_name": "AeroBoard",
"manufacturer": "Eason",
"url": "",
"maintainer": "Eason",
"maintainer": "EasonQian1",
"usb": {
"vid": "0x8954",
"pid": "0x8870",
Expand All @@ -21,12 +21,12 @@
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
"LAYOUT": {
"LAYOUT_7u_space": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},

{"matrix": [0, 1], "x": 1.75, "y": 0},
{"matrix": [0, 2], "x": 2.75, "y": 0},
{"matrix": [0, 2], "x": 1.75, "y": 0},
{"matrix": [0, 1], "x": 2.75, "y": 0},
{"matrix": [0, 3], "x": 3.75, "y": 0},
{"matrix": [0, 4], "x": 4.75, "y": 0},
{"matrix": [0, 5], "x": 5.75, "y": 0},
Expand All @@ -43,8 +43,92 @@

{"matrix": [1, 0], "x": 0, "y": 1},

{"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
{"matrix": [1, 2], "x": 3.25, "y": 1},
{"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 3.25, "y": 1},
{"matrix": [1, 3], "x": 4.25, "y": 1},
{"matrix": [1, 4], "x": 5.25, "y": 1},
{"matrix": [1, 5], "x": 6.25, "y": 1},
{"matrix": [1, 6], "x": 7.25, "y": 1},
{"matrix": [1, 7], "x": 8.25, "y": 1},
{"matrix": [1, 8], "x": 9.25, "y": 1},
{"matrix": [1, 9], "x": 10.25, "y": 1},
{"matrix": [1, 10], "x": 11.25, "y": 1},
{"matrix": [1, 11], "x": 12.25, "y": 1},
{"matrix": [1, 12], "x": 13.25, "y": 1},
{"matrix": [1, 13], "x": 14.25, "y": 1},
{"matrix": [1, 14], "x": 15.25, "y": 1, "w": 1.5},
{"matrix": [1, 15], "x": 16.75, "y": 1},

{"matrix": [2, 0], "x": 0, "y": 2},

{"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3.5, "y": 2},
{"matrix": [2, 3], "x": 4.5, "y": 2},
{"matrix": [2, 4], "x": 5.5, "y": 2},
{"matrix": [2, 5], "x": 6.5, "y": 2},
{"matrix": [2, 6], "x": 7.5, "y": 2},
{"matrix": [2, 7], "x": 8.5, "y": 2},
{"matrix": [2, 8], "x": 9.5, "y": 2},
{"matrix": [2, 9], "x": 10.5, "y": 2},
{"matrix": [2, 10], "x": 11.5, "y": 2},
{"matrix": [2, 11], "x": 12.5, "y": 2},
{"matrix": [2, 12], "x": 13.5, "y": 2},
{"matrix": [2, 14], "x": 14.5, "y": 2, "w": 2.25},
{"matrix": [2, 15], "x": 16.75, "y": 2},

{"matrix": [3, 0], "x": 0, "y": 3},

{"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
{"matrix": [3, 3], "x": 4, "y": 3},
{"matrix": [3, 4], "x": 5, "y": 3},
{"matrix": [3, 5], "x": 6, "y": 3},
{"matrix": [3, 6], "x": 7, "y": 3},
{"matrix": [3, 7], "x": 8, "y": 3},
{"matrix": [3, 8], "x": 9, "y": 3},
{"matrix": [3, 9], "x": 10, "y": 3},
{"matrix": [3, 10], "x": 11, "y": 3},
{"matrix": [3, 11], "x": 12, "y": 3},
{"matrix": [3, 12], "x": 13, "y": 3},
{"matrix": [3, 13], "x": 14, "y": 3, "w": 1.75},
{"matrix": [3, 14], "x": 15.75, "y": 3},
{"matrix": [3, 15], "x": 16.75, "y": 3},

{"matrix": [4, 0], "x": 0, "y": 4},

{"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
{"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
{"matrix": [4, 7], "x": 5.5, "y": 4, "w": 7},
{"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},

{"matrix": [4, 13], "x": 14.75, "y": 4},
{"matrix": [4, 14], "x": 15.75, "y": 4},
{"matrix": [4, 15], "x": 16.75, "y": 4}
]
},
"LAYOUT_split_space": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},

{"matrix": [0, 2], "x": 1.75, "y": 0},
{"matrix": [0, 1], "x": 2.75, "y": 0},
{"matrix": [0, 3], "x": 3.75, "y": 0},
{"matrix": [0, 4], "x": 4.75, "y": 0},
{"matrix": [0, 5], "x": 5.75, "y": 0},
{"matrix": [0, 6], "x": 6.75, "y": 0},
{"matrix": [0, 7], "x": 7.75, "y": 0},
{"matrix": [0, 8], "x": 8.75, "y": 0},
{"matrix": [0, 9], "x": 9.75, "y": 0},
{"matrix": [0, 10], "x": 10.75, "y": 0},
{"matrix": [0, 11], "x": 11.75, "y": 0},
{"matrix": [0, 12], "x": 12.75, "y": 0},
{"matrix": [0, 13], "x": 13.75, "y": 0},
{"matrix": [0, 14], "x": 14.75, "y": 0, "w": 2},
{"matrix": [0, 15], "x": 16.75, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},

{"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 3.25, "y": 1},
{"matrix": [1, 3], "x": 4.25, "y": 1},
{"matrix": [1, 4], "x": 5.25, "y": 1},
{"matrix": [1, 5], "x": 6.25, "y": 1},
Expand Down
28 changes: 14 additions & 14 deletions keyboards/eason/aeroboard/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT(
KC_ESC, KC_1, KC_GRV, 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_MINS, KC_Q, KC_TAB, 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_PLUS, 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,
MO(1) , 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, MO(1),
KC_LGUI, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
KC_HOME, 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_PSCR,
_______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,QK_BOOT, KC_PAUS,
_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,_______, KC_VOLU, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
),
[0] = LAYOUT_split_space(
KC_ESC, 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_MINS, 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_PLUS, 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,
MO(1), 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, MO(1),
KC_LGUI, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_split_space(
KC_HOME, _______, 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_PSCR,
_______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PAUS,
_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_VOLU, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
),

};
57 changes: 29 additions & 28 deletions keyboards/eason/aeroboard/keymaps/via/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,33 @@

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT(
KC_ESC, KC_1, KC_GRV, 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_MINS, KC_Q, KC_TAB, 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_PLUS, 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,
MO(1) , 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, MO(1),
KC_LGUI, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
KC_HOME, 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_PSCR,
_______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,QK_BOOT, KC_PAUS,
_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,_______, KC_VOLU, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
),
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[0] = LAYOUT_split_space(
KC_ESC, 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_MINS, 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_PLUS, 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,
MO(1), 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, MO(1),
KC_LGUI, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_split_space(
KC_HOME, _______, 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_PSCR,
_______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PAUS,
_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_VOLU, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
),
[2] = LAYOUT_split_space(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_split_space(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

};

0 comments on commit 97ce107

Please sign in to comment.