Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[keymap] Update gourdo1 keymap for Q2 changes #17398

Merged
merged 21 commits into from
Jul 2, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
code cleanup and cosmetics
  • Loading branch information
gourdo1 committed Jun 30, 2022
commit 488cb8646f2d2d1d2853c6ca939ecc775240f159
4 changes: 2 additions & 2 deletions keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ This Windows-centric ANSI layout is based on [Jonavin's](https://github.com/qmk/
* Overlay numpad on 789-UIOP-JKL;-M,. & Space-bar mapped to Enter key for rapid number entry
* Gaming mode ([FN]Win-key) locks out Win-key and double-tap Shift Capslock; Also RGB highlights WSAD and nearby gaming keys
* Caps Word enabled: To capitalize the next word only, press and release left and right shift at the same time. (added Feb 25, 2022)
* Multi-monitor app moving shortcuts: [FN][,] (square brackets) to move current app window to next monitor (added Apr 11, 2022)
* Multi-monitor app moving shortcuts: [FN] ],[ (square brackets) to move current app window to next monitor (added Apr 11, 2022)
* Capslock toggled by double tap of Left Shift key or FN + Capslock (RGB green highlighted)
* Paddle game accessible via [FN]P; Hit [FN]P again or double tap ESC to exit (added May 5, 2022)
* Paddle game accessible via [FN]P. Hit [FN]P again or double tap [ESC] to exit (added May 5, 2022)
* Single-handed shortcut for Ctrl-Alt-Delete: [FN]/ (added May 14, 2022)
* Single-handed shortcut for WinKey-L (lock Windows): [FN]L (added May 17, 2022)
* Domain shortcuts: [FN]. for .com, [FN]O for outlook.com, [FN]Y for yahoo.com, [FN]H for hotmail.com, [FN]G for gmail.com. (added Apr 7, 2022)
Expand Down
25 changes: 6 additions & 19 deletions users/gourdo1/gourdo1.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Copyright 2021 Jonavin Eng @Jonavin
Copyright 2022 gourdo1 <gourdo1@outlook.com>

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
Expand Down Expand Up @@ -46,9 +46,7 @@ void dance_LSFT_reset(qk_tap_dance_state_t * state, void * user_data) {
// Tap Dance definitions
qk_tap_dance_action_t tap_dance_actions[] = {
// Tap once for shift, twice for Caps Lock
[TD_LSFT_CAPS_WIN] = ACTION_TAP_DANCE_FN_ADVANCED(dance_LSFT_each_tap, NULL, dance_LSFT_reset),
// Tap once for Escape, twice to reset to base layer
//[TD_ESC_BASELYR] = ACTION_TAP_DANCE_LAYER_MOVE(KC_ESC, _BASE)
[TD_LSFT_CAPS_WIN] = ACTION_TAP_DANCE_FN_ADVANCED(dance_LSFT_each_tap, NULL, dance_LSFT_reset)
};

// RGB NIGHT MODE
Expand Down Expand Up @@ -138,9 +136,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t * record) {
// User configuration toggles
case PRNCONF: // Print verbose status of all user_config toggles (open a text editor before engaging!!)
if (record->event.pressed) {
SEND_STRING(SS_TAP(X_ENT)"gourdo1's GMMK Pro User Settings. Press [FN]+<number key> to toggle each."SS_TAP(X_ENT));
SEND_STRING("Config also visible by holding [FN] and viewing RGB under number keys."SS_TAP(X_ENT));
SEND_STRING("========================================================================="SS_TAP(X_ENT));
SEND_STRING(SS_TAP(X_ENT)"--------------<<<<< gourdo1's GMMK Pro User Settings >>>>>-------------"SS_TAP(X_ENT));
SEND_STRING("Hold [FN] and the number corresponding to a setting below to toggle it."SS_TAP(X_ENT));
SEND_STRING("Config also visible by holding [FN] and viewing RGB under number keys. "SS_TAP(X_ENT));
SEND_STRING("======================================================================="SS_TAP(X_ENT));
SEND_STRING("1. CapsLock RGB highlight alpha keys ");
if (user_config.rgb_hilite_caps) {
SEND_STRING("[ON]"SS_TAP(X_ENT));
Expand Down Expand Up @@ -556,18 +555,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t * record) {
return true;
};

uint16_t get_tapping_term(uint16_t keycode, keyrecord_t * record) {
switch (keycode) {
case KC_SFTUP:
return 300;
case KC_RAISESPC:
case KC_LOWERSPC:
return 450;
default:
return TAPPING_TERM;
}
}

// Define custom Caps Word continuity characters
bool caps_word_press_user(uint16_t keycode) {
switch (keycode) {
Expand Down
4 changes: 0 additions & 4 deletions users/gourdo1/gourdo1.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ enum custom_user_layers {
#define CT_PGDN RCTL(KC_PGDN)
#define CT_HOME RCTL(KC_HOME)
#define CT_END RCTL(KC_END)
#define KC_SFTUP RSFT_T(KC_UP) // Shift when held, Up arrow when tapped
#define KC_RAISESPC LT(_MOUSEKEY, KC_SPC) // _MOUSEKEY layer mod when held, space when tapped
#define KC_LOWERSPC LT(_NUMPADMOUSE, KC_SPC) // _NUMPAD-MOUSE layer mod when held, space when tapped
//#define KC_SHIFTSPC LSFT(KC_SPC)
#define SWAP_L SGUI(KC_LEFT) // Swap application to left display
#define SWAP_R SGUI(KC_RGHT) // Swap application to right display

Expand Down