Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add akko_yu01 keyboard #24383

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add akko_yu01 keyboard #24383

wants to merge 2 commits into from

Conversation

sdk66
Copy link

@sdk66 sdk66 commented Sep 10, 2024

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

Comment on lines 253 to 323
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 2.5, "y": 0},
{"matrix": [0, 1], "x": 3.5, "y": 0},
{"matrix": [0, 2], "x": 4.5, "y": 0},
{"matrix": [0, 3], "x": 5.5, "y": 0},
{"matrix": [0, 4], "x": 6.5, "y": 0},
{"matrix": [0, 5], "x": 7.5, "y": 0},
{"matrix": [0, 6], "x": 8.5, "y": 0},
{"matrix": [0, 7], "x": 9.5, "y": 0},
{"matrix": [0, 8], "x": 10.5, "y": 0},
{"matrix": [0, 9], "x": 11.5, "y": 0},
{"matrix": [0, 10], "x": 12.5, "y": 0},
{"matrix": [0, 11], "x": 13.5, "y": 0},
{"matrix": [0, 12], "x": 14.5, "y": 0},
{"matrix": [0, 13], "x": 15.5, "y": 0, "w": 2},
{"matrix": [0, 14], "x": 17.5, "y": 0},
{"matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 4, "y": 1},
{"matrix": [1, 2], "x": 5, "y": 1},
{"matrix": [1, 3], "x": 6, "y": 1},
{"matrix": [1, 4], "x": 7, "y": 1},
{"matrix": [1, 5], "x": 8, "y": 1},
{"matrix": [1, 6], "x": 9, "y": 1},
{"matrix": [1, 7], "x": 10, "y": 1},
{"matrix": [1, 8], "x": 11, "y": 1},
{"matrix": [1, 9], "x": 12, "y": 1},
{"matrix": [1, 10], "x": 13, "y": 1},
{"matrix": [1, 11], "x": 14, "y": 1},
{"matrix": [1, 12], "x": 15, "y": 1},
{"matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
{"matrix": [1, 14], "x": 17.5, "y": 1},
{"matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 4.25, "y": 2},
{"matrix": [2, 2], "x": 5.25, "y": 2},
{"matrix": [2, 3], "x": 6.25, "y": 2},
{"matrix": [2, 4], "x": 7.25, "y": 2},
{"matrix": [2, 5], "x": 8.25, "y": 2},
{"matrix": [2, 6], "x": 9.25, "y": 2},
{"matrix": [2, 7], "x": 10.25, "y": 2},
{"matrix": [2, 8], "x": 11.25, "y": 2},
{"matrix": [2, 9], "x": 12.25, "y": 2},
{"matrix": [2, 10], "x": 13.25, "y": 2},
{"matrix": [2, 11], "x": 14.25, "y": 2},
{"matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
{"matrix": [2, 14], "x": 17.5, "y": 2},
{"matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 4.75, "y": 3},
{"matrix": [3, 3], "x": 5.75, "y": 3},
{"matrix": [3, 4], "x": 6.75, "y": 3},
{"matrix": [3, 5], "x": 7.75, "y": 3},
{"matrix": [3, 6], "x": 8.75, "y": 3},
{"matrix": [3, 7], "x": 9.75, "y": 3},
{"matrix": [3, 8], "x": 10.75, "y": 3},
{"matrix": [3, 9], "x": 11.75, "y": 3},
{"matrix": [3, 10], "x": 12.75, "y": 3},
{"matrix": [3, 11], "x": 13.75, "y": 3},
{"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
{"matrix": [3, 13], "x": 16.5, "y": 3},
{"matrix": [3, 14], "x": 17.5, "y": 3},
{"matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 5, "y": 4, "w": 1.25},
{"matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
{"matrix": [4, 9], "x": 12.5, "y": 4},
{"matrix": [4, 10], "x": 13.5, "y": 4},
{"matrix": [4, 11], "x": 14.5, "y": 4},
{"matrix": [4, 12], "x": 15.5, "y": 4},
{"matrix": [4, 13], "x": 16.5, "y": 4},
{"matrix": [4, 14], "x": 17.5, "y": 4}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. add community Layout support
  2. move "x" co-ordinates to start at 0
Suggested change
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 2.5, "y": 0},
{"matrix": [0, 1], "x": 3.5, "y": 0},
{"matrix": [0, 2], "x": 4.5, "y": 0},
{"matrix": [0, 3], "x": 5.5, "y": 0},
{"matrix": [0, 4], "x": 6.5, "y": 0},
{"matrix": [0, 5], "x": 7.5, "y": 0},
{"matrix": [0, 6], "x": 8.5, "y": 0},
{"matrix": [0, 7], "x": 9.5, "y": 0},
{"matrix": [0, 8], "x": 10.5, "y": 0},
{"matrix": [0, 9], "x": 11.5, "y": 0},
{"matrix": [0, 10], "x": 12.5, "y": 0},
{"matrix": [0, 11], "x": 13.5, "y": 0},
{"matrix": [0, 12], "x": 14.5, "y": 0},
{"matrix": [0, 13], "x": 15.5, "y": 0, "w": 2},
{"matrix": [0, 14], "x": 17.5, "y": 0},
{"matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 4, "y": 1},
{"matrix": [1, 2], "x": 5, "y": 1},
{"matrix": [1, 3], "x": 6, "y": 1},
{"matrix": [1, 4], "x": 7, "y": 1},
{"matrix": [1, 5], "x": 8, "y": 1},
{"matrix": [1, 6], "x": 9, "y": 1},
{"matrix": [1, 7], "x": 10, "y": 1},
{"matrix": [1, 8], "x": 11, "y": 1},
{"matrix": [1, 9], "x": 12, "y": 1},
{"matrix": [1, 10], "x": 13, "y": 1},
{"matrix": [1, 11], "x": 14, "y": 1},
{"matrix": [1, 12], "x": 15, "y": 1},
{"matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
{"matrix": [1, 14], "x": 17.5, "y": 1},
{"matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 4.25, "y": 2},
{"matrix": [2, 2], "x": 5.25, "y": 2},
{"matrix": [2, 3], "x": 6.25, "y": 2},
{"matrix": [2, 4], "x": 7.25, "y": 2},
{"matrix": [2, 5], "x": 8.25, "y": 2},
{"matrix": [2, 6], "x": 9.25, "y": 2},
{"matrix": [2, 7], "x": 10.25, "y": 2},
{"matrix": [2, 8], "x": 11.25, "y": 2},
{"matrix": [2, 9], "x": 12.25, "y": 2},
{"matrix": [2, 10], "x": 13.25, "y": 2},
{"matrix": [2, 11], "x": 14.25, "y": 2},
{"matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
{"matrix": [2, 14], "x": 17.5, "y": 2},
{"matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
{"matrix": [3, 2], "x": 4.75, "y": 3},
{"matrix": [3, 3], "x": 5.75, "y": 3},
{"matrix": [3, 4], "x": 6.75, "y": 3},
{"matrix": [3, 5], "x": 7.75, "y": 3},
{"matrix": [3, 6], "x": 8.75, "y": 3},
{"matrix": [3, 7], "x": 9.75, "y": 3},
{"matrix": [3, 8], "x": 10.75, "y": 3},
{"matrix": [3, 9], "x": 11.75, "y": 3},
{"matrix": [3, 10], "x": 12.75, "y": 3},
{"matrix": [3, 11], "x": 13.75, "y": 3},
{"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
{"matrix": [3, 13], "x": 16.5, "y": 3},
{"matrix": [3, 14], "x": 17.5, "y": 3},
{"matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 5, "y": 4, "w": 1.25},
{"matrix": [4, 6], "x": 6.25, "y": 4, "w": 6.25},
{"matrix": [4, 9], "x": 12.5, "y": 4},
{"matrix": [4, 10], "x": 13.5, "y": 4},
{"matrix": [4, 11], "x": 14.5, "y": 4},
{"matrix": [4, 12], "x": 15.5, "y": 4},
{"matrix": [4, 13], "x": 16.5, "y": 4},
{"matrix": [4, 14], "x": 17.5, "y": 4}
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
"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, "w": 2},
{"matrix": [0, 14], "x": 15, "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": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [1, 14], "x": 15, "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, 13], "x": 12.75, "y": 2, "w": 2.25},
{"matrix": [2, 14], "x": 15, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"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": [3, 14], "x": 15, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 9], "x": 10, "y": 4},
{"matrix": [4, 10], "x": 11, "y": 4},
{"matrix": [4, 11], "x": 12, "y": 4},
{"matrix": [4, 12], "x": 13, "y": 4},
{"matrix": [4, 13], "x": 14, "y": 4},
{"matrix": [4, 14], "x": 15, "y": 4}

Comment on lines 20 to 76
[_BL] = LAYOUT( /* win Base */
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[_FL] = LAYOUT( /* win FN */
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_MBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),

[_MBL] = LAYOUT( /* mac Base */
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_MFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[_MFL] = LAYOUT( /*mac FN */
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_BL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),

[_FBL] = LAYOUT( /* win L Base */
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[_FFL] = LAYOUT( /* win L FN */
EE_CLR, KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_FMBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),

[_FMBL] = LAYOUT( /* MAC L Base */
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FMFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[_FMFL] = LAYOUT( /* MAC L FN */
EE_CLR, KC_BRID, KC_BRIU, CTRL_UP, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_FBL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),

[_DEFA] = LAYOUT( /* FN */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

match community Layout support

Suggested change
[_BL] = LAYOUT( /* win Base */
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FL] = LAYOUT( /* win FN */
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_MBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_MBL] = LAYOUT( /* mac Base */
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_MFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_MFL] = LAYOUT( /*mac FN */
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_BL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_FBL] = LAYOUT( /* win L Base */
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FFL] = LAYOUT( /* win L FN */
EE_CLR, KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_FMBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_FMBL] = LAYOUT( /* MAC L Base */
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FMFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FMFL] = LAYOUT( /* MAC L FN */
EE_CLR, KC_BRID, KC_BRIU, CTRL_UP, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_FBL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_DEFA] = LAYOUT( /* FN */
[_BL] = LAYOUT_65_ansi( /* win Base */
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FL] = LAYOUT_65_ansi( /* win FN */
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_MBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_MBL] = LAYOUT_65_ansi( /* mac Base */
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_MFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_MFL] = LAYOUT_65_ansi( /*mac FN */
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_BL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_FBL] = LAYOUT_65_ansi( /* win L Base */
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FFL] = LAYOUT_65_ansi( /* win L FN */
EE_CLR, KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_FMBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_FMBL] = LAYOUT_65_ansi( /* MAC L Base */
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FMFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FMFL] = LAYOUT_65_ansi( /* MAC L FN */
EE_CLR, KC_BRID, KC_BRIU, CTRL_UP, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_FBL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_DEFA] = LAYOUT_65_ansi( /* FN */

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[_BL] = LAYOUT_65_ansi( /* win Base /
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FL] = LAYOUT_65_ansi( /
win FN /
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_MBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_MBL] = LAYOUT_65_ansi( /
mac Base */
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_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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_MFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_MFL] = LAYOUT_65_ansi( /*mac FN /
EE_CLR, 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_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_BL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_FBL] = LAYOUT_65_ansi( /
win L Base /
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, MO(_FFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FFL] = LAYOUT_65_ansi( /
win L FN /
EE_CLR, KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, _______, _______, RGB_HUI,
_______, KC_NO, TO(_FMBL), _______, _______, _______, _______, _______, KC_HOME, KC_END, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, GU_TOGG, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_FMBL] = LAYOUT_65_ansi( /
MAC L Base /
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_BSPC, 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_BSLS, KC_INS,
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_PGUP,
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_PGDN,
KC_LCTL, KC_LALT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FMFL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FMFL] = LAYOUT_65_ansi( /
MAC L FN /
EE_CLR, KC_BRID, KC_BRIU, CTRL_UP, KC_SIRI, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BATQ, RGB_MOD,
_______, KC_BT1, KC_BT2, KC_BT3, KC_2G4, KC_USB, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
_______, TO(_FBL), KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_DEFA),RGB_VAI, _______,
_______, _______, _______, _______, _______, _______, KC_FTOG, RGB_SPD, RGB_VAD, RGB_SPI),
[_DEFA] = LAYOUT_65_ansi( /
FN */

Thank you for your suggestion, I will modify it immediately

2.move "x" co-ordinates to start at 0。
Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap stale Issues or pull requests that have become inactive without resolution.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants