From 61a7aebd1630b35e177dcd4e49694756593428a1 Mon Sep 17 00:00:00 2001 From: Jeremy Bernhardt Date: Sun, 14 Apr 2019 12:01:52 -0600 Subject: [Keyboard] Georgi FW updates (#5609) * Working on chording * Working on chording * Got layouts in order * Initial Georgi support * forgot to add keymaps * Updated readme * Update keyboards/georgi/keymaps/template/readme.md Co-Authored-By: germ * Update keyboards/georgi/georgi.h Co-Authored-By: germ * Update keyboards/georgi/keymaps/default/keymap.c Co-Authored-By: germ * Update keyboards/georgi/keymaps/default/keymap.c Co-Authored-By: germ * Update keyboards/georgi/rules.mk Co-Authored-By: germ * Update keyboards/georgi/rules.mk Co-Authored-By: germ * Update keyboards/georgi/matrix.c Co-Authored-By: germ * Update keyboards/georgi/georgi.c Co-Authored-By: germ * Update keyboards/georgi/georgi.c Co-Authored-By: germ * Update keyboards/georgi/rules.mk Co-Authored-By: germ * Update keyboards/georgi/keymaps/default/keymap.c Co-Authored-By: germ * Update keyboards/georgi/keymaps/template/keymap.c Co-Authored-By: germ * Update keyboards/georgi/matrix.c Co-Authored-By: germ * Disabled features, updated info * Update keyboards/georgi/config.h Co-Authored-By: germ * Update keyboards/georgi/config.h Co-Authored-By: germ * Fixed info.json * Split the number button and fixed gaming mode. * started work on history feature * Working history/multikeyfuckery * type * inital code reduction refactor * Got multikey patched up, optimizing for size * Forgot to remove stuff * fixed key repeat * Key repeat added. * Symshift locking * Midchord Sym shenanigans. * Added only QWERTY mode * Split out header * Added stickybits, minimal layour * Fixing user layout * Whitespace fixing * Fixing Version name --- keyboards/georgi/keymaps/default/keymap.c | 391 ++++++++++++++-------------- keyboards/georgi/keymaps/default/rules.mk | 32 ++- keyboards/georgi/keymaps/minimal/keymap.c | 223 ++++++++++++++++ keyboards/georgi/keymaps/minimal/readme.md | 11 + keyboards/georgi/keymaps/minimal/rules.mk | 41 +++ keyboards/georgi/keymaps/norman/keymap.c | 267 +++++++++++++++++++ keyboards/georgi/keymaps/norman/readme.md | 11 + keyboards/georgi/keymaps/norman/rules.mk | 35 +++ keyboards/georgi/keymaps/template/keymap.c | 216 --------------- keyboards/georgi/keymaps/template/readme.md | 6 - keyboards/georgi/keymaps/template/rules.mk | 27 -- 11 files changed, 811 insertions(+), 449 deletions(-) create mode 100644 keyboards/georgi/keymaps/minimal/keymap.c create mode 100644 keyboards/georgi/keymaps/minimal/readme.md create mode 100644 keyboards/georgi/keymaps/minimal/rules.mk create mode 100644 keyboards/georgi/keymaps/norman/keymap.c create mode 100644 keyboards/georgi/keymaps/norman/readme.md create mode 100644 keyboards/georgi/keymaps/norman/rules.mk delete mode 100644 keyboards/georgi/keymaps/template/keymap.c delete mode 100644 keyboards/georgi/keymaps/template/readme.md delete mode 100644 keyboards/georgi/keymaps/template/rules.mk (limited to 'keyboards/georgi/keymaps') diff --git a/keyboards/georgi/keymaps/default/keymap.c b/keyboards/georgi/keymaps/default/keymap.c index c3d69eb8a..3a0edb892 100644 --- a/keyboards/georgi/keymaps/default/keymap.c +++ b/keyboards/georgi/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* +/* * Good on you for modifying your layout, this is the most nonQMK layout you will come across * There are three modes, Steno (the default), QWERTY (Toggleable) and a Momentary symbol layer * @@ -15,215 +15,224 @@ #include "keymap_steno.h" #define IGNORE_MOD_TAP_INTERRUPT -int getKeymapCount(void); - // Proper Layers #define FUNCT (LSD | LK | LP | LH) #define MEDIA (LSD | LK | LW | LR) #define MOVE (ST1 | ST2) +// QMK Layers +#define STENO_LAYER 0 +#define GAMING 1 +#define GAMING_2 2 + /* Keyboard Layout * ,---------------------------------. ,------------------------------. * | FN | LSU | LFT | LP | LH | ST1 | | ST3 | RF | RP | RL | RT | RD | * |-----+-----+-----+----+----|-----| |-----|----+----+----+----+----| - * | PWR | LSD | LK | LW | LR | ST2 | | ST4 | RR | RG | RB | RS | RZ | + * | PWR | LSD | LK | LW | LR | ST2 | | ST4 | RR | BB | RG | RS | RZ | * `---------------------------------' `------------------------------' * ,---------------, .---------------. - * | NUM | LA | LO | | RE | RU | NUM | + * | LNO | LA | LO | | RE | RU | RNO | * `---------------' `---------------' */ -// YOU MUST ORDER THIS! -// P Will return from processing on the first match it finds. Therefore -// PJ Will run the requested action, remove the matched chord and continue -// -// First any chords that would conflict with PJs need to be checked, then PJs, lastly Ps. -// For all chords should be ordered by length in their section! +// Note: You can only use basic keycodes here! +// P() is just a wrapper to make your life easier. // // http://docs.gboards.ca -bool processQwerty(void) { - // Place P's that would be trashed by PJ's here - P( RT | RS | RD | RZ | NUM, SEND_STRING(VERSION); SEND_STRING(__DATE__)); - P( NUM | LA | LO | RE | RU, SEND(KC_MPLY)); - P( ST1 | ST2 | ST3 | ST4, SEND(KC_BSPC)); - - // Thumb Chords - P( LA | LO | RE | RU, SEND(KC_CAPS)); - P( LA | RU, SEND(KC_ESC)); - PJ( LO | RE, SEND(KC_LCTL)); - PJ( NUM | LA | RU, SEND(KC_LCTL); SEND(KC_LSFT)); - PJ( NUM | LA | RE, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT)); - - // Mods - PJ( RT | RD | RS | RZ, SEND(KC_LGUI)); - PJ( RT | RD, SEND(KC_LCTL)); - PJ( RS | RZ, SEND(KC_LALT)); - PJ( LA | NUM, SEND(KC_LCTL)); - PJ( LA | LO, SEND(KC_LALT)); - PJ( LO, SEND(KC_LSFT)); - - // Function Layer - P( FUNCT | RF | RR, SEND(KC_F5)); - P( FUNCT | RP | RB, SEND(KC_F6)); - P( FUNCT | RL | RG, SEND(KC_F7)); - P( FUNCT | RT | RS, SEND(KC_F8)); - P( FUNCT | RF, SEND(KC_F1)); - P( FUNCT | RP, SEND(KC_F2)); - P( FUNCT | RL, SEND(KC_F3)); - P( FUNCT | RT, SEND(KC_F4)); - P( FUNCT | RR, SEND(KC_F9)); - P( FUNCT | RG, SEND(KC_F10)); - P( FUNCT | RB, SEND(KC_F11)); - P( FUNCT | RS, SEND(KC_F12)); - - // Movement Layer - P( MOVE | RF, SEND(KC_LEFT)); - P( MOVE | RP, SEND(KC_DOWN)); - P( MOVE | RL, SEND(KC_UP)); - P( MOVE | RT, SEND(KC_RIGHT)); - P( MOVE | ST3, SEND(KC_PGUP)); - P( MOVE | ST4, SEND(KC_PGDN)); - - // Media Layer - P( MEDIA | RF, SEND(KC_MPRV)); - P( MEDIA | RP, SEND(KC_MPLY)); - P( MEDIA | RL, SEND(KC_MPLY)); - P( MEDIA | RT, SEND(KC_MNXT)); - P( MEDIA | RD, SEND(KC_VOLU)); - P( MEDIA | RZ, SEND(KC_VOLD)); - P( MEDIA | RS, SEND(KC_MUTE)); - - // Mouse Keys - P( LP | LH, clickMouse(KC_MS_BTN1)); - P( LW | LR, clickMouse(KC_MS_BTN2)); - - // Number Row - P( NUM | LSU, SEND(KC_1)); - P( NUM | LFT, SEND(KC_2)); - P( NUM | LP, SEND(KC_3)); - P( NUM | LH, SEND(KC_4)); - P( NUM | ST1, SEND(KC_5)); - P( NUM | ST3, SEND(KC_6)); - P( NUM | RF, SEND(KC_7)); - P( NUM | RP, SEND(KC_8)); - P( NUM | RL, SEND(KC_9)); - P( NUM | RT, SEND(KC_0)); - P( NUM | LA, SEND(KC_5)); - P( NUM | RT, SEND(KC_0)); - - // Specials - P( LA | NUM, SEND(KC_ESC)); - P( RU | NUM, SEND(KC_TAB)); - P( RE | RU, SEND(KC_BSPC)); - P( RD | RZ, SEND(KC_ENT)); - P( RE, SEND(KC_ENT)); - P( RD, SEND(KC_BSPC)); - P( NUM, SEND(KC_BSPC)); - P( LA, SEND(KC_SPC)); - P( RU, SEND(KC_SPC)); - P( RZ, SEND(KC_ESC)); - - // Letters - P( LSU | LSD, SEND(KC_A)); - P( LFT | LK, SEND(KC_S)); - P( LP | LW, SEND(KC_D)); - P( LH | LR, SEND(KC_F)); - P( ST1 | ST2, SEND(KC_G)); - P( ST3 | ST4, SEND(KC_H)); - P( RF | RR, SEND(KC_J)); - P( RT | RS, SEND(KC_SCLN)) - P( RG | RL, SEND(KC_L)); - P( RP | RB, SEND(KC_K)); - P( LSU, SEND(KC_Q)); - P( LSD, SEND(KC_Z)); - P( LFT, SEND(KC_W)); - P( LK, SEND(KC_X)); - P( LP, SEND(KC_E)); - P( LW, SEND(KC_C)); - P( LH, SEND(KC_R)); - P( LR, SEND(KC_V)); - P( ST1, SEND(KC_T)); - P( ST2, SEND(KC_B)); - P( ST3, SEND(KC_Y)); - P( ST4, SEND(KC_N)); - P( RF, SEND(KC_U)); - P( RR, SEND(KC_M)); - P( RP, SEND(KC_I)); - P( RB, SEND(KC_COMM)); - P( RL, SEND(KC_O)); - P( RG, SEND(KC_DOT)); - P( RT, SEND(KC_P)); - P( RS, SEND(KC_SLSH)); - - // Symbols and Numbers - P( PWR | RE | RU, SEND(KC_ENT)); - P( PWR | LA | LO, SEND(KC_SPC)); - P( PWR | LP | LW, SEND(KC_LSFT); SEND(KC_9)); // ( - P( PWR | LH | LR, SEND(KC_LSFT); SEND(KC_0)); // ) - P( PWR | ST1 | ST2, SEND(KC_GRV)); // ` - P( PWR | RD | RZ, SEND(KC_ESC)); - P( PWR | LSU | LSD, SEND(KC_LSFT); SEND(KC_3)); // # - P( PWR | LFT | LK, SEND(KC_LSFT); SEND(KC_4)); // $ - P( PWR | LSU, SEND(KC_LSFT); SEND(KC_1)); // ! - P( PWR | LSD, SEND(KC_LSFT); SEND(KC_5)); // % - P( PWR | LFT, SEND(KC_LSFT); SEND(KC_2)); // @ - P( PWR | LK, SEND(KC_LSFT); SEND(KC_6)); // ^ - P( PWR | LP, SEND(KC_LSFT); SEND(KC_LBRC)); // { - P( PWR | LW, SEND(KC_LBRC)); - P( PWR | LH, SEND(KC_LSFT); SEND(KC_RBRC)); // } - P( PWR | LR, SEND(KC_RBRC)); - P( PWR | ST1, SEND(KC_LSFT); SEND(KC_BSLS)); // | - P( PWR | ST2, SEND(KC_LSFT); SEND(KC_GRV)); // ~ - P( PWR | ST3, SEND(KC_QUOT)); - P( PWR | ST4, SEND(KC_LSFT); SEND(KC_QUOT)); // " - P( PWR | RF, SEND(KC_KP_PLUS)); - P( PWR | RR, SEND(KC_LSFT); SEND(KC_7)); // & - P( PWR | RP, SEND(KC_MINS)); - P( PWR | RB, SEND(KC_EQL)); - P( PWR | RL, SEND(KC_SLSH)); - P( PWR | RG, SEND(KC_COMM)); - P( PWR | RT, SEND(KC_PAST)); - P( PWR | RS, SEND(KC_DOT)); - P( PWR | RD, SEND(KC_TAB)); - P( PWR | LA, SEND(KC_SCLN)); - P( PWR | LO, SEND(KC_SLSH)); - P( PWR | RE, SEND(KC_SCLN)); - P( PWR | RU, SEND(KC_SLSH)); - - - // If we make here, send as a steno chord - // If plover is running we can hook that host side - return false; +uint32_t processQwerty(bool lookup) { + // Specials + P( RT | RS | RD | RZ | LNO, SEND_STRING(VERSION); SEND_STRING(__DATE__)); + P( LNO | RNO | LA | LO | RE | RU, SEND(KC_MPLY)); + P( LFT | LK | LP | LW, REPEAT()); + P( ST1 | ST2 | LW | ST4, SEND(KC_BSPC)); + + // Mouse Keys + P( LO | LSD | LK, CLICK_MOUSE(KC_MS_BTN2)); + P( LO | LR | LW, CLICK_MOUSE(KC_MS_BTN1)); + + // Thumb Chords + P( LA | LO | RE | RU, SEND(KC_CAPS)); + P( LA | RU, SEND(KC_ESC)); + P( LO | RE, SEND(KC_LCTL)); + P( LNO | RNO | LA | RU, SEND(KC_LCTL); SEND(KC_LSFT)); + P( LNO | LA | RE, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT)); + + // Mods + P( RT | RD | RS | RZ, SEND(KC_LGUI)); + P( RT | RD, SEND(KC_LCTL)); + P( RS | RZ, SEND(KC_LALT)); + P( LA | LNO, SEND(KC_LCTL)); + P( LA | LO, SEND(KC_LALT)); + P( LO, SEND(KC_LSFT)); + + // Function Layer + P( FUNCT | RF | RR, SEND(KC_F5)); + P( FUNCT | RP | RB, SEND(KC_F6)); + P( FUNCT | RL | RG, SEND(KC_F7)); + P( FUNCT | RT | RS, SEND(KC_F8)); + P( FUNCT | RF, SEND(KC_F1)); + P( FUNCT | RP, SEND(KC_F2)); + P( FUNCT | RL, SEND(KC_F3)); + P( FUNCT | RT, SEND(KC_F4)); + P( FUNCT | RR, SEND(KC_F9)); + P( FUNCT | RG, SEND(KC_F10)); + P( FUNCT | RB, SEND(KC_F11)); + P( FUNCT | RS, SEND(KC_F12)); + + // Movement Layer + P( MOVE | RF, SEND(KC_LEFT)); + P( MOVE | RP, SEND(KC_DOWN)); + P( MOVE | RL, SEND(KC_UP)); + P( MOVE | RT, SEND(KC_RIGHT)); + P( MOVE | ST3, SEND(KC_PGUP)); + P( MOVE | ST4, SEND(KC_PGDN)); + + // Media Layer + P( MEDIA | RF, SEND(KC_MPRV)); + P( MEDIA | RP, SEND(KC_MPLY)); + P( MEDIA | RL, SEND(KC_MPLY)); + P( MEDIA | RT, SEND(KC_MNXT)); + P( MEDIA | RD, SEND(KC_VOLU)); + P( MEDIA | RZ, SEND(KC_VOLD)); + P( MEDIA | RS, SEND(KC_MUTE)); + + // Number Row, Left + P( LNO | LSU, SEND(KC_1)); + P( LNO | LFT, SEND(KC_2)); + P( LNO | LP, SEND(KC_3)); + P( LNO | LH, SEND(KC_4)); + P( LNO | ST1, SEND(KC_5)); + P( LNO | ST3, SEND(KC_6)); + P( LNO | RF, SEND(KC_7)); + P( LNO | RP, SEND(KC_8)); + P( LNO | RL, SEND(KC_9)); + P( LNO | RT, SEND(KC_0)); + + // Number Row, Right + P( RNO | LSU, SEND(KC_1)); + P( RNO | LFT, SEND(KC_2)); + P( RNO | LP, SEND(KC_3)); + P( RNO | LH, SEND(KC_4)); + P( RNO | ST1, SEND(KC_5)); + P( RNO | ST3, SEND(KC_6)); + P( RNO | RF, SEND(KC_7)); + P( RNO | RP, SEND(KC_8)); + P( RNO | RL, SEND(KC_9)); + P( RNO | RT, SEND(KC_0)); + P( RNO | LA, SEND(KC_5)); + + // Specials + P( RU | RNO, SEND(KC_TAB)); + P( RE | RU, SEND(KC_BSPC)); + P( RD | RZ, SEND(KC_ENT)); + P( RE, SEND(KC_ENT)); + P( RD, SEND(KC_BSPC)); + P( LNO, SEND(KC_BSPC)); + P( RNO, SEND(KC_BSPC)); + P( LA, SEND(KC_SPC)); + P( RU, SEND(KC_SPC)); + P( RZ, SEND(KC_ESC)); + + // Symbols and Numbers + P( PWR | RE | RU, SEND(KC_ENT)); + P( PWR | LA | LO, SEND(KC_SPC)); + P( PWR | LP | LW, SEND(KC_LSFT); SEND(KC_9)); // ( + P( PWR | LH | LR, SEND(KC_LSFT); SEND(KC_0)); // ) + P( PWR | ST1 | ST2, SEND(KC_GRV)); // ` + P( PWR | RD | RZ, SEND(KC_ESC)); + P( PWR | LSU | LSD, SEND(KC_LSFT); SEND(KC_3)); // # + P( PWR | LFT | LK, SEND(KC_LSFT); SEND(KC_4)); // $ + P( PWR | LSU, SEND(KC_LSFT); SEND(KC_1)); // ! + P( PWR | LSD, SEND(KC_LSFT); SEND(KC_5)); // % + P( PWR | LFT, SEND(KC_LSFT); SEND(KC_2)); // @ + P( PWR | LK, SEND(KC_LSFT); SEND(KC_6)); // ^ + P( PWR | LP, SEND(KC_LSFT); SEND(KC_LBRC)); // { + P( PWR | LW, SEND(KC_LBRC)); + P( PWR | LH, SEND(KC_LSFT); SEND(KC_RBRC)); // } + P( PWR | LR, SEND(KC_RBRC)); + P( PWR | ST1, SEND(KC_LSFT); SEND(KC_BSLS)); // | + P( PWR | ST2, SEND(KC_LSFT); SEND(KC_GRV)); // ~ + P( PWR | ST3, SEND(KC_QUOT)); + P( PWR | ST4, SEND(KC_LSFT); SEND(KC_QUOT)); // " + P( PWR | RF, SEND(KC_KP_PLUS)); + P( PWR | RR, SEND(KC_LSFT); SEND(KC_7)); // & + P( PWR | RP, SEND(KC_MINS)); + P( PWR | RB, SEND(KC_EQL)); + P( PWR | RL, SEND(KC_SLSH)); + P( PWR | RG, SEND(KC_COMM)); + P( PWR | RT, SEND(KC_PAST)); + P( PWR | RS, SEND(KC_DOT)); + P( PWR | RD, SEND(KC_TAB)); + P( PWR | LA, SEND(KC_LSFT)); + P( PWR | LO, SEND(KC_SLSH)); + P( PWR | RE, SEND(KC_SCLN)); + P( PWR | RU, SEND(KC_BSLS)); + P( PWR | LNO, SEND(KC_BSLS)); + + // Letters + P( LSU | LSD, SEND(KC_A)); + P( LFT | LK, SEND(KC_S)); + P( LP | LW, SEND(KC_D)); + P( LH | LR, SEND(KC_F)); + P( ST1 | ST2, SEND(KC_G)); + P( ST3 | ST4, SEND(KC_H)); + P( RF | RR, SEND(KC_J)); + P( RT | RS, SEND(KC_SCLN)); + P( RG | RL, SEND(KC_L)); + P( RP | RB, SEND(KC_K)); + P( LSU, SEND(KC_Q)); + P( LSD, SEND(KC_Z)); + P( LFT, SEND(KC_W)); + P( LK, SEND(KC_X)); + P( LP, SEND(KC_E)); + P( LW, SEND(KC_C)); + P( LH, SEND(KC_R)); + P( LR, SEND(KC_V)); + P( ST1, SEND(KC_T)); + P( ST2, SEND(KC_B)); + P( ST3, SEND(KC_Y)); + P( ST4, SEND(KC_N)); + P( RF, SEND(KC_U)); + P( RR, SEND(KC_M)); + P( RP, SEND(KC_I)); + P( RB, SEND(KC_COMM)); + P( RL, SEND(KC_O)); + P( RG, SEND(KC_DOT)); + P( RT, SEND(KC_P)); + P( RS, SEND(KC_SLSH)); + P( RNO, SEND(KC_BSPC)); + P( LNO, SEND(KC_BSPC)); + + return 0; } -#define STENO_LAYER 0 -#define GAMING 1 -#define GAMING_2 2 - // "Layers" // Steno layer should be first in your map. -// When PWR | FN | RR | RG | RB | RS is pressed, the layer is increased to the next map. You must return to STENO_LAYER at the end. -// If you have only a single layer, you must set SINGLELAYER = yes in your rules.mk, otherwise you may experince undefined behaviour +// When PWR | FN | ST3 | ST4 is pressed, the layer is increased to the next map. You must return to STENO_LAYER at the end. +// If you need more space for chords, remove the two gaming layers. +// Note: If using NO_ACTION_TAPPING, LT will not work! const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -// Main layer, everything goes through here -[STENO_LAYER] = LAYOUT_georgi( -STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, -STN_PWR, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, - STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N1) -, -// Gaming layer with Numpad, Very limited -[GAMING] = LAYOUT_georgi( -KC_LSFT, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENT, -KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_DQUO, -KC_LALT, KC_SPC, LT(GAMING_2, KC_ENT), KC_DEL, KC_ASTR, TO(STENO_LAYER)), - -[GAMING_2] = LAYOUT_georgi( -KC_LSFT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, -KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_LT, KC_GT, KC_QUES, KC_RSFT, - KC_LALT, KC_SPC, KC_ENT, KC_DEL, KC_ASTR, TO(STENO_LAYER)) -}; - -int getKeymapCount(void) { - return sizeof(keymaps)/sizeof(keymaps[0]); -} + // Main layer, everything goes through here + [STENO_LAYER] = LAYOUT_georgi( + STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, + STN_PWR, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, + STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N7 + ), + // Gaming layer with Numpad, Very limited + [GAMING] = LAYOUT_georgi( + KC_LSFT, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENT, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_DQUO, + KC_LALT, KC_SPC, LT(GAMING_2, KC_ENT), KC_DEL, KC_ASTR, TO(STENO_LAYER) + ), + + [GAMING_2] = LAYOUT_georgi( + KC_LSFT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_LT, KC_GT, KC_QUES, KC_RSFT, + KC_LALT, KC_SPC, KC_ENT, KC_DEL, KC_ASTR, TO(STENO_LAYER) + ) +}; + +// Don't fuck with this, thanks. +size_t keymapsCount = sizeof(keymaps)/sizeof(keymaps[0]); diff --git a/keyboards/georgi/keymaps/default/rules.mk b/keyboards/georgi/keymaps/default/rules.mk index 2973c4591..90d8057c3 100644 --- a/keyboards/georgi/keymaps/default/rules.mk +++ b/keyboards/georgi/keymaps/default/rules.mk @@ -1,18 +1,23 @@ #---------------------------------------------------------------------------- -# make georgi:extrakey:dfu +# make georgi:default:dfu # Make sure you have dfu-programmer installed! #---------------------------------------------------------------------------- -#Debug options +NO_REPEAT = no VERBOSE = yes -CONSOLE_ENABLE = yes -DEBUG_MATRIX_SCAN_RATE = no -DEBUG_MATRIX = no KEYBOARD_SHARED_EP = yes CUSTOM_MATRIX = yes -MOUSEKEY_ENABLE = yes -SINGLE_LAYER = no +#Firmware reduction options +MOUSEKEY_ENABLE = yes # 1500 bytes +NO_TAPPING = no # 2000 bytes +NO_PRINT = yes + +#Debug options +CONSOLE_ENABLE = no +DEBUG_MATRIX_SCAN_RATE = no +DEBUG_MATRIX = no +ONLY_QWERTY = no # A bunch of stuff that you shouldn't touch unless you # know what you're doing. @@ -22,6 +27,15 @@ SRC += matrix.c i2c_master.c ifeq ($(strip $(DEBUG_MATRIX)), yes) OPT_DEFS += -DDEBUG_MATRIX endif -ifeq ($(strip $(SINGLE_LAYER)), yes) - OPT_DEFS += -DSINGLE_LAYER +ifeq ($(strip $(NO_REPEAT)), yes) + OPT_DEFS += -DNO_REPEAT +endif +ifeq ($(strip $(NO_PRINT)), yes) + OPT_DEFS += -DNO_PRINT -DNO_DEBUG +endif +ifeq ($(strip $(ONLY_QWERTY)), yes) + OPT_DEFS += -DONLYQWERTY +endif +ifeq ($(strip $(NO_TAPPING)), yes) + OPT_DEFS += -DNO_ACTION_TAPPING endif diff --git a/keyboards/georgi/keymaps/minimal/keymap.c b/keyboards/georgi/keymaps/minimal/keymap.c new file mode 100644 index 000000000..1d9b57e9a --- /dev/null +++ b/keyboards/georgi/keymaps/minimal/keymap.c @@ -0,0 +1,223 @@ +/* + * Good on you for modifying your layout, this is the most nonQMK layout you will come across + * There are three modes, Steno (the default), QWERTY (Toggleable) and a Momentary symbol layer + * + * Don't modify the steno layer directly, instead add chords using the keycodes and macros + * from sten.h to the layout you want to modify. + * + * Observe the comment above processQWERTY! + * + * http://docs.gboards.ca + */ + +#include QMK_KEYBOARD_H +#include "sten.h" +#include "keymap_steno.h" +#define IGNORE_MOD_TAP_INTERRUPT + +// Proper Layers +#define FUNCT (LSD | LK | LP | LH) +#define MEDIA (LSD | LK | LW | LR) +#define MOVE (ST1 | ST2) + +// QMK Layers +#define STENO_LAYER 0 + +/* Keyboard Layout + * ,---------------------------------. ,------------------------------. + * | FN | LSU | LFT | LP | LH | ST1 | | ST3 | RF | RP | RL | RT | RD | + * |-----+-----+-----+----+----|-----| |-----|----+----+----+----+----| + * | PWR | LSD | LK | LW | LR | ST2 | | ST4 | RR | BB | RG | RS | RZ | + * `---------------------------------' `------------------------------' + * ,---------------, .---------------. + * | LNO | LA | LO | | RE | RU | RNO | + * `---------------' `---------------' + */ + +// Note: You can only use basic keycodes here! +// P() is just a wrapper to make your life easier. +// +// http://docs.gboards.ca +uint32_t processQwerty(bool lookup) { + // Specials + P( RT | RS | RD | RZ | LNO, SEND_STRING(VERSION); SEND_STRING(__DATE__)); + P( LNO | RNO | LA | LO | RE | RU, SEND(KC_MPLY)); + P( LFT | LK | LP | LW, REPEAT()); + P( ST1 | ST2 | LW | ST4, SEND(KC_BSPC)); + + // Mouse Keys + P( LO | LSD | LK, CLICK_MOUSE(KC_MS_BTN2)); + P( LO | LR | LW, CLICK_MOUSE(KC_MS_BTN1)); + + // Thumb Chords + P( LA | LO | RE | RU, SEND(KC_CAPS)); + P( LA | RU, SEND(KC_ESC)); + P( LO | RE, SEND(KC_LCTL)); + P( LNO | RNO | LA | RU, SEND(KC_LCTL); SEND(KC_LSFT)); + P( LNO | LA | RE, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT)); + + // Mods + P( RT | RD | RS | RZ, SEND(KC_LGUI)); + P( RT | RD, SEND(KC_LCTL)); + P( RS | RZ, SEND(KC_LALT)); + P( LA | LNO, SEND(KC_LCTL)); + P( LA | LO, SEND(KC_LALT)); + P( LO, SEND(KC_LSFT)); + + // Function Layer + P( FUNCT | RF | RR, SEND(KC_F5)); + P( FUNCT | RP | RB, SEND(KC_F6)); + P( FUNCT | RL | RG, SEND(KC_F7)); + P( FUNCT | RT | RS, SEND(KC_F8)); + P( FUNCT | RF, SEND(KC_F1)); + P( FUNCT | RP, SEND(KC_F2)); + P( FUNCT | RL, SEND(KC_F3)); + P( FUNCT | RT, SEND(KC_F4)); + P( FUNCT | RR, SEND(KC_F9)); + P( FUNCT | RG, SEND(KC_F10)); + P( FUNCT | RB, SEND(KC_F11)); + P( FUNCT | RS, SEND(KC_F12)); + + // Movement Layer + P( MOVE | RF, SEND(KC_LEFT)); + P( MOVE | RP, SEND(KC_DOWN)); + P( MOVE | RL, SEND(KC_UP)); + P( MOVE | RT, SEND(KC_RIGHT)); + P( MOVE | ST3, SEND(KC_PGUP)); + P( MOVE | ST4, SEND(KC_PGDN)); + + // Media Layer + P( MEDIA | RF, SEND(KC_MPRV)); + P( MEDIA | RP, SEND(KC_MPLY)); + P( MEDIA | RL, SEND(KC_MPLY)); + P( MEDIA | RT, SEND(KC_MNXT)); + P( MEDIA | RD, SEND(KC_VOLU)); + P( MEDIA | RZ, SEND(KC_VOLD)); + P( MEDIA | RS, SEND(KC_MUTE)); + + // Number Row, Left + P( LNO | LSU, SEND(KC_1)); + P( LNO | LFT, SEND(KC_2)); + P( LNO | LP, SEND(KC_3)); + P( LNO | LH, SEND(KC_4)); + P( LNO | ST1, SEND(KC_5)); + P( LNO | ST3, SEND(KC_6)); + P( LNO | RF, SEND(KC_7)); + P( LNO | RP, SEND(KC_8)); + P( LNO | RL, SEND(KC_9)); + P( LNO | RT, SEND(KC_0)); + + // Number Row, Right + P( RNO | LSU, SEND(KC_1)); + P( RNO | LFT, SEND(KC_2)); + P( RNO | LP, SEND(KC_3)); + P( RNO | LH, SEND(KC_4)); + P( RNO | ST1, SEND(KC_5)); + P( RNO | ST3, SEND(KC_6)); + P( RNO | RF, SEND(KC_7)); + P( RNO | RP, SEND(KC_8)); + P( RNO | RL, SEND(KC_9)); + P( RNO | RT, SEND(KC_0)); + P( RNO | LA, SEND(KC_5)); + + // Specials + P( RU | RNO, SEND(KC_TAB)); + P( RE | RU, SEND(KC_BSPC)); + P( RD | RZ, SEND(KC_ENT)); + P( RE, SEND(KC_ENT)); + P( RD, SEND(KC_BSPC)); + P( LNO, SEND(KC_BSPC)); + P( RNO, SEND(KC_BSPC)); + P( LA, SEND(KC_SPC)); + P( RU, SEND(KC_SPC)); + P( RZ, SEND(KC_ESC)); + + // Symbols and Numbers + P( PWR | RE | RU, SEND(KC_ENT)); + P( PWR | LA | LO, SEND(KC_SPC)); + P( PWR | LP | LW, SEND(KC_LSFT); SEND(KC_9)); // ( + P( PWR | LH | LR, SEND(KC_LSFT); SEND(KC_0)); // ) + P( PWR | ST1 | ST2, SEND(KC_GRV)); // ` + P( PWR | RD | RZ, SEND(KC_ESC)); + P( PWR | LSU | LSD, SEND(KC_LSFT); SEND(KC_3)); // # + P( PWR | LFT | LK, SEND(KC_LSFT); SEND(KC_4)); // $ + P( PWR | LSU, SEND(KC_LSFT); SEND(KC_1)); // ! + P( PWR | LSD, SEND(KC_LSFT); SEND(KC_5)); // % + P( PWR | LFT, SEND(KC_LSFT); SEND(KC_2)); // @ + P( PWR | LK, SEND(KC_LSFT); SEND(KC_6)); // ^ + P( PWR | LP, SEND(KC_LSFT); SEND(KC_LBRC)); // { + P( PWR | LW, SEND(KC_LBRC)); + P( PWR | LH, SEND(KC_LSFT); SEND(KC_RBRC)); // } + P( PWR | LR, SEND(KC_RBRC)); + P( PWR | ST1, SEND(KC_LSFT); SEND(KC_BSLS)); // | + P( PWR | ST2, SEND(KC_LSFT); SEND(KC_GRV)); // ~ + P( PWR | ST3, SEND(KC_QUOT)); + P( PWR | ST4, SEND(KC_LSFT); SEND(KC_QUOT)); // " + P( PWR | RF, SEND(KC_KP_PLUS)); + P( PWR | RR, SEND(KC_LSFT); SEND(KC_7)); // & + P( PWR | RP, SEND(KC_MINS)); + P( PWR | RB, SEND(KC_EQL)); + P( PWR | RL, SEND(KC_SLSH)); + P( PWR | RG, SEND(KC_COMM)); + P( PWR | RT, SEND(KC_PAST)); + P( PWR | RS, SEND(KC_DOT)); + P( PWR | RD, SEND(KC_TAB)); + P( PWR | LA, SEND(KC_LSFT)); + P( PWR | LO, SEND(KC_SLSH)); + P( PWR | RE, SEND(KC_SCLN)); + P( PWR | RU, SEND(KC_BSLS)); + P( PWR | LNO, SEND(KC_BSLS)); + + // Letters + P( LSU | LSD, SEND(KC_A)); + P( LFT | LK, SEND(KC_S)); + P( LP | LW, SEND(KC_D)); + P( LH | LR, SEND(KC_F)); + P( ST1 | ST2, SEND(KC_G)); + P( ST3 | ST4, SEND(KC_H)); + P( RF | RR, SEND(KC_J)); + P( RT | RS, SEND(KC_SCLN)); + P( RG | RL, SEND(KC_L)); + P( RP | RB, SEND(KC_K)); + P( LSU, SEND(KC_Q)); + P( LSD, SEND(KC_Z)); + P( LFT, SEND(KC_W)); + P( LK, SEND(KC_X)); + P( LP, SEND(KC_E)); + P( LW, SEND(KC_C)); + P( LH, SEND(KC_R)); + P( LR, SEND(KC_V)); + P( ST1, SEND(KC_T)); + P( ST2, SEND(KC_B)); + P( ST3, SEND(KC_Y)); + P( ST4, SEND(KC_N)); + P( RF, SEND(KC_U)); + P( RR, SEND(KC_M)); + P( RP, SEND(KC_I)); + P( RB, SEND(KC_COMM)); + P( RL, SEND(KC_O)); + P( RG, SEND(KC_DOT)); + P( RT, SEND(KC_P)); + P( RS, SEND(KC_SLSH)); + P( RNO, SEND(KC_BSPC)); + P( LNO, SEND(KC_BSPC)); + + return 0; +} + +// "Layers" +// Steno layer should be first in your map. +// When PWR | FN | ST3 | ST4 is pressed, the layer is increased to the next map. You must return to STENO_LAYER at the end. +// If you need more space for chords, remove the two gaming layers. +// Note: If using NO_ACTION_TAPPING, LT will not work! + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // Main layer, everything goes through here + [STENO_LAYER] = LAYOUT_georgi( + STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, + STN_PWR, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, + STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N7 + ) +}; +// Don't fuck with this, thanks. +size_t keymapsCount = sizeof(keymaps)/sizeof(keymaps[0]); diff --git a/keyboards/georgi/keymaps/minimal/readme.md b/keyboards/georgi/keymaps/minimal/readme.md new file mode 100644 index 000000000..f9da34b02 --- /dev/null +++ b/keyboards/georgi/keymaps/minimal/readme.md @@ -0,0 +1,11 @@ +# Georgi QWERTY/Steno firmware + +This is the default keymap for Georgi, it's based heavily off of the naps62 ErgoDox and the Gergo layout. +It is both a ergonomic and programmer friendly keymap. + +Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR! + +## Space issues +If you find yourself running out of space for dictionary entries, disabling mousekeys in rules.mk will save +you about 4k for entries! +Get a free 1k by deleting the Gaming layers from the keymap! diff --git a/keyboards/georgi/keymaps/minimal/rules.mk b/keyboards/georgi/keymaps/minimal/rules.mk new file mode 100644 index 000000000..cdbbbc280 --- /dev/null +++ b/keyboards/georgi/keymaps/minimal/rules.mk @@ -0,0 +1,41 @@ +#---------------------------------------------------------------------------- +# make georgi:default:dfu +# Make sure you have dfu-programmer installed! +#---------------------------------------------------------------------------- + +NO_REPEAT = no +VERBOSE = yes +KEYBOARD_SHARED_EP = yes +CUSTOM_MATRIX = yes + +#Firmware reduction options +MOUSEKEY_ENABLE = no # 1500 bytes +NO_TAPPING = yes # 2000 bytes +NO_PRINT = yes + +#Debug options +CONSOLE_ENABLE = no +DEBUG_MATRIX_SCAN_RATE = no +DEBUG_MATRIX = no +ONLY_QWERTY = no + +# A bunch of stuff that you shouldn't touch unless you +# know what you're doing. +# +# No touchy, capiche? +SRC += matrix.c i2c_master.c +ifeq ($(strip $(DEBUG_MATRIX)), yes) + OPT_DEFS += -DDEBUG_MATRIX +endif +ifeq ($(strip $(NO_REPEAT)), yes) + OPT_DEFS += -DNO_REPEAT +endif +ifeq ($(strip $(NO_PRINT)), yes) + OPT_DEFS += -DNO_PRINT -DNO_DEBUG +endif +ifeq ($(strip $(ONLY_QWERTY)), yes) + OPT_DEFS += -DONLYQWERTY +endif +ifeq ($(strip $(NO_TAPPING)), yes) + OPT_DEFS += -DNO_ACTION_TAPPING +endif diff --git a/keyboards/georgi/keymaps/norman/keymap.c b/keyboards/georgi/keymaps/norman/keymap.c new file mode 100644 index 000000000..58c42c852 --- /dev/null +++ b/keyboards/georgi/keymaps/norman/keymap.c @@ -0,0 +1,267 @@ +/* + * Good on you for modifying your layout, this is the most nonQMK layout you will come across + * There are three modes, Steno (the default), QWERTY (Toggleable) and a Momentary symbol layer + * + * Don't modify the steno layer directly, instead add chords using the keycodes and macros + * from sten.h to the layout you want to modify. + * + * Observe the comment above processQWERTY! + * + * http://docs.gboards.ca + */ + +#include QMK_KEYBOARD_H +#include "sten.h" +#include "keymap_steno.h" +#define IGNORE_MOD_TAP_INTERRUPT + +// Proper Layers +#define FUNCT (LSD | LK | LP | LH) +#define MEDIA (LSD | LK | LW | LR) +#define MOVE (LH | ST2) + +/* Keyboard Layout + * ,---------------------------------. ,------------------------------. + * | FN | LSU | LFT | LP | LH | ST1 | | ST3 | RF | RP | RL | RT | RD | + * |-----+-----+-----+----+----|-----| |-----|----+----+----+----+----| + * | PWR | LSD | LK | LW | LR | ST2 | | ST4 | RR | RB | RG | RS | RZ | + * `---------------------------------' `------------------------------' + * ,---------------, .---------------. + * | LNO | LA | LO | | RE | RU | RNO | + * `---------------' `---------------' + */ + +// YOU MUST ORDER THIS! +// Order your chords from longest to shortest! +// You can only use basic keycodes here! +// +// P() is just a wrapper to make your life easier. +// +// http://docs.gboards.ca +uint32_t processQwerty(bool lookup) { + // Specials + P( RT | RS | RD | RZ | LNO, SEND_STRING(VERSION); SEND_STRING(__DATE__)); + P( LNO | LA | LO | RE | RU, SEND(KC_MPLY)); + P( ST1 | ST2 | ST3 | ST4, SEND(KC_BSPC)); + + // Thumb Chords + P( LA | LO | RE | RU, SEND(KC_CAPS)); + P( LA | RU, SEND(KC_ESC)); + P( LO | RE, SEND(KC_LCTL)); + P( LNO | LA | RU, SEND(KC_LCTL); SEND(KC_LSFT)); + P( LNO | LA | RE, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT)); + + // Mods + P( RT | RD | RS | RZ, SEND(KC_LGUI)); + P( RT | RD, SEND(KC_LCTL)); + P( RS | RZ, SEND(KC_LALT)); + P( LA | LNO, SEND(KC_LCTL)); + P( LA | LO, SEND(KC_LALT)); + P( LO, SEND(KC_LSFT)); + + // Function Layer + P( FUNCT | RF | RR, SEND(KC_F6)); + P( FUNCT | RP | RB, SEND(KC_F7)); + P( FUNCT | RL | RG, SEND(KC_F8)); + P( FUNCT | ST3 | ST4, SEND(KC_F5)); + P( FUNCT| ST3, SEND(KC_F1)); + P( FUNCT| ST4, SEND(KC_F9)); + P( FUNCT | RF, SEND(KC_F2)); + P( FUNCT | RP, SEND(KC_F3)); + P( FUNCT | RL, SEND(KC_F4)); + P( FUNCT | RR, SEND(KC_F10)); + P( FUNCT | RG, SEND(KC_F12)); + P( FUNCT | RB, SEND(KC_F11)); + P( FUNCT | RD, SEND(KC_RALT); SEND(KC_T); SEND(KC_H); SEND(KC_U); SEND(KC_P)); + P( FUNCT | RZ, SEND(KC_RALT); SEND(KC_T); SEND(KC_H); SEND(KC_D); SEND(KC_N)); + P( FUNCT | RT, SEND(KC_RALT); SEND(KC_S); SEND(KC_F)); + P( FUNCT | RS, SEND(KC_LALT); SEND(KC_SPC)); + P( FUNCT | RE, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_ESC)); + P( FUNCT | RU, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_0)); + + // Movement Layer + P( MOVE | RF, SEND(KC_LGUI); SEND(KC_LSFT); SEND(KC_LEFT)); + P( MOVE | RP, SEND(KC_UP)); + P( MOVE | RL, SEND(KC_LGUI); SEND(KC_LSFT); SEND(KC_RGHT)); + P( MOVE | RT, SEND(KC_LALT); SEND(KC_LCTL); SEND(KC_LGUI); SEND(KC_C)); + P( MOVE | ST3, SEND(KC_PGUP)); + P( MOVE | ST4, SEND(KC_PGDN)); + P( MOVE | RD, SEND(KC_HOME)); + P( MOVE | RZ, SEND(KC_END)); + P( MOVE | RG, SEND(KC_RIGHT)); + P( MOVE | RB, SEND(KC_DOWN)); + P( MOVE | RR, SEND(KC_LEFT)); + P( MOVE | RS, SEND(KC_LSFT); SEND(KC_LCTL); SEND(KC_LGUI); SEND(KC_T)); + P( MOVE | RE, SEND(KC_LSFT); SEND(KC_LALT); SEND(KC_LGUI); SEND(KC_S)); + P( MOVE | RU, SEND(KC_LSFT); SEND(KC_LCTL); SEND(KC_1)); + + + // Media Layer + P( MEDIA | RF, SEND(KC_MEDIA_PREV_TRACK)); + P( MEDIA | RP, SEND(KC_MPLY)); + P( MEDIA | RL, SEND(KC_MPLY)); + P( MEDIA | RT, SEND(KC_MEDIA_NEXT_TRACK)); + P( MEDIA | RD, SEND(KC_VOLU)); + P( MEDIA | RZ, SEND(KC_VOLD)); + P( MEDIA | RS, SEND(KC_MUTE)); + P( MEDIA | ST3, SEND(KC_LALT); SEND(KC_LCTL); SEND(KC_LGUI); SEND(KC_4)); + P( MEDIA | ST4, SEND(KC_LALT); SEND(KC_LCTL); SEND(KC_LGUI); SEND(KC_2)); + P( MEDIA | RR, SEND(KC_LALT); SEND(KC_LCTL); SEND(KC_LGUI); SEND(KC_3)); + P( MEDIA | RB, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_GRV)); + P( MEDIA | RG, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_8)); + P( MEDIA | RE, SEND(KC_RALT); SEND(KC_F); SEND(KC_I); SEND(KC_R); SEND(KC_E)); + P( MEDIA | RU, SEND(KC_RALT); SEND(KC_T); SEND(KC_A); SEND(KC_D)); + + // Mouse Keys and Printscreen + P( LFT | LH, CLICK_MOUSE(KC_MS_BTN1)); + P( LK | LR, CLICK_MOUSE(KC_MS_BTN2)); + P( RF | RT, SEND(KC_PSCR);); + + // Number Row Left + P( LNO | LSU, SEND(KC_1)); + P( LNO | LFT, SEND(KC_2)); + P( LNO | LP, SEND(KC_3)); + P( LNO | LH, SEND(KC_4)); + P( LNO | ST1, SEND(KC_5)); + P( LNO | ST3, SEND(KC_6)); + P( LNO | RF, SEND(KC_7)); + P( LNO | RP, SEND(KC_8)); + P( LNO | RL, SEND(KC_9)); + P( LNO | RT, SEND(KC_0)); + P( LNO | LA, SEND(KC_5)); + P( LNO | RT, SEND(KC_0)); + + // Number Row Right + P( RNO | LSU, SEND(KC_1)); + P( RNO | LFT, SEND(KC_2)); + P( RNO | LP, SEND(KC_3)); + P( RNO | LH, SEND(KC_4)); + P( RNO | ST1, SEND(KC_5)); + P( RNO | ST3, SEND(KC_6)); + P( RNO | RF, SEND(KC_7)); + P( RNO | RP, SEND(KC_8)); + P( RNO | RL, SEND(KC_9)); + P( RNO | RT, SEND(KC_0)); + P( RNO | LA, SEND(KC_5)); + P( RNO | RT, SEND(KC_0)); + + // Specials + P( LA | LNO, SEND(KC_ESC)); + P( RU | RNO, SEND(KC_TAB)); + P( RE | RU, SEND(KC_LSFT); SEND(KC_SLSH)); + P( RD | RZ, SEND(KC_ENT)); + P( RE, SEND(KC_ENT)); + //P( RD, SEND(KC_BSPC)); + P( LNO, SEND(KC_BSPC)); + P( RD, SEND(KC_DEL)); + P( LA, SEND(KC_SPC)); + P( RU, SEND(KC_SPC)); + P( RZ, SEND(KC_ESC)); + //P( RNO, REPEAT()); + + // Letters + P( LSU | LSD, SEND(KC_A)); + P( LFT | LK, SEND(KC_S)); + P( LP | LW, SEND(KC_E)); + P( LH | LR, SEND(KC_T)); + P( ST1 | ST2, SEND(KC_G)); + P( ST3 | ST4, SEND(KC_Y)); + P( RF | RR, SEND(KC_N)); + P( RT | RS, SEND(KC_H)) + P( RG | RL, SEND(KC_O)); + P( RP | RB, SEND(KC_I)); + P( LSU, SEND(KC_Q)); + P( LSD, SEND(KC_Z)); + P( LFT, SEND(KC_W)); + P( LK, SEND(KC_X)); + P( LP, SEND(KC_D)); + P( LW, SEND(KC_C)); + P( LH, SEND(KC_F)); + P( LR, SEND(KC_V)); + P( ST1, SEND(KC_K)); + P( ST2, SEND(KC_B)); + P( ST3, SEND(KC_J)); + P( ST4, SEND(KC_P)); + P( RF, SEND(KC_U)); + P( RR, SEND(KC_M)); + P( RP, SEND(KC_R)); + P( RB, SEND(KC_COMM)); + P( RL, SEND(KC_L)); + P( RG, SEND(KC_DOT)); + P( RT, SEND(KC_SCLN)); + P( RS, SEND(KC_SLSH)); + + // Symbols and Numbers + P( PWR | RE | RU, SEND(KC_ENT)); + P( PWR | LA | LO, SEND(KC_SPC)); + P( PWR | LP | LW, SEND(KC_LSFT); SEND(KC_9)); // ( + P( PWR | LH | LR, SEND(KC_LSFT); SEND(KC_0)); // ) + P( PWR | ST1 | ST2, SEND(KC_GRV)); // ` + P( PWR | RD | RZ, SEND(KC_ESC)); + P( PWR | LSU | LSD, SEND(KC_LSFT); SEND(KC_3)); // # + P( PWR | LFT | LK, SEND(KC_LSFT); SEND(KC_4)); // $ + P( PWR | LSU, SEND(KC_LSFT); SEND(KC_1)); // ! + P( PWR | LSD, SEND(KC_LSFT); SEND(KC_5)); // % + P( PWR | LFT, SEND(KC_LSFT); SEND(KC_2)); // @ + P( PWR | LK, SEND(KC_LSFT); SEND(KC_6)); // ^ + P( PWR | LP, SEND(KC_LSFT); SEND(KC_LBRC)); // { + P( PWR | LW, SEND(KC_LBRC)); + P( PWR | LH, SEND(KC_LSFT); SEND(KC_RBRC)); // } + P( PWR | LR, SEND(KC_RBRC)); + P( PWR | ST1, SEND(KC_LSFT); SEND(KC_BSLS)); // | + P( PWR | ST2, SEND(KC_LSFT); SEND(KC_GRV)); // ~ + P( PWR | ST3, SEND(KC_QUOT)); + P( PWR | ST4, SEND(KC_LSFT); SEND(KC_QUOT)); // " + P( PWR | RF, SEND(KC_KP_PLUS)); + P( PWR | RR, SEND(KC_LSFT); SEND(KC_7)); // & + P( PWR | RP, SEND(KC_MINS)); + P( PWR | RB, SEND(KC_EQL)); + P( PWR | RL, SEND(KC_SLSH)); + P( PWR | RG, SEND(KC_LSFT); SEND(KC_MINS)); + P( PWR | RT, SEND(KC_PAST)); + P( PWR | RS, SEND(KC_DOT)); + P( PWR | RD, SEND(KC_TAB)); + P( PWR | LA, SEND(KC_LSFT); SEND(KC_SCLN)); + P( PWR | LO, SEND(KC_BSLS)); + P( PWR | RE, SEND(KC_SCLN)); + P( PWR | RU, SEND(KC_BSLS)); + P( PWR | RZ, SEND(KC_LSFT)); + + return 0; +} + +#define STENO_LAYER 0 +#define GAMING 1 +#define GAMING_2 2 +#define MOVEMENT 3 + +// "Layers" +// Steno layer should be first in your map. +// When PWR | FN | ST3 | ST4 is pressed, the layer is increased to the next map. You must return to STENO_LAYER at the end. +// If you need more space for chords, remove the two gaming layers. + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +// Main layer, everything goes through here +[STENO_LAYER] = LAYOUT_georgi( +STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, +STN_PWR, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, + STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N7) +, +// Gaming layer with Numpad, Very limited +[GAMING] = LAYOUT_georgi( +KC_LSFT, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENT, +KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_DQUO, +KC_LALT, KC_SPC, LT(GAMING_2, KC_ENT), KC_DEL, KC_ASTR, TO(STENO_LAYER)), + +[GAMING_2] = LAYOUT_georgi( +KC_LSFT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, +KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_LT, KC_GT, KC_QUES, KC_RSFT, + KC_LALT, KC_SPC, KC_NO, KC_DEL, KC_ASTR, TO(STENO_LAYER)), + +[MOVEMENT] = LAYOUT_georgi( +KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_PGUP, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_HOME, +KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_END, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; +// Don't fuck with this, thanks. +size_t keymapsCount = sizeof(keymaps)/sizeof(keymaps[0]); diff --git a/keyboards/georgi/keymaps/norman/readme.md b/keyboards/georgi/keymaps/norman/readme.md new file mode 100644 index 000000000..f9da34b02 --- /dev/null +++ b/keyboards/georgi/keymaps/norman/readme.md @@ -0,0 +1,11 @@ +# Georgi QWERTY/Steno firmware + +This is the default keymap for Georgi, it's based heavily off of the naps62 ErgoDox and the Gergo layout. +It is both a ergonomic and programmer friendly keymap. + +Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR! + +## Space issues +If you find yourself running out of space for dictionary entries, disabling mousekeys in rules.mk will save +you about 4k for entries! +Get a free 1k by deleting the Gaming layers from the keymap! diff --git a/keyboards/georgi/keymaps/norman/rules.mk b/keyboards/georgi/keymaps/norman/rules.mk new file mode 100644 index 000000000..bb97bef28 --- /dev/null +++ b/keyboards/georgi/keymaps/norman/rules.mk @@ -0,0 +1,35 @@ +#---------------------------------------------------------------------------- +# make georgi:default:dfu +# Make sure you have dfu-programmer installed! +#---------------------------------------------------------------------------- + +NO_REPEAT = yes +VERBOSE = yes +KEYBOARD_SHARED_EP = yes +CUSTOM_MATRIX = yes +MOUSEKEY_ENABLE = yes + +#Debug options +CONSOLE_ENABLE = no +DEBUG_MATRIX_SCAN_RATE = no +DEBUG_MATRIX = no +NO_PRINT = yes +ONLY_QWERTY = no + +# A bunch of stuff that you shouldn't touch unless you +# know what you're doing. +# +# No touchy, capiche? +SRC += matrix.c i2c_master.c +ifeq ($(strip $(DEBUG_MATRIX)), yes) + OPT_DEFS += -DDEBUG_MATRIX +endif +ifeq ($(strip $(NO_REPEAT)), yes) + OPT_DEFS += -DNO_REPEAT +endif +ifeq ($(strip $(NO_PRINT)), yes) + OPT_DEFS += -DNO_PRINT -DNO_DEBUG +endif +ifeq ($(strip $(ONLY_QWERTY)), yes) + OPT_DEFS += -DONLYQWERTY +endif diff --git a/keyboards/georgi/keymaps/template/keymap.c b/keyboards/georgi/keymaps/template/keymap.c deleted file mode 100644 index b17d7ed9f..000000000 --- a/keyboards/georgi/keymaps/template/keymap.c +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Good on you for modifying your layout, this is the most nonQMK layout you will come across - * There are three modes, Steno (the default), QWERTY (Toggleable) and a Momentary symbol layer - * - * Don't modify the steno layer directly, instead add chords using the keycodes and macros - * from sten.h to the layout you want to modify. - * - * Observe the comment above processQWERTY! - * - * http://docs.gboards.ca - */ - -#include QMK_KEYBOARD_H -#include "sten.h" -#include "keymap_steno.h" -#define IGNORE_MOD_TAP_INTERRUPT - -int getKeymapCount(void); - -// Proper Layers -#define FUNCT (LSD | LK | LP | LH) -#define MEDIA (LSD | LK | LW | LR) -#define MOVE (ST1 | ST2) - -/* Keyboard Layout - * ,---------------------------------. ,------------------------------. - * | FN | LSU | LFT | LP | LH | ST1 | | ST3 | RF | RP | RL | RT | RD | - * |-----+-----+-----+----+----|-----| |-----|----+----+----+----+----| - * | PWR | LSD | LK | LW | LR | ST2 | | ST4 | RR | RG | RB | RS | RZ | - * `---------------------------------' `------------------------------' - * ,---------------, .---------------. - * | NUM | LA | LO | | RE | RU | NUM | - * `---------------' `---------------' - */ - -// YOU MUST ORDER THIS! -// P Will return from processing on the first match it finds. Therefore -// PJ Will run the requested action, remove the matched chord and continue -// -// First any chords that would conflict with PJs need to be checked, then PJs, lastly Ps. -// For all chords should be ordered by length in their section! -// -// http://docs.gboards.ca -bool processQwerty(void) { - // Place P's that would be trashed by PJ's here - P( RT | RS | RD | RZ | NUM, SEND_STRING(VERSION); SEND_STRING(__DATE__)); - P( NUM | LA | LO | RE | RU, SEND(KC_MPLY)); - P( ST1 | ST2 | ST3 | ST4, SEND(KC_BSPC)); - - // Thumb Chords - P( LA | LO | RE | RU, SEND(KC_CAPS)); - P( LA | RU, SEND(KC_ESC)); - PJ( LO | RE, SEND(KC_LCTL)); - PJ( NUM | LA | RU, SEND(KC_LCTL); SEND(KC_LSFT)); - PJ( NUM | LA | RE, SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT)); - - // Mods - PJ( RT | RD | RS | RZ, SEND(KC_LGUI)); - PJ( RT | RD, SEND(KC_LCTL)); - PJ( RS | RZ, SEND(KC_LALT)); - PJ( LA | NUM, SEND(KC_LCTL)); - PJ( LA | LO, SEND(KC_LALT)); - PJ( LO, SEND(KC_LSFT)); - - // Function Layer - P( FUNCT | RF | RR, SEND(KC_F5)); - P( FUNCT | RP | RB, SEND(KC_F6)); - P( FUNCT | RL | RG, SEND(KC_F7)); - P( FUNCT | RT | RS, SEND(KC_F8)); - P( FUNCT | RF, SEND(KC_F1)); - P( FUNCT | RP, SEND(KC_F2)); - P( FUNCT | RL, SEND(KC_F3)); - P( FUNCT | RT, SEND(KC_F4)); - P( FUNCT | RR, SEND(KC_F9)); - P( FUNCT | RG, SEND(KC_F10)); - P( FUNCT | RB, SEND(KC_F11)); - P( FUNCT | RS, SEND(KC_F12)); - - // Movement Layer - P( MOVE | RF, SEND(KC_LEFT)); - P( MOVE | RP, SEND(KC_DOWN)); - P( MOVE | RL, SEND(KC_UP)); - P( MOVE | RT, SEND(KC_RIGHT)); - P( MOVE | ST3, SEND(KC_PGUP)); - P( MOVE | ST4, SEND(KC_PGDN)); - - // Media Layer - P( MEDIA | RF, SEND(KC_MPRV)); - P( MEDIA | RP, SEND(KC_MPLY)); - P( MEDIA | RL, SEND(KC_MPLY)); - P( MEDIA | RT, SEND(KC_MNXT)); - P( MEDIA | RD, SEND(KC_VOLU)); - P( MEDIA | RZ, SEND(KC_VOLD)); - P( MEDIA | RS, SEND(KC_MUTE)); - - // Mouse Keys - P( LP | LH, clickMouse(KC_MS_BTN1)); - P( LW | LR, clickMouse(KC_MS_BTN2)); - - // Number Row - P( NUM | LSU, SEND(KC_1)); - P( NUM | LFT, SEND(KC_2)); - P( NUM | LP, SEND(KC_3)); - P( NUM | LH, SEND(KC_4)); - P( NUM | ST1, SEND(KC_5)); - P( NUM | ST3, SEND(KC_6)); - P( NUM | RF, SEND(KC_7)); - P( NUM | RP, SEND(KC_8)); - P( NUM | RL, SEND(KC_9)); - P( NUM | RT, SEND(KC_0)); - P( NUM | LA, SEND(KC_5)); - P( NUM | RT, SEND(KC_0)); - - // Specials - P( LA | NUM, SEND(KC_ESC)); - P( RU | NUM, SEND(KC_TAB)); - P( RE | RU, SEND(KC_BSPC)); - P( RD | RZ, SEND(KC_ENT)); - P( RE, SEND(KC_ENT)); - P( RD, SEND(KC_BSPC)); - P( NUM, SEND(KC_BSPC)); - P( LA, SEND(KC_SPC)); - P( RU, SEND(KC_SPC)); - P( RZ, SEND(KC_ESC)); - - // Letters - P( LSU | LSD, SEND(KC_A)); - P( LFT | LK, SEND(KC_S)); - P( LP | LW, SEND(KC_D)); - P( LH | LR, SEND(KC_F)); - P( ST1 | ST2, SEND(KC_G)); - P( ST3 | ST4, SEND(KC_H)); - P( RF | RR, SEND(KC_J)); - P( RT | RS, SEND(KC_SCLN)) - P( RG | RL, SEND(KC_L)); - P( RP | RB, SEND(KC_K)); - P( LSU, SEND(KC_Q)); - P( LSD, SEND(KC_Z)); - P( LFT, SEND(KC_W)); - P( LK, SEND(KC_X)); - P( LP, SEND(KC_E)); - P( LW, SEND(KC_C)); - P( LH, SEND(KC_R)); - P( LR, SEND(KC_V)); - P( ST1, SEND(KC_T)); - P( ST2, SEND(KC_B)); - P( ST3, SEND(KC_Y)); - P( ST4, SEND(KC_N)); - P( RF, SEND(KC_U)); - P( RR, SEND(KC_M)); - P( RP, SEND(KC_I)); - P( RB, SEND(KC_COMM)); - P( RL, SEND(KC_O)); - P( RG, SEND(KC_DOT)); - P( RT, SEND(KC_P)); - P( RS, SEND(KC_SLSH)); - - // Symbols and Numbers - P( PWR | RE | RU, SEND(KC_ENT)); - P( PWR | LA | LO, SEND(KC_SPC)); - P( PWR | LP | LW, SEND(KC_LSFT); SEND(KC_9)); // ( - P( PWR | LH | LR, SEND(KC_LSFT); SEND(KC_0)); // ) - P( PWR | ST1 | ST2, SEND(KC_GRV)); // ` - P( PWR | RD | RZ, SEND(KC_ESC)); - P( PWR | LSU | LSD, SEND(KC_LSFT); SEND(KC_3)); // # - P( PWR | LFT | LK, SEND(KC_LSFT); SEND(KC_4)); // $ - P( PWR | LSU, SEND(KC_LSFT); SEND(KC_1)); // ! - P( PWR | LSD, SEND(KC_LSFT); SEND(KC_5)); // % - P( PWR | LFT, SEND(KC_LSFT); SEND(KC_2)); // @ - P( PWR | LK, SEND(KC_LSFT); SEND(KC_6)); // ^ - P( PWR | LP, SEND(KC_LSFT); SEND(KC_LBRC)); // { - P( PWR | LW, SEND(KC_LBRC)); - P( PWR | LH, SEND(KC_LSFT); SEND(KC_RBRC)); // } - P( PWR | LR, SEND(KC_RBRC)); - P( PWR | ST1, SEND(KC_LSFT); SEND(KC_BSLS)); // | - P( PWR | ST2, SEND(KC_LSFT); SEND(KC_GRV)); // ~ - P( PWR | ST3, SEND(KC_QUOT)); - P( PWR | ST4, SEND(KC_LSFT); SEND(KC_QUOT)); // " - P( PWR | RF, SEND(KC_KP_PLUS)); - P( PWR | RR, SEND(KC_LSFT); SEND(KC_7)); // & - P( PWR | RP, SEND(KC_MINS)); - P( PWR | RB, SEND(KC_EQL)); - P( PWR | RL, SEND(KC_SLSH)); - P( PWR | RG, SEND(KC_COMM)); - P( PWR | RT, SEND(KC_PAST)); - P( PWR | RS, SEND(KC_DOT)); - P( PWR | RD, SEND(KC_TAB)); - P( PWR | LA, SEND(KC_SCLN)); - P( PWR | LO, SEND(KC_SLSH)); - P( PWR | RE, SEND(KC_SCLN)); - P( PWR | RU, SEND(KC_SLSH)); - - - // If we make here, send as a steno chord - // If plover is running we can hook that host side - return false; -} - -#define STENO_LAYER 0 - -// "Layers" -// Steno layer should be first in your map. -// When PWR | FN | RR | RG | RB | RS is pressed, the layer is increased to the next map. You must return to STENO_LAYER at the end. -// If you have only a single layer, you must set SINGLELAYER = yes in your rules.mk, otherwise you may experince undefined behaviour - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -// Main layer, everything goes through here -[STENO_LAYER] = LAYOUT_georgi( -STN_FN, STN_S1, STN_TL, STN_PL, STN_HL, STN_ST1, STN_ST3, STN_FR, STN_PR, STN_LR, STN_TR, STN_DR, -STN_PWR, STN_S2, STN_KL, STN_WL, STN_RL, STN_ST2, STN_ST4, STN_RR, STN_BR, STN_GR, STN_SR, STN_ZR, - STN_N1, STN_A, STN_O, STN_E, STN_U, STN_N1) -}; - -int getKeymapCount(void) { - return sizeof(keymaps)/sizeof(keymaps[0]); -} diff --git a/keyboards/georgi/keymaps/template/readme.md b/keyboards/georgi/keymaps/template/readme.md deleted file mode 100644 index 7c6fc3512..000000000 --- a/keyboards/georgi/keymaps/template/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# Georgi QWERTY/Steno firmware - -This is a blank template configured with 5K of free space for your onboard dictionary! -Read the docs over at [gBoards](http://docs.gboards.ca) - -Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR! diff --git a/keyboards/georgi/keymaps/template/rules.mk b/keyboards/georgi/keymaps/template/rules.mk deleted file mode 100644 index 1178fd80d..000000000 --- a/keyboards/georgi/keymaps/template/rules.mk +++ /dev/null @@ -1,27 +0,0 @@ -#---------------------------------------------------------------------------- -# make georgi:extrakey:dfu -# Make sure you have dfu-programmer installed! -#---------------------------------------------------------------------------- - -#Debug options -VERBOSE = yes -CONSOLE_ENABLE = yes -DEBUG_MATRIX_SCAN_RATE = no -DEBUG_MATRIX = no -KEYBOARD_SHARED_EP = yes -CUSTOM_MATRIX = yes -MOUSEKEY_ENABLE = no -SINGLE_LAYER = no - - -# A bunch of stuff that you shouldn't touch unless you -# know what you're doing. -# -# No touchy, capiche? -SRC += matrix.c i2c_master.c -ifeq ($(strip $(DEBUG_MATRIX)), yes) - OPT_DEFS += -DDEBUG_MATRIX -endif -ifeq ($(strip $(SINGLE_LAYER)), yes) - OPT_DEFS += -DSINGLE_LAYER -endif -- cgit v1.2.3-24-g4f1b