Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
QMK Bot 2021-10-29 23:30:51 +00:00
commit 5851ac1934
9 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
keyboards/acheron/shark/keymaps/ajp10304/readme.md
View file

@ -7,8 +7,7 @@ the second is the output when shift is applied.
**Note:** The below tables assume a UK layout. **Note:** The below tables assume a UK layout.
#### Flashing #### Flashing
Refer to the README.md of the keyboard you want to flash.
`make acheron/shark:ajp10304:flash`
##### Main Qwerty Layer ##### 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 | | | | | BTN1 | UP | BTN2 | | |
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
| | | | | | | | | | | | | | | | | | | | | | | | | |

4
keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
View file

@ -112,7 +112,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Mouse /* Mouse
* ,------------------------------------------ |-----------------------------------------. * ,------------------------------------------ |-----------------------------------------.
* | ESC | | | | | | | | | BTN3 | | | | * | ESC | | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | |
* |------+------+------+------+------+------- |------+------+------+------+------+------| * |------+------+------+------+------+------- |------+------+------+------+------+------|
* | ACC0 | ACC1 | ACC2 | | | | | | BTN1 | UP | BTN2 | | | * | ACC0 | ACC1 | ACC2 | | | | | | BTN1 | UP | BTN2 | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------| * |------+------+------+------+------+------| |------+------+------+------+------+------|
@ -122,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------------------------------------------------------------' * `-------------------------------------------------------------------------------------------------'
*/ */
[_MOUSE] = LAYOUT( [_MOUSE] = LAYOUT(
KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______ , 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_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_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______ ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______

5
keyboards/handwired/atreus50/keymaps/ajp10304/readme.md
View file

@ -7,8 +7,7 @@ the second is the output when shift is applied.
**Note:** The below tables assume a UK layout. **Note:** The below tables assume a UK layout.
#### Flashing #### Flashing
Refer to the README.md of the keyboard you want to flash.
`make handwired/atreus50:ajp10304:flash`
##### Main Qwerty Layer ##### 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 | | | | | | | BTN1 | UP | BTN2 | | |
| ACC0 | ACC1 | ACC2 | | | | | | | LEFT | DOWN | RIGHT| | | | ACC0 | ACC1 | ACC2 | | | | | | | LEFT | DOWN | RIGHT| | |
| | | | | | | Ctrl | Alt | | | | | | | | | | | | | | Ctrl | Alt | | | | | | |

6
keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
View file

@ -7,9 +7,7 @@ the second is the output when shift is applied.
**Note:** The below tables assume a UK layout. **Note:** The below tables assume a UK layout.
#### Flashing #### Flashing
Use sleep to get a chance to get into boot mode. Refer to the README.md of the keyboard you want to flash.
`make jj40:ajp10304:flash`
##### Main Qwerty Layer ##### 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 | | | | | BTN1 | UP | BTN2 | | |
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
| | | | | | | | | | | | | | | | | | | | | | | | | |

6
keyboards/planck/keymaps/ajp10304/readme.md
View file

@ -7,9 +7,7 @@ the second is the output when shift is applied.
**Note:** The below tables assume a UK layout. **Note:** The below tables assume a UK layout.
#### Flashing #### Flashing
Rev <=5: `make planck:ajp10304:flash` Refer to the README.md of the keyboard you want to flash.
Rev 6: `make planck/rev6:ajp10304:flash`
##### Main Qwerty Layer ##### 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 | | | | | BTN1 | UP | BTN2 | | |
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
| | | | | | | | | | | | | | | | | | | | | | | | | |

5
keyboards/quark/keymaps/ajp10304/readme.md
View file

@ -7,8 +7,7 @@ the second is the output when shift is applied.
**Note:** The below tables assume a UK layout. **Note:** The below tables assume a UK layout.
#### Flashing #### Flashing
Refer to the README.md of the keyboard you want to flash.
`make quark:ajp10304:flash`
##### Main Qwerty Layer ##### 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 | | | | | BTN1 | UP | BTN2 | | |
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
| | | | | | | | | | | | | | | | | | | | | | | | | |

4
layouts/community/ortho_4x12/ajp10304/keymap.c
View file

@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Mouse /* Mouse
* ,-----------------------------------------------------------------------------------. * ,-----------------------------------------------------------------------------------.
* | ESC | | | | | | | | BTN3 | | | | * | ESC | | | | | | WH_L | WH_UP| BTN3 | WH_D | WH_R | |
* |------+------+------+------+------+-------------+------+------+------+------+------| * |------+------+------+------+------+-------------+------+------+------+------+------|
* | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | * | ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | |
* |------+------+------+------+------+------|------+------+------+------+------+------| * |------+------+------+------+------+------|------+------+------+------+------+------|
@ -121,7 +121,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------' * `-----------------------------------------------------------------------------------'
*/ */
[_MOUSE] = LAYOUT_ortho_4x12( [_MOUSE] = LAYOUT_ortho_4x12(
KC_ESC , _______, _______, _______, _______, _______, _______, _______, KC_MS_BTN3, _______, _______, _______, 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_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_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______

2
layouts/community/ortho_4x12/ajp10304/readme.md
View file

@ -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 | | | | | BTN1 | UP | BTN2 | | |
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
| | | | | | | | | | | | | | | | | | | | | | | | | |

4
users/ajp10304/readme.md
View file

@ -1,4 +1,4 @@
Copyright 2020 Alan Pocklington <ajp10304@gmail.com> @ajp10304 Copyright 2021 Alan Pocklington <ajp10304@gmail.com> @ajp10304
This program is free software: you can redistribute it and/or modify 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 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 | | | | | BTN1 | UP | BTN2 | | |
| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | | ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | |
| | | | | | | | | | | | | | | | | | | | | | | | | |