diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-29 23:30:51 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-29 23:30:51 +0000 |
| commit | 5851ac1934a3948403cd1666f2b9b519224c51ca (patch) | |
| tree | 3aad22ba5451fc2d65b2b42a2e26ba4b72baeaab /layouts | |
| parent | 70e396e8829dcdae363481af0acbd9f26a5982b1 (diff) | |
| parent | 28120c1a63bbc64649765d9214b14e63709933aa (diff) | |
| download | qmk_firmware-5851ac1934a3948403cd1666f2b9b519224c51ca.tar.gz qmk_firmware-5851ac1934a3948403cd1666f2b9b519224c51ca.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/community/ortho_4x12/ajp10304/keymap.c | 10 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/ajp10304/readme.md | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c index c55e99af7..4d9ddb124 100644 --- a/layouts/community/ortho_4x12/ajp10304/keymap.c +++ b/layouts/community/ortho_4x12/ajp10304/keymap.c | |||
| @@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 111 | 111 | ||
| 112 | /* Mouse | 112 | /* Mouse |
| 113 | * ,-----------------------------------------------------------------------------------. | 113 | * ,-----------------------------------------------------------------------------------. |
| 114 | * | ESC | | | | | | | | BTN3 | | | | | 114 | * | ESC | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | | |
| 115 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 115 | * |------+------+------+------+------+-------------+------+------+------+------+------| |
| 116 | * | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | | 116 | * | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | |
| 117 | * |------+------+------+------+------+------|------+------+------+------+------+------| | 117 | * |------+------+------+------+------+------|------+------+------+------+------+------| |
| @@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 121 | * `-----------------------------------------------------------------------------------' | 121 | * `-----------------------------------------------------------------------------------' |
| 122 | */ | 122 | */ |
| 123 | [_MOUSE] = LAYOUT_ortho_4x12( | 123 | [_MOUSE] = LAYOUT_ortho_4x12( |
| 124 | KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______, | 124 | KC_ESC , _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_UP, KC_MS_BTN3, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, _______, |
| 125 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______, | 125 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______, |
| 126 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______, | 126 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______, |
| 127 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 127 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 128 | ), | 128 | ), |
| 129 | 129 | ||
| 130 | /* Num Pad | 130 | /* Num Pad |
diff --git a/layouts/community/ortho_4x12/ajp10304/readme.md b/layouts/community/ortho_4x12/ajp10304/readme.md index be6afa6fe..6db0b851d 100644 --- a/layouts/community/ortho_4x12/ajp10304/readme.md +++ b/layouts/community/ortho_4x12/ajp10304/readme.md | |||
| @@ -101,7 +101,7 @@ Activated when `fn` and `raise` held together. | |||
| 101 | 101 | ||
| 102 | | | | | | | | | | | | | | | 102 | | | | | | | | | | | | | | |
| 103 | | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| | 103 | | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| |
| 104 | | ESC | | | | | | | | BTN3 | | | | | 104 | | ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | | |
| 105 | | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | | 105 | | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | |
| 106 | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | | 106 | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | |
| 107 | | | | | | | | | | | | | | | 107 | | | | | | | | | | | | | | |