aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-29 23:30:51 +0000
committerQMK Bot <hello@qmk.fm>2021-10-29 23:30:51 +0000
commit5851ac1934a3948403cd1666f2b9b519224c51ca (patch)
tree3aad22ba5451fc2d65b2b42a2e26ba4b72baeaab
parent70e396e8829dcdae363481af0acbd9f26a5982b1 (diff)
parent28120c1a63bbc64649765d9214b14e63709933aa (diff)
downloadqmk_firmware-5851ac1934a3948403cd1666f2b9b519224c51ca.tar.gz
qmk_firmware-5851ac1934a3948403cd1666f2b9b519224c51ca.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/acheron/shark/keymaps/ajp10304/readme.md5
-rw-r--r--keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c10
-rw-r--r--keyboards/handwired/atreus50/keymaps/ajp10304/readme.md5
-rw-r--r--keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md6
-rw-r--r--keyboards/planck/keymaps/ajp10304/readme.md6
-rw-r--r--keyboards/quark/keymaps/ajp10304/readme.md5
-rw-r--r--layouts/community/ortho_4x12/ajp10304/keymap.c10
-rw-r--r--layouts/community/ortho_4x12/ajp10304/readme.md2
-rw-r--r--users/ajp10304/readme.md4
9 files changed, 23 insertions, 30 deletions
diff --git a/keyboards/acheron/shark/keymaps/ajp10304/readme.md b/keyboards/acheron/shark/keymaps/ajp10304/readme.md
index c17232162..cb8bcdae9 100644
--- a/keyboards/acheron/shark/keymaps/ajp10304/readme.md
+++ b/keyboards/acheron/shark/keymaps/ajp10304/readme.md
@@ -7,8 +7,7 @@ the second is the output when shift is applied.
7**Note:** The below tables assume a UK layout. 7**Note:** The below tables assume a UK layout.
8 8
9#### Flashing 9#### Flashing
10 10Refer to the README.md of the keyboard you want to flash.
11`make acheron/shark:ajp10304:flash`
12 11
13##### Main Qwerty Layer 12##### Main Qwerty Layer
14 13
@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
102 101
103| | | | | | | | | | | | | 102| | | | | | | | | | | | |
104| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| 103| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
105| ESC | | | | | | | | BTN3 | | | | 104| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
106| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | 105| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
107| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | 106| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
108| | | | | | | | | | | | | 107| | | | | | | | | | | | |
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 2b0616ad7..012245516 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
112 112
113/* Mouse 113/* Mouse
114 * ,------------------------------------------ |-----------------------------------------. 114 * ,------------------------------------------ |-----------------------------------------.
115 * | ESC | | | | | | | | | BTN3 | | | | 115 * | ESC | | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | |
116 * |------+------+------+------+------+------- |------+------+------+------+------+------| 116 * |------+------+------+------+------+------- |------+------+------+------+------+------|
117 * | ACC0 | ACC1 | ACC2 | | | | | | BTN1 | UP | BTN2 | | | 117 * | ACC0 | ACC1 | ACC2 | | | | | | BTN1 | UP | BTN2 | | |
118 * |------+------+------+------+------+------| |------+------+------+------+------+------| 118 * |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -122,10 +122,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
122 * `-------------------------------------------------------------------------------------------------' 122 * `-------------------------------------------------------------------------------------------------'
123 */ 123 */
124[_MOUSE] = LAYOUT( 124[_MOUSE] = LAYOUT(
125 KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______ , 125 KC_ESC , _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_UP, KC_MS_BTN3, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, _______ ,
126 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_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______ ,
127 KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______ , 127 KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______ ,
128 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 128 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
129), 129),
130 130
131 131
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md b/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md
index 4f1bac8da..640bcc46f 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md
@@ -7,8 +7,7 @@ the second is the output when shift is applied.
7**Note:** The below tables assume a UK layout. 7**Note:** The below tables assume a UK layout.
8 8
9#### Flashing 9#### Flashing
10 10Refer to the README.md of the keyboard you want to flash.
11`make handwired/atreus50:ajp10304:flash`
12 11
13##### Main Qwerty Layer 12##### Main Qwerty Layer
14 13
@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
102 101
103| | | | | | | | | | | | | | | 102| | | | | | | | | | | | | | |
104| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| 103| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
105| ESC | | | | | | | | | | BTN3 | | | | 104| ESC | | | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
106| ACC0 | ACC1 | ACC2 | | | | | | | BTN1 | UP | BTN2 | | | 105| ACC0 | ACC1 | ACC2 | | | | | | | BTN1 | UP | BTN2 | | |
107| ACC0 | ACC1 | ACC2 | | | | | | | LEFT | DOWN | RIGHT| | | 106| ACC0 | ACC1 | ACC2 | | | | | | | LEFT | DOWN | RIGHT| | |
108| | | | | | | Ctrl | Alt | | | | | | | 107| | | | | | | Ctrl | Alt | | | | | | |
diff --git a/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md b/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
index 7336b1994..8a7562d74 100644
--- a/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
+++ b/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
@@ -7,9 +7,7 @@ the second is the output when shift is applied.
7**Note:** The below tables assume a UK layout. 7**Note:** The below tables assume a UK layout.
8 8
9#### Flashing 9#### Flashing
10Use sleep to get a chance to get into boot mode. 10Refer to the README.md of the keyboard you want to flash.
11
12`make jj40:ajp10304:flash`
13 11
14##### Main Qwerty Layer 12##### Main Qwerty Layer
15 13
@@ -103,7 +101,7 @@ Activated when `fn` and `raise` held together.
103 101
104| | | | | | | | | | | | | 102| | | | | | | | | | | | |
105| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| 103| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
106| ESC | | | | | | | | BTN3 | | | | 104| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
107| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | 105| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
108| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | 106| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
109| | | | | | | | | | | | | 107| | | | | | | | | | | | |
diff --git a/keyboards/planck/keymaps/ajp10304/readme.md b/keyboards/planck/keymaps/ajp10304/readme.md
index 97f0a0093..c68ba4928 100644
--- a/keyboards/planck/keymaps/ajp10304/readme.md
+++ b/keyboards/planck/keymaps/ajp10304/readme.md
@@ -7,9 +7,7 @@ the second is the output when shift is applied.
7**Note:** The below tables assume a UK layout. 7**Note:** The below tables assume a UK layout.
8 8
9#### Flashing 9#### Flashing
10Rev <=5: `make planck:ajp10304:flash` 10Refer to the README.md of the keyboard you want to flash.
11
12Rev 6: `make planck/rev6:ajp10304:flash`
13 11
14##### Main Qwerty Layer 12##### Main Qwerty Layer
15 13
@@ -103,7 +101,7 @@ Activated when `fn` and `raise` held together.
103 101
104| | | | | | | | | | | | | 102| | | | | | | | | | | | |
105| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| 103| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
106| ESC | | | | | | | | BTN3 | | | | 104| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
107| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | 105| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
108| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | 106| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
109| | | | | | | | | | | | | 107| | | | | | | | | | | | |
diff --git a/keyboards/quark/keymaps/ajp10304/readme.md b/keyboards/quark/keymaps/ajp10304/readme.md
index 12090ccd4..83af702e2 100644
--- a/keyboards/quark/keymaps/ajp10304/readme.md
+++ b/keyboards/quark/keymaps/ajp10304/readme.md
@@ -7,8 +7,7 @@ the second is the output when shift is applied.
7**Note:** The below tables assume a UK layout. 7**Note:** The below tables assume a UK layout.
8 8
9#### Flashing 9#### Flashing
10 10Refer to the README.md of the keyboard you want to flash.
11`make quark:ajp10304:flash`
12 11
13##### Main Qwerty Layer 12##### Main Qwerty Layer
14 13
@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
102 101
103| | | | | | | | | | | | | 102| | | | | | | | | | | | |
104| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| 103| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
105| ESC | | | | | | | | BTN3 | | | | 104| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
106| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | 105| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
107| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | 106| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
108| | | | | | | | | | | | | 107| | | | | | | | | | | | |
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| | | | | | | | | | | | |
diff --git a/users/ajp10304/readme.md b/users/ajp10304/readme.md
index 2ac0a6996..bfc39535c 100644
--- a/users/ajp10304/readme.md
+++ b/users/ajp10304/readme.md
@@ -1,4 +1,4 @@
1Copyright 2020 Alan Pocklington <ajp10304@gmail.com> @ajp10304 1Copyright 2021 Alan Pocklington <ajp10304@gmail.com> @ajp10304
2 2
3This program is free software: you can redistribute it and/or modify 3This program is free software: you can redistribute it and/or modify
4it under the terms of the GNU General Public License as published by 4it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@ Activated when `fn` and `raise` held together.
116 116
117| | | | | | | | | | | | | 117| | | | | | | | | | | | |
118| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| 118| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
119| ESC | | | | | | | | BTN3 | | | | 119| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
120| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | 120| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
121| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | 121| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
122| | | | | | | | | | | | | 122| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 10:34:59 +0000