Merge remote-tracking branch 'origin/master' into develop

qmk · Oct 29, 2021 · 5851ac1 · 5851ac1
2 parents 70e396e + 28120c1
commit 5851ac1
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 30 deletions.
diff --git 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.
 **Note:** The below tables assume a UK layout.
 
 #### Flashing
-
-`make acheron/shark:ajp10304:flash`
+Refer to the README.md of the keyboard you want to flash.
 
 ##### Main Qwerty Layer
 
@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
 
 | | | | | | | | | | | | |
 | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC | | | | | |  | | BTN3 |  |  | |
+| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
 | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
 | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
 | | | | | | | | | | | | |

diff --git 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] = {
 
 /* Mouse
  * ,------------------------------------------ |-----------------------------------------.
- * | ESC | | | | | | |  | | BTN3 |  |  | |
+ * | ESC | | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | |
  * |------+------+------+------+------+------- |------+------+------+------+------+------|
  * | ACC0 | ACC1 | ACC2 | | | | | | BTN1 | UP | BTN2 | | |
  * |------+------+------+------+------+------| |------+------+------+------+------+------|
@@ -122,10 +122,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-------------------------------------------------------------------------------------------------'
  */
 [_MOUSE] = LAYOUT(
- KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______ ,
- KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______ ,
- KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______ ,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ KC_ESC , _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_UP, KC_MS_BTN3, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, _______ ,
+ KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______,  KC_MS_BTN1,  KC_MS_UP, KC_MS_BTN2,  _______,  _______ ,
+ KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______,  KC_MS_LEFT,  KC_MS_DOWN, KC_MS_RIGHT,  _______,  _______ ,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______,  _______,  _______
 ),
 
 

diff --git 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.
 **Note:** The below tables assume a UK layout.
 
 #### Flashing
-
-`make handwired/atreus50:ajp10304:flash`
+Refer to the README.md of the keyboard you want to flash.
 
 ##### Main Qwerty Layer
 
@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
 
 | | | | | | | | | | | | | | |
 | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC | | | | | | | |  | | BTN3 |  |  | |
+| ESC | | | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
 | ACC0 | ACC1 | ACC2 | | | | | | | BTN1 | UP | BTN2 | | |
 | ACC0 | ACC1 | ACC2 | | | | | | | LEFT | DOWN | RIGHT| | |
 | | | | | | | Ctrl | Alt | | | | | | |

diff --git 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.
 **Note:** The below tables assume a UK layout.
 
 #### Flashing
-Use sleep to get a chance to get into boot mode.
-
-`make jj40:ajp10304:flash`
+Refer to the README.md of the keyboard you want to flash.
 
 ##### Main Qwerty Layer
 
@@ -103,7 +101,7 @@ Activated when `fn` and `raise` held together.
 
 | | | | | | | | | | | | |
 | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC | | | | | |  | | BTN3 |  |  | |
+| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
 | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
 | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
 | | | | | | | | | | | | |

diff --git 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.
 **Note:** The below tables assume a UK layout.
 
 #### Flashing
-Rev <=5: `make planck:ajp10304:flash`
-
-Rev 6: `make planck/rev6:ajp10304:flash`
+Refer to the README.md of the keyboard you want to flash.
 
 ##### Main Qwerty Layer
 
@@ -103,7 +101,7 @@ Activated when `fn` and `raise` held together.
 
 | | | | | | | | | | | | |
 | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC | | | | | |  | | BTN3 |  |  | |
+| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
 | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
 | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
 | | | | | | | | | | | | |

diff --git 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.
 **Note:** The below tables assume a UK layout.
 
 #### Flashing
-
-`make quark:ajp10304:flash`
+Refer to the README.md of the keyboard you want to flash.
 
 ##### Main Qwerty Layer
 
@@ -102,7 +101,7 @@ Activated when `fn` and `raise` held together.
 
 | | | | | | | | | | | | |
 | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC | | | | | |  | | BTN3 |  |  | |
+| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
 | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
 | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
 | | | | | | | | | | | | |

diff --git 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] = {
 
 /* Mouse
  * ,-----------------------------------------------------------------------------------.
- * | ESC | | | | | |  | | BTN3 |  |  | |
+ * | ESC | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
@@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_MOUSE] = LAYOUT_ortho_4x12(
- KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______,
- KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______,
- KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ KC_ESC , _______, _______, _______, _______, _______, KC_MS_WH_LEFT, KC_MS_WH_UP, KC_MS_BTN3, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, _______,
+ KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______,  KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2,  _______,  _______,
+ KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______,  KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT,  _______,  _______,
+ _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,  _______
 ),
 
 /* Num Pad

diff --git 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.
 
 | | | | | | | | | | | | |
 | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC | | | | | |  | | BTN3 |  |  | |
+| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
 | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
 | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
 | | | | | | | | | | | | |

diff --git a/users/ajp10304/readme.md b/users/ajp10304/readme.md
@@ -1,4 +1,4 @@
-Copyright 2020 Alan Pocklington <[email protected]> @ajp10304
+Copyright 2021 Alan Pocklington <[email protected]> @ajp10304
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@ Activated when `fn` and `raise` held together.
 
 | | | | | | | | | | | | |
 | :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ESC | | | | | |  | | BTN3 |  |  | |
+| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | |
 | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
 | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
 | | | | | | | | | | | | |