sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot
2022-07-02 14:07:53 +00:00
parent 61eca0c972 1cffe5b6ce
commit f083eb1a37
4 changed files with 80 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keyboards/ergodox_ez/keymaps/ifohancroft/config.h
View File

@@ -1,4 +1,4 @@
/* Copyright 2021 IFo Hancroft
/* Copyright 2022 IFo Hancroft
*
* 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
@@ -17,5 +17,9 @@
#pragma once
// place overrides here
#define USB_POLLING_INTERVAL_MS 1
#define FORCE_NKRO
#ifdef TAPPING_TOGGLE
# undef TAPPING_TOGGLE
#endif
#define TAPPING_TOGGLE 3

178
keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c
View File

@@ -1,4 +1,4 @@
/* Copyright 2021 IFo Hancroft
/* Copyright 2022 IFo Hancroft
*
* 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
@@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
* | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \ |
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
* | ESC | A | S | D | F | G | Del | | | H | J | K | L | ; | ' |
* | Esc | A | S | D | F | G | | | | H | J | K | L | ; | ' |
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
* | Shift | Z | X | C | V | B | | N | M | , | . | / | Shift |
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
* | Ctrl | Super | Alt | MO(4) | MO(3) | | MO(3) | Left | Down | Up | Right |
* | Ctrl | Super | Alt | | OSL(1) | | TT(1) | | Alt | Super | Ctrl |
* *-------------------------------------------------* *-------------------------------------------------*
*
* *-------------------* *-------------------*
* | MO(2) | | | | |
* | | | | | |
* *---------+---------+---------| |---------+---------+---------*
* | | | | | | | |
* | Bckspc | Enter |---------| |---------| Enter | Space |
* | | | Space | | | | |
* | | | SH_OS | | | | |
* *---------+---------+---------* *---------+---------+---------*
*/
@@ -44,88 +44,14 @@ 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_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_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, MO(4), MO(3), MO(3), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
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_LCTL, KC_LGUI, KC_LALT, KC_NO, OSL(1), TT(1), KC_NO, KC_RALT, KC_RGUI, KC_RCTL,
MO(2), KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO,
KC_BSPC, KC_ENT, KC_SPC, KC_NO, KC_ENT, KC_SPC
KC_BSPC, KC_ENT, SH_OS, KC_NO, KC_ENT, KC_SPC
),
/* Gaming Layer
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
* | | | | | | | 6 | | | | | | | | |
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | | | | | |
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | | | | | |
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | | | |
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | |
* *-------------------------------------------------* *-------------------------------------------------*
*
* *-------------------* *-------------------*
* | | | | | |
* *---------+---------+---------| |---------+---------+---------*
* | | | | | | | |
* | Space | |---------| |---------| | |
* | | | | | | | |
* *---------+---------+---------* *---------+---------+---------*
*/
LAYOUT_ergodox_pretty(
_______, _______, _______, _______, _______, _______, KC_6, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______,
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
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
* | NumLock | F1 | F2 | F3 | F4 | F5 | F11 | | F12 | F6 | F7 | F8 | F9 | F10 | |
@@ -134,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
* | | - | 4 | 5 | 6 | / | | | | Left | Down | Up | Right | | |
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
* | | 0 | 1 | 2 | 3 | . | | | | | | | |
* | | 0 | 1 | 2 | 3 | . | | NK_TOGG | | | | | |
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | |
* | | | | | | | | Left | Down | Up | Right |
* *-------------------------------------------------* *-------------------------------------------------*
*
* *-------------------* *-------------------*
@@ -152,40 +78,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
_______, _______, _______, _______,
_______, _______,
_______, KC_PENT, KC_PGUP, KC_PGDN, _______, _______
),
/* Layers Layer
* *---------------------------------------------------------------------* *---------------------------------------------------------------------*
* | | TO(0) | TO(1) | | | | | | | | | | | | |
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | | | | | |
* |---------+---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | | | | | |
* |---------+---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | | | |
* |---------+---------+---------+---------+---------+---------* *---------+---------+---------+---------+---------+---------|
* | | | | | | | | | | | |
* *-------------------------------------------------* *-------------------------------------------------*
*
* *-------------------* *-------------------*
* | | | | | |
* *---------+---------+---------| |---------+---------+---------*
* | | | | | | | |
* | | |---------| |---------| | |
* | | | | | | | |
* *---------+---------+---------* *---------+---------+---------*
*/
/* Empty Layer */
LAYOUT_ergodox_pretty(
_______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______,
_______, _______,
_______, _______, _______, _______, _______, _______
),
/* Empty Layer */
LAYOUT_ergodox_pretty(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -195,5 +111,41 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______,
_______, _______, _______, _______, _______, _______
)
};
/* Swap Hands
* *-------------------------------------------------*
* | Del | \ | ' | | |
* |---------+---------+---------+---------+---------+---------*
* | 6 | Y | H | N | | |
* |---------+---------+---------+---------+---------+---------|
* | 7 | U | J | M | | |
* |---------+---------+---------+---------+---------+---------|
* | 8 | I | K | , | | Space |
* |---------+---------+---------+---------+---------+---------|
* | 9 | O | L | . | | |
* |---------+---------+---------+---------+---------+---------|
* | 0 | P | ; | / | | |
* |---------+---------+---------+---------| |---------|
* | = | ] | | | | |
* *---------------------------------------* *---------*
*/
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
{{0, 13}, {1, 13}, {2, 13}, {3, 0}, {4, 0}},
{{0, 8}, {1, 8}, {2, 8}, {3, 8}, {4, 1}, {5, 1}},
{{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 2}, {5, 2}},
{{0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 3}, {5, 10}},
{{0, 11}, {1, 11}, {2, 11}, {3, 11}, {4, 4}, {5, 9}},
{{0, 12}, {1, 12}, {2, 12}, {3, 12}, {0, 0}, {5, 8}},
{{0, 7}, {1, 7}, {0, 0}, {3, 7}, {0, 0}, {5, 7}},
{{0, 7}, {1, 7}, {0, 0}, {3, 7}, {0, 0}, {5, 7}},
{{0, 8}, {1, 8}, {2, 8}, {3, 8}, {0, 0}, {5, 8}},
{{0, 9}, {1, 9}, {2, 9}, {3, 9}, {4, 9}, {5, 9}},
{{0, 10}, {1, 10}, {2, 10}, {3, 10}, {4, 10}, {5, 10}},
{{0, 11}, {1, 11}, {2, 11}, {3, 11}, {4, 11}, {5, 11}},
{{0, 12}, {1, 12}, {2, 12}, {3, 12}, {4, 12}, {5, 12}},
{{0, 13}, {1, 13}, {2, 13}, {3, 13}, {4, 13}}
};

16
keyboards/ergodox_ez/keymaps/ifohancroft/readme.md
View File

@@ -1,20 +1,18 @@
![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/BlH0ZdE.png)
![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/bSWyBCV.png)
# IFo Hancroft's ErgoDox EZ Layout
- 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 of the mouse.
- 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 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.
- Layer 0: A QWERTY Layer.
- Layer 1: A Function Layer.
- Layer 2: Empty Layer.
- Layer 3: Empty Layer.
This keymap also does the following:
- Sets the polling rate of the keyboard to 1ms
- Forces NKRO on
- Enables:
- Command
- Via
- The Swap Hands feature
- Disables:
- Mouse Key
- Extra Key

3
keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk
View File

@@ -1,3 +1,4 @@
MOUSEKEY_ENABLE = no
EXTRAKEY_ENABLE = no
COMMAND_ENABLE = yes
SWAP_HANDS_ENABLE = yes
VIA_ENABLE = yes