From c2615eb3a05a4ff11059b50bb281337ee8f5a5cb Mon Sep 17 00:00:00 2001 From: George Petri Date: Fri, 1 Oct 2021 22:23:01 +0300 Subject: [PATCH 1/8] copy default --- .../gergoplex/keymaps/georgepetri/combos.def | 11 ++ .../keymaps/georgepetri/gergoplex.def | 10 ++ .../gergoplex/keymaps/georgepetri/keymap.c | 113 ++++++++++++++++++ .../gergoplex/keymaps/georgepetri/rules.mk | 17 +++ 4 files changed, 151 insertions(+) create mode 100644 keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def create mode 100644 keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def create mode 100644 keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c create mode 100644 keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def new file mode 100644 index 000000000000..97ea961e6e16 --- /dev/null +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def @@ -0,0 +1,11 @@ +// List any combo dictionaries you want loaded to your device below! + +// QMK wide includes +#include "combos/germ-vim-helpers.def" +#include "combos/germ-mouse-keys.def" + +// User includes +#include "gergoplex.def" + +// Word completion +// #include "combos/eng-combos.def" diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def new file mode 100644 index 000000000000..6e50571b5b46 --- /dev/null +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def @@ -0,0 +1,10 @@ +// Gergoplex specfic combos + +COMB(opBacksl, KC_BSLS, KC_O, KC_P) +COMB(hjLess, KC_LT, KC_H, KC_J) +COMB(klGreat, KC_GT, KC_K, KC_L) +COMB(xcDash, KC_MINS, KC_X, KC_C) +COMB(mcUnds, KC_UNDS, KC_M, KC_COMM) +COMB(nmQuot, KC_QUOT, KC_N, KC_M) + +SUBS(pasta, "I'd just like to interject for a moment.", KC_H, KC_J, KC_K, KC_L) diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c new file mode 100644 index 000000000000..c63275120466 --- /dev/null +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -0,0 +1,113 @@ +/* Copyright 2021 Jane Bernhardt + * + * 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 . + */ + +/* Good on you for modifying your layout! if you don't have + * time to read the QMK docs, a list of keycodes can be found at + * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md + */ + +#include QMK_KEYBOARD_H +#include "g/keymap_combo.h" + +enum { + _ALPHA, // default + _SPECIAL, // special characters + _NUMBERS // numbers/function/motion +}; + +#define KC_CTL_A MT(MOD_LCTL, KC_A) // Tap for A, hold for Control +#define KC_CTL_CL MT(MOD_LCTL, KC_SCLN) // Tap for colon, hold for Control +#define KC_SFT_Z MT(MOD_RSFT, KC_Z) // Tap for Z, hold for Shift +#define KC_SFT_SL MT(MOD_RSFT, KC_SLSH) // Tap for slash, hold for Shift + +#define KC_GUI_ESC MT(MOD_LGUI, KC_ESC) // Tap for Esc, hold for GUI (Meta, Command, Win) +#define KC_ALT_ENT MT(MOD_LALT, KC_ENT) // Tap for Enter, hold for Alt (Option) +#define KC_SPE_SPC LT(_SPECIAL, KC_SPC) // Tap for Space, hold for Special layer +#define KC_NUM_SPC LT(_NUMBERS, KC_SPC) // Tap for Space, hold for Numbers layer +#define KC_SFT_TAB MT(MOD_RSFT, KC_TAB) // Tap for Tab, hold for Right Shift + + /* Combomap + * + * ,-------------------------------. ,-------------------------------. + * | | ESC | | | | | ESC | \ | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| + * | | BSPC TAB | | | < : > | | + * |-------+-----+-----+-RMB-+-LMB-| |ENTER+-----+-----+-----+-------| + * | | - ENTER | | | ' _ | | | + * `-------------------------------' `-------------------------------' + * .-----------------. .-----------------. + * | | | | | | | | + * '-----------------' '-----------------' + */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap 0: Alpha layer + * + * ,-------------------------------. ,-------------------------------. + * | Q | W | E | R | T | | Y | U | I | O | P | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| + * | CTRL A| S | D | F | G | | H | J | K | L |CTRL ; | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| + * | SHFT Z| X | C | V | B | | N | M | < | > |SHFT / | + * `-------------------------------' `-------------------------------' + * .------------------------------. .----------------------. + * | ESC META | ENT ALT | SPC SPE | | SPC NUM | SHFT | TAB | + * '------------------------------' '----------------------' + */ + [_ALPHA] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_CTL_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_CTL_CL, + KC_SFT_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SFT_SL, + KC_GUI_ESC, KC_ALT_ENT, KC_SPE_SPC, KC_NUM_SPC, KC_LSFT, KC_SFT_TAB), + + /* Keymap 1: Special characters layer + * + * ,-------------------------------. ,-------------------------------. + * | ! | @ | { | } | | | | ` | ~ | | | \ | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| + * | # | $ | ( | ) | RMB | | + | - | / | * | ' | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| + * | % | ^ | [ | ] | LMB | | & | = | , | . | - | + * `-------------------------------' `-------------------------------' + * .-------------------------. .-----------------. + * | ComboToggle | ; | = | | = | ; | DEL | + * '-------------------------' '-----------------' + */ + [_SPECIAL] = LAYOUT_split_3x5_3( + KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS, + KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT, + KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS, + CMB_TOG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL), + + /* Keymap 2: Numbers/Function/Motion layer + * + * ,-------------------------------. ,-------------------------------. + * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| + * | F1 | F2 | F3 | F4 | F5 | | LFT | DWN | UP | RGT | VOLUP | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| + * | F6 | F7 | F8 | F9 | F10 | | MLFT| MDWN| MUP | MRGT| VOLDN | + * `-------------------------------' `-------------------------------' + * .-----------------. .-----------------. + * | F11 | F12 | | | | PLY | SKP | + * '-----------------' '-----------------' + */ + [_NUMBERS] = LAYOUT_split_3x5_3( + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, + KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD, + KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT) +}; diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk b/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk new file mode 100644 index 000000000000..e882b8008db2 --- /dev/null +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk @@ -0,0 +1,17 @@ +#---------------------------------------------------------------------------- +# make gboards/gergoplex:default:flash +# Make sure you have dfu-programmer installed! +#---------------------------------------------------------------------------- + +#Debug options +VERBOSE = no +DEBUG_MATRIX_SCAN_RATE = no +DEBUG_MATRIX = no +CONSOLE_ENABLE = no + +#Combos! +VPATH += keyboards/gboards/ + +ifeq ($(strip $(DEBUG_MATRIX)), yes) + OPT_DEFS += -DDEBUG_MATRIX +endif From 430de5a33e659958eafa108ce6a44ebd2dd08a7d Mon Sep 17 00:00:00 2001 From: George Petri Date: Mon, 4 Oct 2021 19:29:09 +0300 Subject: [PATCH 2/8] minor changes --- keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c index c63275120466..e5d3b1e2d0af 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -29,7 +29,6 @@ enum { }; #define KC_CTL_A MT(MOD_LCTL, KC_A) // Tap for A, hold for Control -#define KC_CTL_CL MT(MOD_LCTL, KC_SCLN) // Tap for colon, hold for Control #define KC_SFT_Z MT(MOD_RSFT, KC_Z) // Tap for Z, hold for Shift #define KC_SFT_SL MT(MOD_RSFT, KC_SLSH) // Tap for slash, hold for Shift @@ -59,9 +58,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------------------------. ,-------------------------------. * | Q | W | E | R | T | | Y | U | I | O | P | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | CTRL A| S | D | F | G | | H | J | K | L |CTRL ; | + * | CTRL A| S | D | F | G | | H | J | K | L | ; | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | SHFT Z| X | C | V | B | | N | M | < | > |SHFT / | + * | SHFT Z| X | C | V | B | | N | M | , | . |SHFT / | * `-------------------------------' `-------------------------------' * .------------------------------. .----------------------. * | ESC META | ENT ALT | SPC SPE | | SPC NUM | SHFT | TAB | @@ -69,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ALPHA] = LAYOUT_split_3x5_3( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_CTL_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_CTL_CL, + KC_CTL_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_SFT_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SFT_SL, KC_GUI_ESC, KC_ALT_ENT, KC_SPE_SPC, KC_NUM_SPC, KC_LSFT, KC_SFT_TAB), From 4f70cbd24e54144caacf6056907ca21a59277c7a Mon Sep 17 00:00:00 2001 From: George Petri Date: Mon, 4 Oct 2021 20:43:17 +0300 Subject: [PATCH 3/8] move arrows to special layer --- .../gergoplex/keymaps/georgepetri/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c index e5d3b1e2d0af..330d91e7852a 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -75,21 +75,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 1: Special characters layer * * ,-------------------------------. ,-------------------------------. - * | ! | @ | { | } | | | | ` | ~ | | | \ | + * | ! | @ | { | } | | | | ` | - | = | / | \ | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | # | $ | ( | ) | RMB | | + | - | / | * | ' | + * | # | $ | ( | ) | RMB | | LFT | DWN | UP | RGT | ' | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | % | ^ | [ | ] | LMB | | & | = | , | . | - | + * | % | ^ | [ | ] | LMB | | & | ~ | + | * | | * `-------------------------------' `-------------------------------' * .-------------------------. .-----------------. - * | ComboToggle | ; | = | | = | ; | DEL | + * | ComboToggle | ; | = | | = | | DEL | * '-------------------------' '-----------------' */ [_SPECIAL] = LAYOUT_split_3x5_3( - KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS, - KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT, - KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS, - CMB_TOG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL), + KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_MINS, KC_EQL , KC_SLSH, KC_BSLS, + KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_QUOT, + KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_TILD, KC_PLUS, KC_ASTR, KC_TRNS, + CMB_TOG, KC_SCLN, KC_EQL, KC_EQL , KC_TRNS, KC_DEL), /* Keymap 2: Numbers/Function/Motion layer * From 16d6101bfd3468b722301b3cafe3af5da0cd500b Mon Sep 17 00:00:00 2001 From: George Petri Date: Mon, 4 Oct 2021 21:30:50 +0300 Subject: [PATCH 4/8] combos --- .../gboards/gergoplex/keymaps/georgepetri/combos.def | 2 +- .../gergoplex/keymaps/georgepetri/gergoplex.def | 12 ++++-------- .../gboards/gergoplex/keymaps/georgepetri/keymap.c | 10 +++++----- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def index 97ea961e6e16..a9205c028a09 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def @@ -1,7 +1,7 @@ // List any combo dictionaries you want loaded to your device below! // QMK wide includes -#include "combos/germ-vim-helpers.def" +//#include "combos/germ-vim-helpers.def" #include "combos/germ-mouse-keys.def" // User includes diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def index 6e50571b5b46..239d351b707f 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def @@ -1,10 +1,6 @@ // Gergoplex specfic combos -COMB(opBacksl, KC_BSLS, KC_O, KC_P) -COMB(hjLess, KC_LT, KC_H, KC_J) -COMB(klGreat, KC_GT, KC_K, KC_L) -COMB(xcDash, KC_MINS, KC_X, KC_C) -COMB(mcUnds, KC_UNDS, KC_M, KC_COMM) -COMB(nmQuot, KC_QUOT, KC_N, KC_M) - -SUBS(pasta, "I'd just like to interject for a moment.", KC_H, KC_J, KC_K, KC_L) +COMB(hjEnt, KC_ENT, KC_H, KC_J) +COMB(loDel, KC_DEL, KC_L, KC_O) +COMB(pscBspace, KC_BSPC, KC_P, KC_SCLN) +COMB(fgEsc, KC_ESC, KC_F, KC_G) diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c index 330d91e7852a..fbd8de653195 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -41,11 +41,11 @@ enum { /* Combomap * * ,-------------------------------. ,-------------------------------. - * | | ESC | | | | | ESC | \ | - * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | | BSPC TAB | | | < : > | | - * |-------+-----+-----+-RMB-+-LMB-| |ENTER+-----+-----+-----+-------| - * | | - ENTER | | | ' _ | | | + * | | | | | | | | | | | | + * |-------+-----+-----+-----+-----| |-----+-----+-----+-DEL-+-BSPC--| + * | | | | ESC | | ENT | | | | + * |-------+-----+-----+-RMB-+-LMB-| |-----+-----+-----+-----+-------| + * | | | | | | | | | | | | * `-------------------------------' `-------------------------------' * .-----------------. .-----------------. * | | | | | | | | From d511434b3037ff14165eb0e080288caaf07e3650 Mon Sep 17 00:00:00 2001 From: George Petri Date: Wed, 6 Oct 2021 23:21:14 +0300 Subject: [PATCH 5/8] tweak command keys, set permissive tap --- .../gergoplex/keymaps/georgepetri/config.h | 23 +++++++++++++++++++ .../gergoplex/keymaps/georgepetri/keymap.c | 10 ++++---- 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 keyboards/gboards/gergoplex/keymaps/georgepetri/config.h diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h new file mode 100644 index 000000000000..211e342728ba --- /dev/null +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h @@ -0,0 +1,23 @@ +/* +Copyright 2012 Jun Wako +Copyright 2013 Oleg Kostyuk + +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 . +*/ + +// Copy and worked on with love from the EZ team + +#pragma once + +#define PERMISSIVE_HOLD diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c index fbd8de653195..7bc9c1976058 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -32,11 +32,9 @@ enum { #define KC_SFT_Z MT(MOD_RSFT, KC_Z) // Tap for Z, hold for Shift #define KC_SFT_SL MT(MOD_RSFT, KC_SLSH) // Tap for slash, hold for Shift -#define KC_GUI_ESC MT(MOD_LGUI, KC_ESC) // Tap for Esc, hold for GUI (Meta, Command, Win) #define KC_ALT_ENT MT(MOD_LALT, KC_ENT) // Tap for Enter, hold for Alt (Option) #define KC_SPE_SPC LT(_SPECIAL, KC_SPC) // Tap for Space, hold for Special layer #define KC_NUM_SPC LT(_NUMBERS, KC_SPC) // Tap for Space, hold for Numbers layer -#define KC_SFT_TAB MT(MOD_RSFT, KC_TAB) // Tap for Tab, hold for Right Shift /* Combomap * @@ -62,15 +60,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| * | SHFT Z| X | C | V | B | | N | M | , | . |SHFT / | * `-------------------------------' `-------------------------------' - * .------------------------------. .----------------------. - * | ESC META | ENT ALT | SPC SPE | | SPC NUM | SHFT | TAB | - * '------------------------------' '----------------------' + * .--------------------------. .---------------------. + * | META | ENT ALT | SPC SPE | | SPC NUM | TAB | | + * '--------------------------' '---------------------' */ [_ALPHA] = LAYOUT_split_3x5_3( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_CTL_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_SFT_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SFT_SL, - KC_GUI_ESC, KC_ALT_ENT, KC_SPE_SPC, KC_NUM_SPC, KC_LSFT, KC_SFT_TAB), + KC_LGUI, KC_ALT_ENT, KC_SPE_SPC, KC_NUM_SPC, KC_TAB, KC_TRNS), /* Keymap 1: Special characters layer * From 62ef25d45c682282a43d2c01c661d679407bbc4f Mon Sep 17 00:00:00 2001 From: George Petri Date: Wed, 6 Oct 2021 23:37:09 +0300 Subject: [PATCH 6/8] replace permissive tap with hold for other keys --- keyboards/gboards/gergoplex/keymaps/georgepetri/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h index 211e342728ba..4e4d09d6d6fe 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h @@ -20,4 +20,4 @@ along with this program. If not, see . #pragma once -#define PERMISSIVE_HOLD +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY From 6ded1db71d4090b1e0c7f2aa6915bbc443927468 Mon Sep 17 00:00:00 2001 From: George Petri Date: Thu, 7 Oct 2021 21:56:02 +0300 Subject: [PATCH 7/8] tweaks --- .../gergoplex/keymaps/georgepetri/config.h | 3 ++ .../gergoplex/keymaps/georgepetri/keymap.c | 28 +++++++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h index 4e4d09d6d6fe..a60188ef9008 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h @@ -21,3 +21,6 @@ along with this program. If not, see . #pragma once #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY + +#undef DEBOUNCE +#define DEBOUNCE 25 diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c index 7bc9c1976058..c41b2437a070 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -60,15 +60,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| * | SHFT Z| X | C | V | B | | N | M | , | . |SHFT / | * `-------------------------------' `-------------------------------' - * .--------------------------. .---------------------. - * | META | ENT ALT | SPC SPE | | SPC NUM | TAB | | - * '--------------------------' '---------------------' + * .--------------------------. .----------------------. + * | META | ENT ALT | SPC SPE | | SPC NUM | TAB | SHFT | + * '--------------------------' '----------------------' */ [_ALPHA] = LAYOUT_split_3x5_3( KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_CTL_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_SFT_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SFT_SL, - KC_LGUI, KC_ALT_ENT, KC_SPE_SPC, KC_NUM_SPC, KC_TAB, KC_TRNS), + KC_LGUI, KC_ALT_ENT, KC_SPE_SPC, KC_NUM_SPC, KC_TAB, KC_RSFT), /* Keymap 1: Special characters layer * @@ -79,32 +79,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| * | % | ^ | [ | ] | LMB | | & | ~ | + | * | | * `-------------------------------' `-------------------------------' - * .-------------------------. .-----------------. - * | ComboToggle | ; | = | | = | | DEL | - * '-------------------------' '-----------------' + * .-------------------. .-----------------. + * | | | | | | | | + * '-------------------' '-----------------' */ [_SPECIAL] = LAYOUT_split_3x5_3( KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_MINS, KC_EQL , KC_SLSH, KC_BSLS, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_QUOT, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_TILD, KC_PLUS, KC_ASTR, KC_TRNS, - CMB_TOG, KC_SCLN, KC_EQL, KC_EQL , KC_TRNS, KC_DEL), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), /* Keymap 2: Numbers/Function/Motion layer * * ,-------------------------------. ,-------------------------------. * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | F1 | F2 | F3 | F4 | F5 | | LFT | DWN | UP | RGT | VOLUP | + * | F1 | F2 | F3 | F4 | F5 | | | | | | | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | F6 | F7 | F8 | F9 | F10 | | MLFT| MDWN| MUP | MRGT| VOLDN | + * | F6 | F7 | F8 | F9 | F10 | | MLFT| MDWN| MUP | MRGT| | * `-------------------------------' `-------------------------------' * .-----------------. .-----------------. - * | F11 | F12 | | | | PLY | SKP | + * | F11 | F12 | | | | | | * '-----------------' '-----------------' */ [_NUMBERS] = LAYOUT_split_3x5_3( KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, - KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD, - KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT) + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, + KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; From f1c07cbef85a59d51b0cbb15b4d2e73bea836528 Mon Sep 17 00:00:00 2001 From: George Petri Date: Sat, 9 Oct 2021 18:24:54 +0300 Subject: [PATCH 8/8] add readme --- keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c | 8 ++++---- keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c index c41b2437a070..de3bcf67ad17 100644 --- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c @@ -75,9 +75,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------------------------. ,-------------------------------. * | ! | @ | { | } | | | | ` | - | = | / | \ | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | # | $ | ( | ) | RMB | | LFT | DWN | UP | RGT | ' | + * | # | $ | ( | ) | | | LFT | DWN | UP | RGT | ' | * |-------+-----+-----+-----+-----| |-----+-----+-----+-----+-------| - * | % | ^ | [ | ] | LMB | | & | ~ | + | * | | + * | % | ^ | [ | ] | | | & | ~ | + | * | | * `-------------------------------' `-------------------------------' * .-------------------. .-----------------. * | | | | | | | | @@ -85,8 +85,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SPECIAL] = LAYOUT_split_3x5_3( KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_MINS, KC_EQL , KC_SLSH, KC_BSLS, - KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_QUOT, - KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_TILD, KC_PLUS, KC_ASTR, KC_TRNS, + KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_QUOT, + KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TRNS, KC_AMPR, KC_TILD, KC_PLUS, KC_ASTR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), /* Keymap 2: Numbers/Function/Motion layer diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md b/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md new file mode 100644 index 000000000000..7c8a6f202348 --- /dev/null +++ b/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md @@ -0,0 +1,6 @@ +# George Petri's Gergoplex layout +Vim and programming focused layout. +``` +qmk compile -kb gboards/gergoplex -km georgepetri +qmk flash -kb gboards/gergoplex -km georgepetri +```