mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-22 19:39:27 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3e9551bcfa
@ -19,5 +19,3 @@
|
|||||||
// place overrides here
|
// place overrides here
|
||||||
#define USB_POLLING_INTERVAL_MS 1
|
#define USB_POLLING_INTERVAL_MS 1
|
||||||
#define FORCE_NKRO
|
#define FORCE_NKRO
|
||||||
#undef DEBOUNCE
|
|
||||||
#define DEBOUNCE 5
|
|
||||||
|
@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
* | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \ |
|
* | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \ |
|
||||||
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
* | ESC | A | S | D | F | G | | | | H | J | K | L | ; | ' |
|
* | ESC | A | S | D | F | G | Del | | | H | J | K | L | ; | ' |
|
||||||
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
|
||||||
* | Shift | Z | X | C | V | B | | N | M | , | . | / | Shift |
|
* | Shift | Z | X | C | V | B | | N | M | , | . | / | Shift |
|
||||||
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
|
||||||
* | Ctrl | Super | Alt | TT(3) | MO(2) | | MO(2) | Left | Down | Up | Right |
|
* | Ctrl | Super | Alt | MO(4) | MO(3) | | MO(3) | Left | Down | Up | Right |
|
||||||
* *-------------------------------------------------* *-------------------------------------------------*
|
* *-------------------------------------------------* *-------------------------------------------------*
|
||||||
*
|
*
|
||||||
* *-------------------* *-------------------*
|
* *-------------------* *-------------------*
|
||||||
* | | TG(1) | | | |
|
* | MO(2) | | | | |
|
||||||
* *---------+---------+---------| |---------+---------+---------*
|
* *---------+---------+---------| |---------+---------+---------*
|
||||||
* | | | | | | | |
|
* | | | | | | | |
|
||||||
* | Bckspc | Enter |---------| |---------| Enter | Space |
|
* | Bckspc | Enter |---------| |---------| Enter | Space |
|
||||||
* | | | PgDn | | PgUp | | |
|
* | | | Space | | | | |
|
||||||
* *---------+---------+---------* *---------+---------+---------*
|
* *---------+---------+---------* *---------+---------+---------*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -44,14 +44,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
|
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
|
||||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
|
||||||
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
||||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL, KC_NO, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, TT(3), MO(2), MO(2), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
|
KC_LCTL, KC_LGUI, KC_LALT, MO(4), MO(3), MO(3), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
|
||||||
|
|
||||||
KC_NO, TG(1), KC_NO, KC_NO,
|
MO(2), KC_NO, KC_NO, KC_NO,
|
||||||
KC_NO, KC_NO,
|
KC_NO, KC_NO,
|
||||||
KC_BSPC, KC_ENT, KC_PGDN, KC_PGUP, KC_ENT, KC_SPC
|
KC_BSPC, KC_ENT, KC_SPC, KC_NO, KC_ENT, KC_SPC
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Gaming Layer
|
/* Gaming Layer
|
||||||
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
|
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
|
||||||
* | | | | | | | 6 | | | | | | | | |
|
* | | | | | | | 6 | | | | | | | | |
|
||||||
@ -86,13 +88,87 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
KC_SPC, _______, _______, _______, _______, _______
|
KC_SPC, _______, _______, _______, _______, _______
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Left Hand Layer
|
||||||
|
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
|
||||||
|
* | | 6 | 7 | 8 | 9 | 0 | = | | | | | | | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
|
* | \ | Y | U | I | O | P | ] | | | | | | | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
|
* | ' | H | J | K | L | ; | | | | | | | | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
|
||||||
|
* | | N | M | , | . | / | | | | | | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
|
||||||
|
* | | | | | | | | | | | |
|
||||||
|
* *-------------------------------------------------* *-------------------------------------------------*
|
||||||
|
*
|
||||||
|
* *-------------------* *-------------------*
|
||||||
|
* | | | | | |
|
||||||
|
* *---------+---------+---------| |---------+---------+---------*
|
||||||
|
* | | | | | | | |
|
||||||
|
* | | |---------| |---------| | |
|
||||||
|
* | | | | | | | |
|
||||||
|
* *---------+---------+---------* *---------+---------+---------*
|
||||||
|
*/
|
||||||
|
|
||||||
|
LAYOUT_ergodox_pretty(
|
||||||
|
_______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
KC_BSLS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RBRC, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
KC_QUOT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
|
||||||
|
_______, _______, _______, _______,
|
||||||
|
_______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______
|
||||||
|
),
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Function Keys Layer
|
/* Function Keys Layer
|
||||||
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
|
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
|
||||||
* | | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | |
|
* | NumLock | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | |
|
||||||
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
* | | | Up | | | | | | | | | | | | |
|
* | | + | 7 | 8 | 9 | * | | | | | | | | | |
|
||||||
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
* | | Left | Down | Right | | | | | | Left | Down | Up | Right | | |
|
* | | - | 4 | 5 | 6 | / | | | | Left | Down | Up | Right | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
|
||||||
|
* | | 0 | 1 | 2 | 3 | . | | | | | | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
|
||||||
|
* | | | | | | | | | | | |
|
||||||
|
* *-------------------------------------------------* *-------------------------------------------------*
|
||||||
|
*
|
||||||
|
* *-------------------* *-------------------*
|
||||||
|
* | | | | | |
|
||||||
|
* *---------+---------+---------| |---------+---------+---------*
|
||||||
|
* | | | | | | | |
|
||||||
|
* | | Enter |---------| |---------| | |
|
||||||
|
* | | | PgUp | | PgDn | | |
|
||||||
|
* *---------+---------+---------* *---------+---------+---------*
|
||||||
|
*/
|
||||||
|
|
||||||
|
LAYOUT_ergodox_pretty(
|
||||||
|
KC_NUM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
|
||||||
|
_______, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PAST, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, KC_PMNS, KC_P4, KC_P5, KC_P6, KC_PSLS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
|
||||||
|
_______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
|
||||||
|
_______, _______, _______, _______,
|
||||||
|
_______, _______,
|
||||||
|
_______, KC_PENT, KC_PGUP, KC_PGDN, _______, _______
|
||||||
|
),
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Layers Layer
|
||||||
|
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
|
||||||
|
* | | TO(0) | TO(1) | | | | | | | | | | | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
|
* | | | | | | | | | | | | | | | |
|
||||||
|
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
||||||
|
* | | | | | | | | | | | | | | | |
|
||||||
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
|
||||||
* | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | |
|
||||||
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
|
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
|
||||||
@ -109,49 +185,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
LAYOUT_ergodox_pretty(
|
LAYOUT_ergodox_pretty(
|
||||||
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
|
_______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
|
||||||
_______, _______, _______, _______,
|
_______, _______, _______, _______,
|
||||||
_______, _______,
|
_______, _______,
|
||||||
_______, _______, _______, _______, _______, _______
|
_______, _______, _______, _______, _______, _______
|
||||||
),
|
|
||||||
|
|
||||||
/* CAD Layer
|
|
||||||
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
|
|
||||||
* | Del | 0 | 9 | 8 | 7 | 6 | = | | | | | | | | |
|
|
||||||
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
|
||||||
* | \ | P | O | I | U | Y | ] | | | | | | | | |
|
|
||||||
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
|
|
||||||
* | ' | ; | L | K | J | H | | | | | | | | | |
|
|
||||||
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
|
|
||||||
* | | / | . | , | M | N | | | | | | | |
|
|
||||||
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
|
|
||||||
* | | | | | | | | | | | |
|
|
||||||
* *-------------------------------------------------* *-------------------------------------------------*
|
|
||||||
*
|
|
||||||
* *-------------------* *-------------------*
|
|
||||||
* | | | | | |
|
|
||||||
* *---------+---------+---------| |---------+---------+---------*
|
|
||||||
* | | | | | | | |
|
|
||||||
* | Space | |---------| |---------| | |
|
|
||||||
* | | | PgUp | | | | |
|
|
||||||
* *---------+---------+---------* *---------+---------+---------*
|
|
||||||
*/
|
|
||||||
|
|
||||||
LAYOUT_ergodox_pretty(
|
|
||||||
KC_DEL, KC_0, KC_9, KC_8, KC_7, KC_6, KC_EQL, _______, _______, _______, _______, _______, _______, _______,
|
|
||||||
KC_BSLS, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_RBRC, _______, _______, _______, _______, _______, _______, _______,
|
|
||||||
KC_QUOT, KC_SCLN, KC_L, KC_K, KC_J, KC_H, _______, _______, _______, _______, _______, _______,
|
|
||||||
_______, KC_SLSH, KC_DOT, KC_COMM, KC_M, KC_N, _______, _______, _______, _______, _______, _______, _______, _______,
|
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
|
||||||
|
|
||||||
_______, _______, _______, _______,
|
|
||||||
_______, _______,
|
|
||||||
KC_SPC, _______, KC_PGUP, _______, _______, _______
|
|
||||||
)
|
)
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -1,19 +1,20 @@
|
|||||||
![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/v0kRHX5.png)
|
![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/BlH0ZdE.png)
|
||||||
|
|
||||||
# IFo Hancroft's ErgoDox EZ Layout
|
# IFo Hancroft's ErgoDox EZ Layout
|
||||||
|
|
||||||
- Layer 0: A Standard ANSI QWERTY Layer.
|
- Layer 0: A Standard ANSI QWERTY Layer. It adds some additional keys from the right half in-order to avoid having to lift your right hand of the mouse.
|
||||||
- Layer 1: A Gaming Layer. It replaces the Backspace with a Space, and the Dash with a 6, so you can play CS:GO without needing to lift your right hand from the mouse.
|
- Layer 1: A Gaming Layer. It replaces the Backspace with a Space, and the Dash with a 6, so you can play CS:GO without needing to lift your right hand of the mouse.
|
||||||
- Layer 2: A function layer. It contains the F1-F12 keys and arrows on WASD.
|
- Layer 2: A Left Hand Layer. It is basically a left hand version of the right half, so you can have access to a full-sized keyboard without needing to lift your right hand from the the mouse.
|
||||||
- Layer 3: A CAD Layer. It is basically a mirrored version of the right hand side, so you can use CAD without needing to lift your right hand from the the mouse.
|
- Layer 3: A Function Layer. It contains the F1-F12 keys, PgUp, PgDn, Numpad, and arrows on HJKL.
|
||||||
|
- Layer 4: A Layer Switching Layer. The keys in this layer turn on a specific layer while disabling the rest. Basically, you come here to switch between the QWERTY and Gaming layers.
|
||||||
|
|
||||||
|
|
||||||
This keymap also does the following:
|
This keymap also does the following:
|
||||||
|
|
||||||
- Sets the polling rate of the keyboard to 1ms
|
- Sets the polling rate of the keyboard to 1ms
|
||||||
- Sets the debounce time to 5ms
|
- Forces NKRO on
|
||||||
- NKRO (Forced on)
|
- Enables:
|
||||||
|
- Command
|
||||||
- Disables:
|
- Disables:
|
||||||
- Mouse Key
|
- Mouse Key
|
||||||
- Extra Key
|
- Extra Key
|
||||||
- Unicode
|
|
||||||
- Swap Hands
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
MOUSEKEY_ENABLE = no
|
MOUSEKEY_ENABLE = no
|
||||||
EXTRAKEY_ENABLE = no
|
EXTRAKEY_ENABLE = no
|
||||||
UNICODE_ENABLE = no
|
COMMAND_ENABLE = yes
|
||||||
SWAP_HANDS_ENABLE = no
|
|
||||||
|
Loading…
Reference in New Issue
Block a user