Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b0104e99a5
42
keyboards/bastardkb/scylla/keymaps/cykedev/config.h
Normal file
42
keyboards/bastardkb/scylla/keymaps/cykedev/config.h
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
// Copyright 2021 Christian Eiden, cykedev
|
||||||
|
//
|
||||||
|
// 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
|
||||||
|
// the Free Software Foundation, either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
// Select hand configuration
|
||||||
|
// #define MASTER_LEFT
|
||||||
|
// #define MASTER_RIGHT
|
||||||
|
#define EE_HANDS
|
||||||
|
|
||||||
|
#define BOOTMAGIC_LITE_ROW 0
|
||||||
|
#define BOOTMAGIC_LITE_COLUMN 0
|
||||||
|
|
||||||
|
#define BOOTMAGIC_LITE_ROW_RIGHT 0
|
||||||
|
#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
|
||||||
|
|
||||||
|
#define TAPPING_TERM 200
|
||||||
|
|
||||||
|
// Prevent normal rollover on alphas from accidentally triggering mods.
|
||||||
|
// #define IGNORE_MOD_TAP_INTERRUPT
|
||||||
|
|
||||||
|
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
|
||||||
|
// #define TAPPING_FORCE_HOLD
|
||||||
|
|
||||||
|
// Apply the modifier on keys that are tapped during a short hold of a modtap
|
||||||
|
// #define PERMISSIVE_HOLD
|
||||||
|
|
||||||
|
#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
|
||||||
|
|
||||||
|
#define FORCE_NKRO
|
198
keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
Normal file
198
keyboards/bastardkb/scylla/keymaps/cykedev/keymap.c
Normal file
@ -0,0 +1,198 @@
|
|||||||
|
// Copyright 2021 Christian Eiden, cykedev
|
||||||
|
//
|
||||||
|
// 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
|
||||||
|
// the Free Software Foundation, either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
|
#define CM_SPAL LGUI_T(KC_SPC)
|
||||||
|
#define CM_SPAR RGUI_T(KC_SPC)
|
||||||
|
|
||||||
|
#define SH_ENL LSFT_T(KC_ENT)
|
||||||
|
#define SH_ENR RSFT_T(KC_ENT)
|
||||||
|
|
||||||
|
#define RAISE MO(_RAISE)
|
||||||
|
#define LOWER MO(_LOWER)
|
||||||
|
|
||||||
|
#define QWERT DF(_QWERTY)
|
||||||
|
#define COLEM DF(_COLEMAK_DH)
|
||||||
|
|
||||||
|
enum layer_names {
|
||||||
|
_COLEMAK_DH,
|
||||||
|
_QWERTY,
|
||||||
|
_RAISE,
|
||||||
|
_LOWER,
|
||||||
|
_ADJUST
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
[_COLEMAK_DH] = LAYOUT_split_4x6_5(
|
||||||
|
/* COLEMAK_DH
|
||||||
|
* .-----------------------------------------. .-----------------------------------------.
|
||||||
|
* | Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bsp |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Tab | Q | W | F | P | B | | J | L | U | Y | ; | \ |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Del | A | R | S | T | G | | M | N | E | I | O | ' |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Shft | Z | X | C | D | V | | K | H | , | . | / | Shft |
|
||||||
|
* '-----------------------------------------/ \-----------------------------------------'
|
||||||
|
* / RAISE /---------------. .---------------\ LOWER \
|
||||||
|
* / / Cmd / Shift / \ Shift \ Cmd \ \
|
||||||
|
* '-------/ Space / Enter / \ Enter \ Space \-------'
|
||||||
|
* /---------------/ \---------------\
|
||||||
|
* / Alt / Ctrl / \ Ctrl \ Alt \
|
||||||
|
* / / / \ \ \
|
||||||
|
* '---------------' '---------------'
|
||||||
|
*/
|
||||||
|
KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC,
|
||||||
|
KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_B , KC_J , KC_L , KC_U , KC_Y , KC_SCLN, KC_BSLS,
|
||||||
|
KC_DEL , KC_A , KC_R , KC_S , KC_T , KC_G , KC_M , KC_N , KC_E , KC_I , KC_O , KC_QUOT,
|
||||||
|
KC_LSFT, KC_Z , KC_X , KC_C , KC_D , KC_V , KC_K , KC_H , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
|
||||||
|
RAISE , CM_SPAL, SH_ENL , SH_ENR , CM_SPAR, LOWER ,
|
||||||
|
KC_LALT, KC_LCTL, KC_RCTL, KC_RALT
|
||||||
|
),
|
||||||
|
[_QWERTY] = LAYOUT_split_4x6_5(
|
||||||
|
/* QWERTY
|
||||||
|
* .-----------------------------------------. .-----------------------------------------.
|
||||||
|
* | Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bsp |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Del | A | S | D | F | G | | H | J | K | L | ; | ' |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Shft | Z | X | C | V | B | | N | M | , | . | / | Shft |
|
||||||
|
* '-----------------------------------------/ \-----------------------------------------'
|
||||||
|
* / RAISE /---------------. .---------------\ LOWER \
|
||||||
|
* / / Cmd / Shift / \ Shift \ Cmd \ \
|
||||||
|
* '-------/ Space / Enter / \ Enter \ Space \-------'
|
||||||
|
* /---------------/ \---------------\
|
||||||
|
* / Alt / Ctrl / \ Ctrl \ Alt \
|
||||||
|
* / / / \ \ \
|
||||||
|
* '---------------' '---------------'
|
||||||
|
*/
|
||||||
|
KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC,
|
||||||
|
KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS,
|
||||||
|
KC_DEL , 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_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_LSFT,
|
||||||
|
RAISE , CM_SPAL, SH_ENL , SH_ENR , CM_SPAR, LOWER ,
|
||||||
|
KC_LALT, KC_LCTL, KC_RCTL, KC_RALT
|
||||||
|
),
|
||||||
|
[_RAISE] = LAYOUT_split_4x6_5(
|
||||||
|
/* RAISE
|
||||||
|
* .-----------------------------------------. .-----------------------------------------.
|
||||||
|
* | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | [ | ] | | | $ | / | * | # | ~ | F12 |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Ins | ! | @ | ( | ) | | | % | - | + | = | ? | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | { | } | | | ^ | & | | | | | |
|
||||||
|
* '-----------------------------------------/ \-----------------------------------------'
|
||||||
|
* / /---------------. .---------------\ \
|
||||||
|
* / / / / \ \ \ \
|
||||||
|
* '-------/ / / \ \ \-------'
|
||||||
|
* /---------------/ \---------------\
|
||||||
|
* / / / \ \ \
|
||||||
|
* / / / \ \ \
|
||||||
|
* '---------------' '---------------'
|
||||||
|
*/
|
||||||
|
XXXXXXX, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 ,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX, KC_DLR , KC_SLSH, KC_ASTR, KC_HASH, KC_TILD, KC_F12 ,
|
||||||
|
KC_INS , KC_EXLM, KC_AT , KC_LPRN, KC_RPRN, XXXXXXX, KC_PERC, KC_MINS, KC_PPLS, KC_PEQL, KC_QUES, XXXXXXX,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, KC_CIRC, KC_AMPR, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||||
|
_______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______
|
||||||
|
),
|
||||||
|
[_LOWER] = LAYOUT_split_4x6_5(
|
||||||
|
/* LOWER
|
||||||
|
* .-----------------------------------------. .-----------------------------------------.
|
||||||
|
* | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | [ | ] | + | | | | up | | | F12 |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | Ins | ! | @ | ( | ) | - | | | left | down | rght | ? | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | { | } | = | | | | | | | |
|
||||||
|
* '-----------------------------------------/ \-----------------------------------------'
|
||||||
|
* / /---------------. .---------------\ \
|
||||||
|
* / / / / \ \ \ \
|
||||||
|
* '-------/ / / \ \ \-------'
|
||||||
|
* /---------------/ \---------------\
|
||||||
|
* / / / \ \ \
|
||||||
|
* / / / \ \ \
|
||||||
|
* '---------------' '---------------'
|
||||||
|
*/
|
||||||
|
XXXXXXX, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 ,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_PPLS, XXXXXXX, XXXXXXX, KC_UP , XXXXXXX, XXXXXXX, KC_F12 ,
|
||||||
|
KC_INS , KC_EXLM, KC_AT , KC_LPRN, KC_RPRN, KC_MINS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUES, XXXXXXX,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_PEQL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||||
|
_______, _______, _______, _______, _______, _______,
|
||||||
|
_______, _______, _______, _______
|
||||||
|
),
|
||||||
|
[_ADJUST] = LAYOUT_split_4x6_5(
|
||||||
|
/* ADJUST
|
||||||
|
* .-----------------------------------------. .-----------------------------------------.
|
||||||
|
* | | | | | | QWERT| |COLEM | | | | | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | | | V+ | | B + | | | | | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | | | V- | | B - | << | play | >> | | |
|
||||||
|
* |------+------+------+------+------+------| |------+------+------+------+------+------|
|
||||||
|
* | | | | | | Mute | | | | | | | |
|
||||||
|
* '-----------------------------------------/ \-----------------------------------------'
|
||||||
|
* / /---------------. .---------------\ \
|
||||||
|
* / / / / \ \ \ \
|
||||||
|
* '-------/ / / \ \ \-------'
|
||||||
|
* /---------------/ \---------------\
|
||||||
|
* / / / \ \ \
|
||||||
|
* / / / \ \ \
|
||||||
|
* '---------------' '---------------'
|
||||||
|
*/
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERT , COLEM , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_BRID, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||||
|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
switch (keycode) {
|
||||||
|
case CM_SPAR:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||||
|
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Flexible macOS-friendly Grave Escape
|
||||||
|
// https://docs.qmk.fm/#/feature_key_overrides?id=flexible-macos-friendly-grave-escape
|
||||||
|
|
||||||
|
const key_override_t tilde_esc_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, S(KC_GRAVE));
|
||||||
|
const key_override_t grave_esc_override = ko_make_basic(MOD_MASK_GUI, KC_ESC, KC_GRAVE);
|
||||||
|
const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPACE, KC_DELETE);
|
||||||
|
|
||||||
|
|
||||||
|
const key_override_t **key_overrides = (const key_override_t *[]){
|
||||||
|
&tilde_esc_override,
|
||||||
|
&grave_esc_override,
|
||||||
|
&delete_key_override,
|
||||||
|
NULL
|
||||||
|
};
|
4
keyboards/bastardkb/scylla/keymaps/cykedev/rules.mk
Normal file
4
keyboards/bastardkb/scylla/keymaps/cykedev/rules.mk
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
MOUSEKEY_ENABLE = no # Mouse keys
|
||||||
|
NKRO_ENABLE = yes # USB Nkey Rollover
|
||||||
|
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix
|
||||||
|
KEY_OVERRIDE_ENABLE = yes # Enable Key Overrides, see https://docs.qmk.fm/#/feature_key_overrides
|
Loading…
Reference in New Issue
Block a user