Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
This commit is contained in:
Stephan Bösebeck
commit
1531350125
11 changed files with 2238 additions and 1466 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -5,11 +5,14 @@
|
|||
|
||||
// Layer names
|
||||
#define BASE 0 // default layer
|
||||
#define FMU 1 // FMU layer
|
||||
#define PMQ 1 // poor man’s QWERTZ
|
||||
#define PMN 2 // poor man’s Neo
|
||||
#define FMU 3 // FMU layer
|
||||
#define NHL 4 // Neo’s software layer 4 rebuilt in Hardware
|
||||
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* Layer 0 (default)
|
||||
/* Layer 0: default
|
||||
* ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
|
||||
* │ TAB │ 1 │ 2 │ 3 │ 4 │ 5 │ ` │ │ ´ │ 6 │ 7 │ 8 │ 9 │ 0 │ BKSPC │
|
||||
* ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
|
||||
|
|
@ -33,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL,
|
||||
NEO_Y, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, KC_HOME,
|
||||
NEO_L1_L, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O,
|
||||
KC_LSFT, NEO_UE, NEO_OE, NEO_AE, NEO_P, NEO_Z, KC_TRNS,
|
||||
KC_LSFT, NEO_UE, NEO_OE, NEO_AE, NEO_P, NEO_Z, TG(PMQ),
|
||||
KC_LCTL, KC_LALT,MO(FMU),KC_LGUI,NEO_L2_L,
|
||||
KC_LEFT, KC_UP,
|
||||
KC_MINS,
|
||||
|
|
@ -42,13 +45,95 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
DE_ACUT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
|
||||
KC_END, NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_SS,
|
||||
NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_L1_R,
|
||||
KC_TRNS, NEO_B, NEO_M, KC_COMM,KC_DOT, NEO_J, KC_RSFT,
|
||||
TG(PMN), NEO_B, NEO_M, KC_COMM,KC_DOT, NEO_J, KC_RSFT,
|
||||
NEO_L2_R,KC_RGUI,MO(FMU),KC_RALT,KC_RCTL,
|
||||
KC_DOWN, KC_RGHT,
|
||||
KC_MINS,
|
||||
MEH_T(KC_NO),KC_ENT,KC_SPC
|
||||
),
|
||||
/* Layer 1 (F-keys, Mouse and Unicode)
|
||||
|
||||
/* Layer 1: poor man’s QWERTZ
|
||||
* based on kaimi’s layout
|
||||
* ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
|
||||
* │ TAB │ 1 │ 2 │ 3 │ 4 │ 5 │ ` │ │ ´ │ 6 │ 7 │ 8 │ 9 │ 0 │ BKSPC │
|
||||
* ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
|
||||
* │ C │ P │ T │ F │ K │ L │ HOM │ │ END │ B │ A │ S │ G │ V │ Y │
|
||||
* ├───────┼─────┼─────┼─────╆─────╅─────┤ E │ │ ├─────╆─────╅─────┼─────┼─────┼───────┤
|
||||
* │ Mod3 │ D │ H │ Ö │ O │ I ├─────┤ ├─────┤ U │ - │ Z │ E │ X │ Mod3 │
|
||||
* ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│ │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
|
||||
* │ LSHFT │ Ä │ Q │ R │ W │ N │ │ │ │ J │ M │ , │ . │ ẞ │ Shift │
|
||||
* └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘ └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
|
||||
* │ CTL │ ALT │ MO1 │ Win │ MO4 │ │ M04 │ Win │ MO1 │ Alt │ CTL │
|
||||
* └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
|
||||
* │ ← │ ↑ │ │ ↓ │ → │
|
||||
* ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
|
||||
* │ │ │ ─ │ │ ─ │ │ │
|
||||
* │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
|
||||
* │ │ │ HYP │ │ MEH │ │ │
|
||||
* └─────┴─────┴─────┘ └─────┴─────┴─────┘
|
||||
*/
|
||||
[PMQ] = KEYMAP(
|
||||
// left hand
|
||||
KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL,
|
||||
DE_C, DE_P, DE_T, DE_F, DE_K, DE_L, KC_HOME,
|
||||
NEO_L1_L, DE_D, DE_H, DE_OE, DE_O, DE_I,
|
||||
KC_LSFT, DE_AE, DE_Q, DE_R, DE_W, DE_N, KC_TRNS,
|
||||
KC_LCTL, KC_LALT,MO(FMU),KC_LGUI,MO(NHL),
|
||||
KC_LEFT, KC_UP,
|
||||
KC_MINS,
|
||||
KC_SPC, KC_ENT, ALL_T(KC_NO),
|
||||
// right hand
|
||||
DE_ACUT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
|
||||
KC_END, DE_B, DE_A, DE_S, DE_G, DE_V, DE_Y,
|
||||
DE_U, DE_MINS,DE_Z, DE_E, DE_X, NEO_L1_R,
|
||||
KC_TRNS, DE_J, DE_M, DE_COMM,DE_DOT, DE_SS, KC_RSFT,
|
||||
MO(NHL),KC_RGUI,MO(FMU),KC_RALT,KC_RCTL,
|
||||
KC_DOWN, KC_RGHT,
|
||||
KC_MINS,
|
||||
MEH_T(KC_NO),KC_ENT,KC_SPC
|
||||
),
|
||||
|
||||
/* Layer 2: poor man’s Neo
|
||||
* based on kaimi’s layout
|
||||
* ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
|
||||
* │ TAB │ 1 │ 2 │ 3 │ 4 │ 5 │ ` │ │ ´ │ 6 │ 7 │ 8 │ 9 │ 0 │ BKSPC │
|
||||
* ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
|
||||
* │ Y │ X │ V │ L │ C │ W │ HOM │ │ END │ K │ H │ G │ F │ Q │ ß │
|
||||
* ├───────┼─────┼─────┼─────╆─────╅─────┤ E │ │ ├─────╆─────╅─────┼─────┼─────┼───────┤
|
||||
* │ Mod3 │ U │ I │ A │ E │ O ├─────┤ ├─────┤ S │ N │ R │ T │ D │ Mod3 │
|
||||
* ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│ │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
|
||||
* │ LSHFT │ Ü │ Ö │ Ä │ P │ Z │ │ │ │ B │ M │ , │ . │ J │ Shift │
|
||||
* └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘ └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
|
||||
* │ CTL │ ALT │ MO1 │ Win │ MO4 │ │ M04 │ Win │ MO1 │ Alt │ CTL │
|
||||
* └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
|
||||
* │ ← │ ↑ │ │ ↓ │ → │
|
||||
* ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
|
||||
* │ │ │ ─ │ │ ─ │ │ │
|
||||
* │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
|
||||
* │ │ │ HYP │ │ MEH │ │ │
|
||||
* └─────┴─────┴─────┘ └─────┴─────┴─────┘
|
||||
*/
|
||||
[PMN] = KEYMAP(
|
||||
KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL,
|
||||
DE_Y, DE_X, DE_V, DE_L, DE_C, DE_W, KC_HOME,
|
||||
KC_NO, DE_U, DE_I, DE_A, DE_E, DE_O,
|
||||
KC_LSFT, DE_UE, DE_OE, DE_AE, DE_P, DE_Z, KC_TRNS,
|
||||
KC_LCTL, KC_LALT,MO(FMU),KC_LGUI,MO(NHL),
|
||||
KC_LEFT, KC_UP,
|
||||
KC_MINS,
|
||||
KC_SPC, KC_ENT, ALL_T(KC_NO),
|
||||
// right hand
|
||||
DE_ACUT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
|
||||
KC_END, DE_K, DE_H, DE_G, DE_F, DE_Q, DE_SS,
|
||||
DE_S, DE_N, DE_R, DE_T, DE_D, KC_NO,
|
||||
KC_TRNS, DE_B, DE_M, KC_COMM,KC_DOT, DE_J, KC_RSFT,
|
||||
MO(NHL),KC_RGUI,MO(FMU),KC_RALT,KC_RCTL,
|
||||
KC_DOWN, KC_RGHT,
|
||||
KC_MINS,
|
||||
MEH_T(KC_NO),KC_ENT,KC_SPC
|
||||
),
|
||||
|
||||
/* Layer 3: F-keys, Mouse and Unicode
|
||||
* ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
|
||||
* │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
|
||||
* ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
|
||||
|
|
@ -87,10 +172,55 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_BTN2,
|
||||
KC_TRNS, KC_TRNS,KC_TRNS
|
||||
),
|
||||
|
||||
/* Layer 4: Neo’s software layer 4 rebuilt in Hardware
|
||||
* based on kaimi’s layout
|
||||
* ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
|
||||
* │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
|
||||
* ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
|
||||
* │ │ PgUp│ BSpc│ ↑ │ Del │ PgDn│ │ │ │ │ 7 │ 8 │ 9 │ + │ − │
|
||||
* ├───────┼─────┼─────┼─────╆─────╅─────┤ │ │ ├─────╆─────╅─────┼─────┼─────┼───────┤
|
||||
* │ │ Home│ ← │ ↓ │ → │ End ├─────┤ ├─────┤ │ 4 │ 5 │ 6 │ , │ . │
|
||||
* ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│ │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
|
||||
* │ │ Esc │ Tab │ Ins │ Ret │ Undo│ │ │ │ │ 1 │ 2 │ 3 │ │ │
|
||||
* └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘ └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
|
||||
* │ │ │(MO1)│ │(MO4)│ │(MO4)│ │(MO1)│ │ │
|
||||
* └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
|
||||
* │ │ │ │ │ │
|
||||
* ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
|
||||
* │ │ │ │ │ │ │ │
|
||||
* │ │ ├─────┤ ├─────┤ │ │
|
||||
* │ │ │ │ │ │ │ │
|
||||
* └─────┴─────┴─────┘ └─────┴─────┴─────┘
|
||||
*/
|
||||
[NHL] = KEYMAP(
|
||||
// left hand
|
||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
|
||||
KC_NO, KC_PGUP,KC_BSPC,KC_UP, KC_DELT,KC_PGDN,KC_NO,
|
||||
KC_NO, KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_END,
|
||||
KC_NO, KC_ESC, KC_TAB, KC_INS, KC_ENT, KC_UNDO,KC_TRNS,
|
||||
KC_NO, KC_NO, KC_TRNS,KC_NO, KC_TRNS,
|
||||
KC_NO, KC_NO,
|
||||
KC_NO,
|
||||
KC_NO, KC_NO, KC_NO,
|
||||
// right hand
|
||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
|
||||
KC_NO, KC_NO, KC_7, KC_8, KC_9, DE_PLUS,DE_MINS,
|
||||
KC_NO, KC_4, KC_5, KC_6, KC_COMM,KC_DOT,
|
||||
KC_TRNS, KC_NO, KC_1, KC_2, KC_3, KC_NO, KC_NO,
|
||||
KC_TRNS,KC_NO, KC_TRNS,KC_NO, KC_NO,
|
||||
KC_NO, KC_NO,
|
||||
KC_NO,
|
||||
KC_NO, KC_NO, KC_NO
|
||||
),
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM fn_actions[] = {
|
||||
[1] = ACTION_LAYER_TAP_TOGGLE(FMU)
|
||||
[BASE] = ACTION_FUNCTION(BASE),
|
||||
[PMQ] = ACTION_FUNCTION(PMQ),
|
||||
[PMN] = ACTION_FUNCTION(PMN),
|
||||
[FMU] = ACTION_LAYER_TAP_TOGGLE(FMU),
|
||||
[NHL] = ACTION_LAYER_TAP_TOGGLE(NHL)
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -129,6 +259,13 @@ void * matrix_scan_user(void)
|
|||
switch (layer) {
|
||||
case FMU:
|
||||
ergodox_right_led_1_on();
|
||||
break;
|
||||
case PMQ:
|
||||
ergodox_right_led_2_on();
|
||||
break;
|
||||
case PMN:
|
||||
ergodox_right_led_3_on();
|
||||
break;
|
||||
default:
|
||||
ergodox_board_led_off();
|
||||
break;
|
||||
|
|
|
|||
31
keyboard/ergodox_ez/keymaps/coderkun_neo2/readme.md
Normal file
31
keyboard/ergodox_ez/keymaps/coderkun_neo2/readme.md
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
# coderkun’s Neo2 layout for the ErgoDox EZ
|
||||
|
||||
The idea of this layout is to use it for [Neo2](http://www.neo-layout.org) but also provide layers to use QWERTZ with activated Neo driver and to use (basic) Neo when no driver is available (standard QWERTZ driver is active) (e. g. on other computers, in virtual machines) and to make heavily use of thumb keys.
|
||||
|
||||
The main goal of the default layer is to provide a complete symmetric layout with each modifier equally placed for both hands (mirror, of course).
|
||||
|
||||
It also features a layer for additional keys like F-keys (F1 – F12), some mouse keys and (hopefully in the near future) some useful Unicode symbols.
|
||||
|
||||
|
||||
## Layers
|
||||
|
||||
0. Default layer for Neo2
|
||||
1. Poor man’s QWERTZ
|
||||
2. Poor man’s Neo
|
||||
3. F-keys, mouse keys und Unicode symbols
|
||||
4. Neo’s software layers 4 rebuilt in hardware
|
||||
|
||||
|
||||
## Build
|
||||
|
||||
1. Enable Unicode in Makefile
|
||||
|
||||
```
|
||||
UNICODE_ENABLE = yes
|
||||
```
|
||||
2. Build as usual
|
||||
|
||||
```
|
||||
make clean
|
||||
make KEYMAP=coderkun_neo2
|
||||
```
|
||||
Loading…
Add table
Add a link
Reference in a new issue