Skip to content

Commit 5851ac1

Browse files
qmk-botqmk-bot
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents 70e396e + 28120c1 commit 5851ac1

File tree

9 files changed

+23
-30
lines changed

9 files changed

+23
-30
lines changed

‎keyboards/acheron/shark/keymaps/ajp10304/readme.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ the second is the output when shift is applied.
77
**Note:** The below tables assume a UK layout.
88

99
#### Flashing
10-
11-
`make acheron/shark:ajp10304:flash`
10+
Refer to the README.md of the keyboard you want to flash.
1211

1312
##### Main Qwerty Layer
1413

@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
102101

103102
| | | | | | | | | | | | |
104103
| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
105-
| ESC | | | | | | | | BTN3 | | | |
104+
| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
106105
| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
107106
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
108107
| | | | | | | | | | | | |

‎keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
112112

113113
/* Mouse
114114
* ,------------------------------------------ |-----------------------------------------.
115-
* | ESC | | | | | | | | | BTN3 | | | |
115+
* | ESC | | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | |
116116
* |------+------+------+------+------+------- |------+------+------+------+------+------|
117117
* | ACC0 | ACC1 | ACC2 | | | | | | BTN1 | UP | BTN2 | | |
118118
* |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -122,10 +122,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
122122
* `-------------------------------------------------------------------------------------------------'
123123
*/
124124
[_MOUSE] = LAYOUT(
125-
KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______ ,
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, _______, _______ ,
128-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
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, _______, _______ ,
127+
KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______ ,
128+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
129129
),
130130

131131

‎keyboards/handwired/atreus50/keymaps/ajp10304/readme.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ the second is the output when shift is applied.
77
**Note:** The below tables assume a UK layout.
88

99
#### Flashing
10-
11-
`make handwired/atreus50:ajp10304:flash`
10+
Refer to the README.md of the keyboard you want to flash.
1211

1312
##### Main Qwerty Layer
1413

@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
102101

103102
| | | | | | | | | | | | | | |
104103
| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
105-
| ESC | | | | | | | | | | BTN3 | | | |
104+
| ESC | | | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
106105
| ACC0 | ACC1 | ACC2 | | | | | | | BTN1 | UP | BTN2 | | |
107106
| ACC0 | ACC1 | ACC2 | | | | | | | LEFT | DOWN | RIGHT| | |
108107
| | | | | | | Ctrl | Alt | | | | | | |

‎keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ the second is the output when shift is applied.
77
**Note:** The below tables assume a UK layout.
88

99
#### Flashing
10-
Use sleep to get a chance to get into boot mode.
11-
12-
`make jj40:ajp10304:flash`
10+
Refer to the README.md of the keyboard you want to flash.
1311

1412
##### Main Qwerty Layer
1513

@@ -103,7 +101,7 @@ Activated when `fn` and `raise` held together.
103101

104102
| | | | | | | | | | | | |
105103
| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
106-
| ESC | | | | | | | | BTN3 | | | |
104+
| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
107105
| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
108106
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
109107
| | | | | | | | | | | | |

‎keyboards/planck/keymaps/ajp10304/readme.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ the second is the output when shift is applied.
77
**Note:** The below tables assume a UK layout.
88

99
#### Flashing
10-
Rev <=5: `make planck:ajp10304:flash`
11-
12-
Rev 6: `make planck/rev6:ajp10304:flash`
10+
Refer to the README.md of the keyboard you want to flash.
1311

1412
##### Main Qwerty Layer
1513

@@ -103,7 +101,7 @@ Activated when `fn` and `raise` held together.
103101

104102
| | | | | | | | | | | | |
105103
| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
106-
| ESC | | | | | | | | BTN3 | | | |
104+
| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
107105
| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
108106
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
109107
| | | | | | | | | | | | |

‎keyboards/quark/keymaps/ajp10304/readme.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ the second is the output when shift is applied.
77
**Note:** The below tables assume a UK layout.
88

99
#### Flashing
10-
11-
`make quark:ajp10304:flash`
10+
Refer to the README.md of the keyboard you want to flash.
1211

1312
##### Main Qwerty Layer
1413

@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
102101

103102
| | | | | | | | | | | | |
104103
| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
105-
| ESC | | | | | | | | BTN3 | | | |
104+
| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
106105
| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
107106
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
108107
| | | | | | | | | | | | |

‎layouts/community/ortho_4x12/ajp10304/keymap.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
111111

112112
/* Mouse
113113
* ,-----------------------------------------------------------------------------------.
114-
* | ESC | | | | | | | | BTN3 | | | |
114+
* | ESC | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | |
115115
* |------+------+------+------+------+-------------+------+------+------+------+------|
116116
* | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
117117
* |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
121121
* `-----------------------------------------------------------------------------------'
122122
*/
123123
[_MOUSE] = LAYOUT_ortho_4x12(
124-
KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______,
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, _______, _______,
127-
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
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, _______, _______,
126+
KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______,
127+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
128128
),
129129

130130
/* Num Pad

‎layouts/community/ortho_4x12/ajp10304/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Activated when `fn` and `raise` held together.
101101

102102
| | | | | | | | | | | | |
103103
| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
104-
| ESC | | | | | | | | BTN3 | | | |
104+
| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
105105
| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
106106
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
107107
| | | | | | | | | | | | |

‎users/ajp10304/readme.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2020 Alan Pocklington <ajp10304@gmail.com> @ajp10304
1+
Copyright 2021 Alan Pocklington <ajp10304@gmail.com> @ajp10304
22

33
This program is free software: you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@ Activated when `fn` and `raise` held together.
116116

117117
| | | | | | | | | | | | |
118118
| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
119-
| ESC | | | | | | | | BTN3 | | | |
119+
| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
120120
| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
121121
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
122122
| | | | | | | | | | | | |

0 commit comments

Comments
 (0)