From 0308d822e91b4d42bdca85481a84d2dc12707372 Mon Sep 17 00:00:00 2001 From: Jonavin Date: Tue, 12 Oct 2021 14:03:22 -0400 Subject: [PATCH 01/17] add KC_SFTUP, Shift when held, Up arrow when tap --- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 2 +- users/jonavin/jonavin.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index b5b082965811..16e60a5e2ad7 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MUTE, KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGDN, TT(_RAISE), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFTCAPSWIN,KC_Z, KC_X, KC_C, KC_V, KC_B, LT(_LOWER,KC_B), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_RSFT, + KC_LSFTCAPSWIN,KC_Z, KC_X, KC_C, KC_V, KC_B, LT(_LOWER,KC_B), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTUP,KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), LT(_RAISE,KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN1] = LAYOUT( diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h index feaf6b6a15fb..c23ce7cb6dbf 100644 --- a/users/jonavin/jonavin.h +++ b/users/jonavin/jonavin.h @@ -55,6 +55,7 @@ enum custom_user_keycodes { #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 #ifdef TD_LSFT_CAPSLOCK_ENABLE // Tap Dance Definitions From b5ddc89d2e58bbc613a766ddb88613973b99f175 Mon Sep 17 00:00:00 2001 From: jonavin <71780717+Jonavin@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:21:59 -0400 Subject: [PATCH 02/17] Update readme.md --- users/jonavin/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md index 9fccb8c73cf6..f7fad4d5e9b1 100644 --- a/users/jonavin/readme.md +++ b/users/jonavin/readme.md @@ -32,6 +32,7 @@ KEYCODES: - CT_PGDN Ctrl-PgDn - CT_HOME Ctrl-HOme - CT_END Ctrl-End +- KC_SFTUP RShift when held, Up arrow when tapped - When EMOTICON_ENABLE = yes - EMO_SHRUG `\_("/)_/` @@ -39,6 +40,7 @@ KEYCODES: - EMD_TEARS (T_T) - EMO_NERVOUS (~_~;) - EMO_JOY (^o^) +- EMO_SAD :'-( AVAILABLE ENCODER ACTIONS: From 46a0a8998c229837dfc700da8e170b21da6f2706 Mon Sep 17 00:00:00 2001 From: jonavin <71780717+Jonavin@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:28:46 -0400 Subject: [PATCH 03/17] Update readme.md --- keyboards/mechwild/obe/keymaps/jonavin/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/readme.md b/keyboards/mechwild/obe/keymaps/jonavin/readme.md index d60958a4e9e8..0ccd62d76f03 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/readme.md +++ b/keyboards/mechwild/obe/keymaps/jonavin/readme.md @@ -1,6 +1,6 @@ # Jonavin's MechWild Orange Boy Ergo keymap ---> This keymap makes user of user/jonavin userspace +--> This keymap makes use of user/jonavin userspace Features - Split spacebars, Split Backspace @@ -16,6 +16,7 @@ Features - provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry - left spacebar Backspace - add double tap of Left Shift to toggle Caps Lock +- Uo arrow is also Shift when held rules.mk OPTIONS - Active features from userspace @@ -42,5 +43,4 @@ EMOTICON_ENABLE - adds EMO_ keycodes for text emojis ## All layers diagram -![image](https://user-images.githubusercontent.com/71780717/135770721-ab263532-f645-4903-99cb-749549944e15.png) - +![image](https://user-images.githubusercontent.com/71780717/137009548-0d260f96-e3a9-4064-a897-9968ce461b38.png) From a8203416b0eed710d78284af36373bd087115858 Mon Sep 17 00:00:00 2001 From: jonavin <71780717+Jonavin@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:29:08 -0400 Subject: [PATCH 04/17] Update readme.md --- keyboards/mechwild/obe/keymaps/jonavin/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/readme.md b/keyboards/mechwild/obe/keymaps/jonavin/readme.md index 0ccd62d76f03..3be109f42755 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/readme.md +++ b/keyboards/mechwild/obe/keymaps/jonavin/readme.md @@ -16,7 +16,7 @@ Features - provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry - left spacebar Backspace - add double tap of Left Shift to toggle Caps Lock -- Uo arrow is also Shift when held +- Up arrow is also Shift when held rules.mk OPTIONS - Active features from userspace From 44dca07bf08b1543cfac5ce5b2970d349f1e3b83 Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Tue, 12 Oct 2021 22:26:40 -0400 Subject: [PATCH 05/17] add INVERT_NUMLOCK_ENABLE option --- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 8 +++++++- keyboards/mechwild/obe/keymaps/jonavin/rules.mk | 1 + users/jonavin/rules.mk | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index 16e60a5e2ad7..e3abba3df279 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -91,7 +91,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { rgblight_set_layer_state(_rgbWINLOCK, keymap_config.no_gui); - return true; + writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + #ifdef INVERT_NUMLOCK_ENABLE + writePin(LED_NUM_LOCK_PIN, !led_state.num_lock); // inverse numlock indicator override + #else + writePin(LED_NUM_LOCK_PIN, led_state.num_lock); // normal, light LED when numlock on + #endif // INVERT_NUMLOCK_ENABLE + return false; } layer_state_t layer_state_set_user(layer_state_t state) { diff --git a/keyboards/mechwild/obe/keymaps/jonavin/rules.mk b/keyboards/mechwild/obe/keymaps/jonavin/rules.mk index e371b6349843..acce10fb6b48 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/rules.mk +++ b/keyboards/mechwild/obe/keymaps/jonavin/rules.mk @@ -9,3 +9,4 @@ TD_LSFT_CAPSLOCK_ENABLE = yes STARTUP_NUMLOCK_ON = yes ENCODER_DEFAULTACTIONS_ENABLE = yes EMOTICON_ENABLE = yes +INVERT_NUMLOCK_ENABLE = yes diff --git a/users/jonavin/rules.mk b/users/jonavin/rules.mk index eb279f6290b3..e2ffa7624043 100644 --- a/users/jonavin/rules.mk +++ b/users/jonavin/rules.mk @@ -17,3 +17,6 @@ endif ifeq ($(strip $(EMOTICON_ENABLE)), yes) OPT_DEFS += -DEMOTICON_ENABLE endif +ifeq ($(strip $(INVERT_NUMLOCK_ENABLE)), yes) + OPT_DEFS += -DINVERT_NUMLOCK_ENABLE +endif From b9a4a4d3adffc0793459c12ff318cac2511ff0bc Mon Sep 17 00:00:00 2001 From: jonavin <71780717+Jonavin@users.noreply.github.com> Date: Tue, 12 Oct 2021 22:29:39 -0400 Subject: [PATCH 06/17] Update readme.md --- keyboards/mechwild/obe/keymaps/jonavin/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/readme.md b/keyboards/mechwild/obe/keymaps/jonavin/readme.md index 3be109f42755..166eca3a867a 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/readme.md +++ b/keyboards/mechwild/obe/keymaps/jonavin/readme.md @@ -42,5 +42,8 @@ IDLE_TIMEOUT_ENABLE = yes EMOTICON_ENABLE - adds EMO_ keycodes for text emojis +INVERT_NUMLOCK_ENABLE + - inverts the Num lock indicator, LED is on when num lokc is off + ## All layers diagram ![image](https://user-images.githubusercontent.com/71780717/137009548-0d260f96-e3a9-4064-a897-9968ce461b38.png) From 314cfa7f0210b139842819e037f1d4319ce1d6b0 Mon Sep 17 00:00:00 2001 From: jonavin <71780717+Jonavin@users.noreply.github.com> Date: Tue, 12 Oct 2021 22:32:22 -0400 Subject: [PATCH 07/17] Update readme.md --- users/jonavin/readme.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md index f7fad4d5e9b1..d0ff1c47f54a 100644 --- a/users/jonavin/readme.md +++ b/users/jonavin/readme.md @@ -81,7 +81,15 @@ IDLE_TIMEOUT_ENABLE = yes - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically - When enabled, use this in the keymap for an additional matrix processing: void matrix_scan_keymap(void) -- Functions: +EMOTICON_ENABLE +- adds EMO_ keycodes for text emojis + +INVERT_NUMLOCK_ENABLE +- inverts the Num lock indicator, LED is on when num lokc is off + + +FUNCTIONS +------------------------ - u16int_t get_timeout_threshold(void) // returns the current timeout threshold - void timeout_update_threshold(bool increase) // change threshold: true = increase, false = decrease - void timeout_reset_timer(void) // resets timer (put in process_record_user if you override it) From ea285be420d994068ddca204b9133d6176e0c4d7 Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Tue, 12 Oct 2021 22:41:59 -0400 Subject: [PATCH 08/17] Add INVERT_NUMLOCK_ENABLE option to gmmk pro --- .../gmmk/pro/ansi/keymaps/jonavin/keymap.c | 17 +++++++++++++---- .../gmmk/pro/ansi/keymaps/jonavin/readme.md | 3 +++ .../gmmk/pro/ansi/keymaps/jonavin/rules.mk | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c index f37abfac30c3..d4915d98a80c 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c +++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c @@ -124,10 +124,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { rgb_matrix_set_color(LED_L1, RGB_GREEN); rgb_matrix_set_color(LED_L2, RGB_GREEN); } - if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF - rgb_matrix_set_color(LED_L3, RGB_MAGENTA); - rgb_matrix_set_color(LED_L4, RGB_MAGENTA); - } + + #ifdef INVERT_NUMLOCK_ENABLE + if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF + rgb_matrix_set_color(LED_L3, RGB_MAGENTA); + rgb_matrix_set_color(LED_L4, RGB_MAGENTA); + } + #else + if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // Normal, on if NUM lock is ON + rgb_matrix_set_color(LED_L3, RGB_MAGENTA); + rgb_matrix_set_color(LED_L4, RGB_MAGENTA); + } + #endif // INVERT_NUMLOCK_ENABLE + if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { rgb_matrix_set_color(LED_L5, RGB_RED); rgb_matrix_set_color(LED_L6, RGB_RED); diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md index 2aa910e0c7a9..6572f0290d03 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md @@ -44,6 +44,9 @@ TD_LSFT_CAPSLOCK_ENABLE = yes IDLE_TIMEOUT_ENABLE = yes - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically +INVERT_NUMLOCK_ENABLE + - inverts the Num lock indicator, LED is on when num lokc is off + COLEMAK_LAYER_ENABLE = yes - Enabled optional 5th layer for COLEMAK layout - Use Shift and encoder to enter 5th layer, right led indicator lights up BLUE diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk index 81b84eea7ff0..e8cf63b44e55 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk +++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk @@ -9,3 +9,4 @@ STARTUP_NUMLOCK_ON = yes ENCODER_DEFAULTACTIONS_ENABLE = no COLEMAK_LAYER_ENABLE = yes #Enable Colemak layer / set to no to disable +INVERT_NUMLOCK_ENABLE = yes From 663e4b3df18912fc25fc737955d2a937434f5786 Mon Sep 17 00:00:00 2001 From: Jonavin Date: Thu, 14 Oct 2021 12:10:51 -0400 Subject: [PATCH 09/17] Adjust keymap - include EEPROM reset --- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index e3abba3df279..92aa112fe159 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -39,16 +39,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_WINLCK,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END ), [_LOWER] = LAYOUT( - KC_NO, KC_TILD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_TRNS, KC_DEL, + EEP_RST, KC_TILD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_TRNS, KC_DEL, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EMO_TEARS, EMO_SAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_HUD, KC_NO, KC_NO, EMO_SHRUG,KC_NO, KC_NO, KC_NO, KC_NO, EMO_JOY, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, EMO_CONFUSE,KC_NO,KC_NO,KC_TRNS,EMO_NERVOUS,KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_RMOD, RGB_SPI ), [_RAISE] = LAYOUT( - KC_NO, KC_TILD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_PSLS, KC_DEL, - KC_NO, KC_NO, KC_HOME,KC_UP, KC_END, KC_PGUP, KC_NO, KC_TAB, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO, KC_PEQL, - KC_NO, TT(_RAISE),KC_LEFT,KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_PAST, KC_PENT, + KC_NO, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_PSLS, KC_DEL, + KC_VOLU, KC_NO, KC_HOME,KC_UP, KC_END, KC_PGUP, KC_NO, KC_TAB, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO, KC_PEQL, + KC_VOLD,TT(_RAISE),KC_LEFT,KC_DOWN,KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_PAST, KC_PENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_P0, KC_00, KC_NO, KC_PDOT, KC_PSLS, CT_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CT_HOME, CT_PGDN, CT_END ) From dcca805a491b95577621f684aa27ffa42772584b Mon Sep 17 00:00:00 2001 From: jonavin <71780717+Jonavin@users.noreply.github.com> Date: Thu, 14 Oct 2021 12:14:59 -0400 Subject: [PATCH 10/17] Update readme.md --- keyboards/mechwild/obe/keymaps/jonavin/readme.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/readme.md b/keyboards/mechwild/obe/keymaps/jonavin/readme.md index 166eca3a867a..b785a9de9a3a 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/readme.md +++ b/keyboards/mechwild/obe/keymaps/jonavin/readme.md @@ -4,6 +4,7 @@ Features - Split spacebars, Split Backspace + - Inverted Num Lock indicator (LED on when num lock if off) - RGB Winlock indicator (requires LED stripto be installed) - RGB Layer indicators: FN/MO1 - Purple; LOWER/MO2 - Yellow; RAISE/MO3/NumPad - Green - quick demo https://youtu.be/gR1awbsouLk @@ -11,7 +12,7 @@ Features - Add PrtScr, Scroll Lock, Break, NumLock to Fn layer - Implement Win key lock using Fn+Win - Layer 2 (LOWER) when right B is held -- for emoticons -- Layer 2 RGB functions +- Layer 2 RGB functions, and EEPROM Reset - Layer 3 (RAISE) mod on Caps Lock with double-tap to switch to this layer, double tap to switch back - provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry - left spacebar Backspace @@ -46,4 +47,4 @@ INVERT_NUMLOCK_ENABLE - inverts the Num lock indicator, LED is on when num lokc is off ## All layers diagram -![image](https://user-images.githubusercontent.com/71780717/137009548-0d260f96-e3a9-4064-a897-9968ce461b38.png) +![image](https://user-images.githubusercontent.com/71780717/137356366-6b23c71b-9499-473e-a1e3-c65644135fc6.png) From 35b0351900227be30d753e02d2aab1876ee37ec3 Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Thu, 14 Oct 2021 15:01:14 -0400 Subject: [PATCH 11/17] add inverted NUM Lock indicator --- keyboards/keebio/quefrency/keymaps/jonavin/keymap.c | 13 ++++++++++++- .../keebio/quefrency/keymaps/jonavin/readme.md | 1 + keyboards/keebio/quefrency/keymaps/jonavin/rules.mk | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c index 415f554e2693..0e03bbe45bbb 100644 --- a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c +++ b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c @@ -89,6 +89,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { enum custom_rgblight_layers { _rgbCAPS, + _rgbNUMLOCK, _rgbWINLOCK, _rgbFN, _rgbNUMPAD, @@ -98,7 +99,9 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { const rgblight_segment_t PROGMEM _rgb_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( {14, 1, HSV_RED} // Light 4 LEDs, starting with LED 6 ); - const rgblight_segment_t PROGMEM _rgb_winlock_layer[] = RGBLIGHT_LAYER_SEGMENTS( + const rgblight_segment_t PROGMEM _rgb_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS( + {15, 1, HSV_BLUE} + ); const rgblight_segment_t PROGMEM _rgb_winlock_layer[] = RGBLIGHT_LAYER_SEGMENTS( {13, 1, HSV_PURPLE} // Light 4 LEDs, starting with LED 6 ); const rgblight_segment_t PROGMEM _rgb_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS( @@ -113,6 +116,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { const rgblight_segment_t* const PROGMEM _rgb_layers[] = RGBLIGHT_LAYERS_LIST( _rgb_capslock_layer, + _rgb_numlock_layer, _rgb_winlock_layer, _rgb_fn_layer, _rgb_numpad_layer @@ -120,6 +124,13 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { bool led_update_user(led_t led_state) { rgblight_set_layer_state(_rgbCAPS, led_state.caps_lock); + + #ifdef INVERT_NUMLOCK_ENABLE + rgblight_set_layer_state(_rgbNUMLOCK, !led_state.num_lock); // inverse numlock indicator override + #else + rgblight_set_layer_state(_rgbNUMLOCK, led_state.num_lock); // normal, light LED when numlock on + #endif // INVERT_NUMLOCK_ENABLE + rgblight_set_layer_state(_rgbWINLOCK, keymap_config.no_gui); return true; } diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/readme.md b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md index 4833c5b62624..c8b73d656baa 100644 --- a/keyboards/keebio/quefrency/keymaps/jonavin/readme.md +++ b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md @@ -17,6 +17,7 @@ - additional RGB function key binds to arrow on Fn layer - Add capslock indicator, win key lock indicator - Fn and layer 2 indicators using RGB underglow + - Inverted NUM lock indicator (light on when NUM lock is off when INVERT_NUMLOCK_ENABLE = yes in rules.mk) rules.mk OPTIONS - Active features from userspace STARTUP_NUMLOCK_ON = yes diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk b/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk index f27873bb8000..1ac6dec8a327 100644 --- a/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk +++ b/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk @@ -7,3 +7,4 @@ TAP_DANCE_ENABLE = yes TD_LSFT_CAPSLOCK_ENABLE = yes STARTUP_NUMLOCK_ON = yes +INVERT_NUMLOCK_ENABLE = yes From 7e3bda0386971c7d36bceb0ecf8a10703ba2ca96 Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Thu, 14 Oct 2021 15:23:10 -0400 Subject: [PATCH 12/17] Fix layer space to Backspace --- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 12 ++++++------ users/jonavin/readme.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index 92aa112fe159..049d796e5091 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -42,15 +42,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { EEP_RST, KC_TILD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_TRNS, KC_DEL, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EMO_TEARS, EMO_SAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, RGB_HUD, KC_NO, KC_NO, EMO_SHRUG,KC_NO, KC_NO, KC_NO, KC_NO, EMO_JOY, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_NO, KC_NO, KC_NO, EMO_CONFUSE,KC_NO,KC_NO,KC_TRNS,EMO_NERVOUS,KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_TRNS, - KC_TRNS, KC_APP, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_RMOD, RGB_SPI + KC_NO, KC_NO, KC_NO, EMO_CONFUSE,KC_NO,KC_NO,KC_TRNS,EMO_NERVOUS, KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_TRNS, + KC_TRNS, KC_APP, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_RMOD,RGB_SPI ), [_RAISE] = LAYOUT( - KC_NO, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_PSLS, KC_DEL, - KC_VOLU, KC_NO, KC_HOME,KC_UP, KC_END, KC_PGUP, KC_NO, KC_TAB, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO, KC_PEQL, - KC_VOLD,TT(_RAISE),KC_LEFT,KC_DOWN,KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_PAST, KC_PENT, + KC_NO, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_PSLS, KC_DEL, + KC_VOLU, KC_NO, KC_HOME,KC_UP, KC_END, KC_PGUP, KC_NO, KC_TAB, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO, KC_PEQL, + KC_VOLD,TT(_RAISE),KC_LEFT,KC_DOWN,KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_PAST, KC_PENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_P0, KC_00, KC_NO, KC_PDOT, KC_PSLS, CT_PGUP, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CT_HOME, CT_PGDN, CT_END + KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CT_HOME, CT_PGDN, CT_END ) }; diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md index d0ff1c47f54a..89eabb54e49f 100644 --- a/users/jonavin/readme.md +++ b/users/jonavin/readme.md @@ -85,7 +85,7 @@ EMOTICON_ENABLE - adds EMO_ keycodes for text emojis INVERT_NUMLOCK_ENABLE -- inverts the Num lock indicator, LED is on when num lokc is off +- inverts the Num lock indicator, LED is on when num lock is off FUNCTIONS From 2f95ed24abacb8fa19ed3a404e7cdbb8145ad6f5 Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Thu, 14 Oct 2021 19:53:44 -0400 Subject: [PATCH 13/17] adjust startup rgb colour --- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index 049d796e5091..0a7e6a87cdc2 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -19,7 +19,7 @@ #ifdef RGBLIGHT_ENABLE // Custom RGB Colours - #define RGB_OBE_BOW 0x00, 0xE4, 0xFF // colour for matching keycaps + #define RGB_OBE_BOW 187, 92, 96 // colour for matching keycaps #endif // RGBLIGHT_ENABLE const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -58,8 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { enum custom_rgblight_layers { - _rgbWINLOCK, - _rgbFN, + _rgbWINLOCK, _rgbFN, _rgbLOWER, _rgbRAISE }; From 48a7addc6f6f0ab770bb5ce251074dc393b70c4d Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Sat, 16 Oct 2021 12:20:38 -0400 Subject: [PATCH 14/17] fix startup rgb colour --- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index 0a7e6a87cdc2..1276cb69eda1 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -19,7 +19,7 @@ #ifdef RGBLIGHT_ENABLE // Custom RGB Colours - #define RGB_OBE_BOW 187, 92, 96 // colour for matching keycaps + #define HSV_OBE_BOW 180, 100, 100 // colour for matching keycaps #endif // RGBLIGHT_ENABLE const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -111,8 +111,8 @@ void keyboard_post_init_keymap(void) { // keyboard_post_init_user() moved to userspace #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); - rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_setrgb(RGB_OBE_BOW); // Default startup colour + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + rgblight_sethsv_noeeprom(HSV_OBE_BOW); // Default startup colour rgblight_layers = _rgb_layers; #endif } From d12dd03ce392c5ba9ba5aecac2121be8010295a6 Mon Sep 17 00:00:00 2001 From: Jonavin Date: Mon, 18 Oct 2021 22:24:49 -0400 Subject: [PATCH 15/17] rename to INVERT_NUMLOCK_INDICATOR for clarity --- keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c | 4 ++-- keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md | 2 +- keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk | 2 +- keyboards/keebio/quefrency/keymaps/jonavin/keymap.c | 4 ++-- keyboards/keebio/quefrency/keymaps/jonavin/readme.md | 2 +- keyboards/keebio/quefrency/keymaps/jonavin/rules.mk | 2 +- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 4 ++-- keyboards/mechwild/obe/keymaps/jonavin/readme.md | 2 +- keyboards/mechwild/obe/keymaps/jonavin/rules.mk | 2 +- users/jonavin/readme.md | 2 +- users/jonavin/rules.mk | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c index d4915d98a80c..0d318885f482 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c +++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c @@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { rgb_matrix_set_color(LED_L2, RGB_GREEN); } - #ifdef INVERT_NUMLOCK_ENABLE + #ifdef INVERT_NUMLOCK_INDICATOR if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) { // on if NUM lock is OFF rgb_matrix_set_color(LED_L3, RGB_MAGENTA); rgb_matrix_set_color(LED_L4, RGB_MAGENTA); @@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { rgb_matrix_set_color(LED_L3, RGB_MAGENTA); rgb_matrix_set_color(LED_L4, RGB_MAGENTA); } - #endif // INVERT_NUMLOCK_ENABLE + #endif // INVERT_NUMLOCK_INDICATOR if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) { rgb_matrix_set_color(LED_L5, RGB_RED); diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md index 6572f0290d03..6e8d6ba8a5ee 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md +++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md @@ -44,7 +44,7 @@ TD_LSFT_CAPSLOCK_ENABLE = yes IDLE_TIMEOUT_ENABLE = yes - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically -INVERT_NUMLOCK_ENABLE +INVERT_NUMLOCK_INDICATOR - inverts the Num lock indicator, LED is on when num lokc is off COLEMAK_LAYER_ENABLE = yes diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk index e8cf63b44e55..90ea42dee51e 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk +++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk @@ -9,4 +9,4 @@ STARTUP_NUMLOCK_ON = yes ENCODER_DEFAULTACTIONS_ENABLE = no COLEMAK_LAYER_ENABLE = yes #Enable Colemak layer / set to no to disable -INVERT_NUMLOCK_ENABLE = yes +INVERT_NUMLOCK_INDICATOR = yes diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c index 0e03bbe45bbb..81b8497ca251 100644 --- a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c +++ b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c @@ -125,11 +125,11 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { bool led_update_user(led_t led_state) { rgblight_set_layer_state(_rgbCAPS, led_state.caps_lock); - #ifdef INVERT_NUMLOCK_ENABLE + #ifdef INVERT_NUMLOCK_INDICATOR rgblight_set_layer_state(_rgbNUMLOCK, !led_state.num_lock); // inverse numlock indicator override #else rgblight_set_layer_state(_rgbNUMLOCK, led_state.num_lock); // normal, light LED when numlock on - #endif // INVERT_NUMLOCK_ENABLE + #endif // INVERT_NUMLOCK_INDICATOR rgblight_set_layer_state(_rgbWINLOCK, keymap_config.no_gui); return true; diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/readme.md b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md index c8b73d656baa..dad817e8ec42 100644 --- a/keyboards/keebio/quefrency/keymaps/jonavin/readme.md +++ b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md @@ -17,7 +17,7 @@ - additional RGB function key binds to arrow on Fn layer - Add capslock indicator, win key lock indicator - Fn and layer 2 indicators using RGB underglow - - Inverted NUM lock indicator (light on when NUM lock is off when INVERT_NUMLOCK_ENABLE = yes in rules.mk) + - Inverted NUM lock indicator (light on when NUM lock is off when INVERT_NUMLOCK_INDICATOR = yes in rules.mk) rules.mk OPTIONS - Active features from userspace STARTUP_NUMLOCK_ON = yes diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk b/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk index 1ac6dec8a327..ac2865f60094 100644 --- a/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk +++ b/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk @@ -7,4 +7,4 @@ TAP_DANCE_ENABLE = yes TD_LSFT_CAPSLOCK_ENABLE = yes STARTUP_NUMLOCK_ON = yes -INVERT_NUMLOCK_ENABLE = yes +INVERT_NUMLOCK_INDICATOR = yes diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index 1276cb69eda1..8f3d38786b73 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -91,11 +91,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool led_update_user(led_t led_state) { rgblight_set_layer_state(_rgbWINLOCK, keymap_config.no_gui); writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - #ifdef INVERT_NUMLOCK_ENABLE + #ifdef INVERT_NUMLOCK_INDICATOR writePin(LED_NUM_LOCK_PIN, !led_state.num_lock); // inverse numlock indicator override #else writePin(LED_NUM_LOCK_PIN, led_state.num_lock); // normal, light LED when numlock on - #endif // INVERT_NUMLOCK_ENABLE + #endif // INVERT_NUMLOCK_INDICATOR return false; } diff --git a/keyboards/mechwild/obe/keymaps/jonavin/readme.md b/keyboards/mechwild/obe/keymaps/jonavin/readme.md index b785a9de9a3a..f903a36f12c1 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/readme.md +++ b/keyboards/mechwild/obe/keymaps/jonavin/readme.md @@ -43,7 +43,7 @@ IDLE_TIMEOUT_ENABLE = yes EMOTICON_ENABLE - adds EMO_ keycodes for text emojis -INVERT_NUMLOCK_ENABLE +INVERT_NUMLOCK_INDICATOR - inverts the Num lock indicator, LED is on when num lokc is off ## All layers diagram diff --git a/keyboards/mechwild/obe/keymaps/jonavin/rules.mk b/keyboards/mechwild/obe/keymaps/jonavin/rules.mk index acce10fb6b48..008d0e1de941 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/rules.mk +++ b/keyboards/mechwild/obe/keymaps/jonavin/rules.mk @@ -9,4 +9,4 @@ TD_LSFT_CAPSLOCK_ENABLE = yes STARTUP_NUMLOCK_ON = yes ENCODER_DEFAULTACTIONS_ENABLE = yes EMOTICON_ENABLE = yes -INVERT_NUMLOCK_ENABLE = yes +INVERT_NUMLOCK_INDICATOR = yes diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md index 89eabb54e49f..0101f647a021 100644 --- a/users/jonavin/readme.md +++ b/users/jonavin/readme.md @@ -84,7 +84,7 @@ IDLE_TIMEOUT_ENABLE = yes EMOTICON_ENABLE - adds EMO_ keycodes for text emojis -INVERT_NUMLOCK_ENABLE +INVERT_NUMLOCK_INDICATOR - inverts the Num lock indicator, LED is on when num lock is off diff --git a/users/jonavin/rules.mk b/users/jonavin/rules.mk index e2ffa7624043..646002124713 100644 --- a/users/jonavin/rules.mk +++ b/users/jonavin/rules.mk @@ -17,6 +17,6 @@ endif ifeq ($(strip $(EMOTICON_ENABLE)), yes) OPT_DEFS += -DEMOTICON_ENABLE endif -ifeq ($(strip $(INVERT_NUMLOCK_ENABLE)), yes) - OPT_DEFS += -DINVERT_NUMLOCK_ENABLE +ifeq ($(strip $(INVERT_NUMLOCK_INDICATOR)), yes) + OPT_DEFS += -DINVERT_NUMLOCK_INDICATOR endif From a9fd4ae1bcd0b55d9bf449fbaa44b7d6586a9a84 Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Tue, 19 Oct 2021 19:56:11 -0400 Subject: [PATCH 16/17] adjust TAPPING_TERM_PER_KEY for LT(,SPC) and SFTUP --- keyboards/mechwild/obe/keymaps/jonavin/keymap.c | 2 +- users/jonavin/config.h | 1 + users/jonavin/jonavin.c | 12 ++++++++++++ users/jonavin/jonavin.h | 3 +++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c index 1276cb69eda1..4a84fdfd7394 100644 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGDN, TT(_RAISE), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFTCAPSWIN,KC_Z, KC_X, KC_C, KC_V, KC_B, LT(_LOWER,KC_B), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTUP,KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), LT(_RAISE,KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RAISESPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN1] = LAYOUT( KC_NO, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_INS, diff --git a/users/jonavin/config.h b/users/jonavin/config.h index 440d222df0c1..7b6e335e3c58 100644 --- a/users/jonavin/config.h +++ b/users/jonavin/config.h @@ -23,6 +23,7 @@ #define GRAVE_ESC_CTRL_OVERRIDE // Always send Escape if Control is pressed #define TAPPING_TERM 180 +#define TAPPING_TERM_PER_KEY #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR diff --git a/users/jonavin/jonavin.c b/users/jonavin/jonavin.c index 1a0760ea8f4f..367601dfbabf 100644 --- a/users/jonavin/jonavin.c +++ b/users/jonavin/jonavin.c @@ -341,6 +341,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { }; +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; + } +} + // Turn on/off NUM LOCK if current state is different void activate_numlock(bool turn_on) { if (IS_HOST_LED_ON(USB_LED_NUM_LOCK) != turn_on) { diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h index c23ce7cb6dbf..21b972ed75e3 100644 --- a/users/jonavin/jonavin.h +++ b/users/jonavin/jonavin.h @@ -56,6 +56,9 @@ enum custom_user_keycodes { #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(_RAISE,KC_SPC) // _RAISE layer mod when held, space when tapped +#define KC_LOWERSPC LT(_LOWER,KC_SPC) // _LOWER layer mod when held, space when tapped + #ifdef TD_LSFT_CAPSLOCK_ENABLE // Tap Dance Definitions From 91ac647b3b1a45782227276f733490000b113398 Mon Sep 17 00:00:00 2001 From: Jonavin <=> Date: Tue, 19 Oct 2021 20:04:19 -0400 Subject: [PATCH 17/17] update readme --- users/jonavin/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md index 0101f647a021..1b064ddc3cdd 100644 --- a/users/jonavin/readme.md +++ b/users/jonavin/readme.md @@ -33,6 +33,8 @@ KEYCODES: - CT_HOME Ctrl-HOme - CT_END Ctrl-End - KC_SFTUP RShift when held, Up arrow when tapped +- KC_RAISESPC _RAISE layer mod when held, space when tapped +- KC_LOWERSPC _LOWER layer mod when held, space when tapped - When EMOTICON_ENABLE = yes - EMO_SHRUG `\_("/)_/`