Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
Copyright 2019 @foostan
|
||||
Copyright 2020 Drashna Jaelre <@drashna>
|
||||
Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com>
|
||||
Copyright 2021 Rocco Meli <@RMeli>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
@@ -69,64 +69,61 @@ enum layer_names {
|
||||
#define _CMK 1
|
||||
#define _CFG 4
|
||||
|
||||
#define ______THUMB_LEFT_x3______ KC_LGUI, MO(_DWN), KC_SPC
|
||||
#define ______THUMB_RIGHT_x3_____ KC_ENT, MO(_UP), KC_RCTL
|
||||
|
||||
// LAYOUT
|
||||
//
|
||||
// |-----------------------------| |-----------------------------|
|
||||
// | | | | | | | | | | | | | |
|
||||
// |----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
// | | | | | | | | | | | | | |
|
||||
// |----+----+----+----+----+----| |----+----+----+----+----+----|
|
||||
// | | | | | | | | | | | | | |
|
||||
// |----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
|
||||
// | | | | | | | |
|
||||
// |--------------| |--------------|
|
||||
|
||||
// Define wrapper for standard CRKB layout
|
||||
#define LAYOUT_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__)
|
||||
|
||||
// clang-format off
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_QWERTY] = LAYOUT_split_3x6_3(
|
||||
//|-----------------------------------------------------| |-----------------------------------------------------|
|
||||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
TD_ED, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
TD_LSPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TD_RSPC,
|
||||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
|
||||
KC_LGUI,MO(_DWN), KC_SPC, KC_ENT,MO(_UP), KC_RCTL
|
||||
//|--------------------------| |--------------------------|
|
||||
|
||||
[_QWERTY] = LAYOUT_wrapper(
|
||||
// clang-format off
|
||||
___________________QWERTY_L1_x6_____________________, ___________________QWERTY_R1_x6_____________________,
|
||||
___________________QWERTY_L2_x6_____________________, ___________________QWERTY_R2_x6_____________________,
|
||||
___________________QWERTY_L3_x6_____________________, ___________________QWERTY_R3_x6_____________________,
|
||||
______THUMB_LEFT_x3______, ______THUMB_RIGHT_x3_____
|
||||
),
|
||||
|
||||
[_COLEMAK_DH] = LAYOUT_split_3x6_3(
|
||||
//|-----------------------------------------------------| |-----------------------------------------------------|
|
||||
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_SCLN, KC_P, KC_BSPC,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
TD_ED, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
TD_LSPC, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, TD_RSPC,
|
||||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
|
||||
KC_LGUI,MO(_DWN), KC_SPC, KC_ENT,MO(_UP), KC_RCTL
|
||||
//|--------------------------| |--------------------------|
|
||||
[_COLEMAK_DH] = LAYOUT_wrapper(
|
||||
________________COLEMAK_MOD_DH_L1_x6________________, ________________COLEMAK_MOD_DH_R1_x6________________,
|
||||
________________COLEMAK_MOD_DH_L2_x6________________, ________________COLEMAK_MOD_DH_R2_x6________________,
|
||||
________________COLEMAK_MOD_DH_L3_x6________________, ________________COLEMAK_MOD_DH_R3_x6________________,
|
||||
______THUMB_LEFT_x3______, ______THUMB_RIGHT_x3_____
|
||||
),
|
||||
|
||||
[_DWN] = LAYOUT_split_3x6_3(
|
||||
//|-----------------------------------------------------| |-----------------------------------------------------|
|
||||
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
_______, A_GRV, E_GRV, I_GRV, O_GRV, U_GRV, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, XXXXXXX,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
_______, A_UML, E_ACT, I_CIR, O_UML, U_UML, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_PGDN, _______,
|
||||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
|
||||
KC_LGUI, _______, _______, _______,MO(_CFG), _______
|
||||
//|--------------------------| |--------------------------|
|
||||
[_DWN] = LAYOUT_wrapper(
|
||||
_______, ______________NUMBER_LEFT_x5_______________, ______________NUMBER_RIGHT_x5______________, _______,
|
||||
_______, ______________UNICODE_L2_x5________________, ________________NAV_R2_x5__________________, XXXXXXX,
|
||||
_______, ______________UNICODE_L3_x5________________, ________________NAV_R3_x5__________________, _______,
|
||||
KC_LGUI, _______, _______, _______,MO(_CFG), _______
|
||||
),
|
||||
|
||||
[_UP] = LAYOUT_split_3x6_3(
|
||||
//|-----------------------------------------------------| |-----------------------------------------------------|
|
||||
_______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
_______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
|
||||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
|
||||
_______,MO(_CFG), _______, _______, _______, _______
|
||||
//|--------------------------| |--------------------------|
|
||||
[_UP] = LAYOUT_wrapper(
|
||||
___________________SYMBOL_LEFT_x6___________________, ___________________SYMBOL_RIGHT_x6__________________,
|
||||
_______, ____________NAV_VIM_x4____________, XXXXXXX, ____________________SYMBOL_R2_x6____________________,
|
||||
_______, _________________NONE_5x___________________, ____________________SYMBOL_R3_x6____________________,
|
||||
_______,MO(_CFG), _______, _______, _______, _______
|
||||
),
|
||||
|
||||
[_CONFIG] = LAYOUT_split_3x6_3(
|
||||
//|-----------------------------------------------------| |-----------------------------------------------------|
|
||||
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_NEXT, AS_UP, NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, XXXXXXX, AS_TOGG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, UC_PREV, AS_DOWN, NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
|
||||
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
|
||||
_______, _______, _______, _______, _______, _______
|
||||
//|--------------------------| |--------------------------|
|
||||
[_CONFIG] = LAYOUT_wrapper(
|
||||
QK_BOOT, _________________NONE_5x___________________, _______________CONFIG_R1_x5________________,DF(_QWY),
|
||||
RGB_TOG, ________________RGB_L2_x5__________________, _______________CONFIG_R2_x5________________, XXXXXXX,
|
||||
XXXXXXX, ________________RGB_L3_x5__________________, _______________CONFIG_R3_x5________________,DF(_CMK),
|
||||
_______, _______, _______, _______, _______, _______
|
||||
)
|
||||
};
|
||||
// clang-format on
|
||||
|
Reference in New Issue
Block a user