Skip to content

Commit

Permalink
Add shift keys
Browse files Browse the repository at this point in the history
  • Loading branch information
paulomp90 committed Apr 3, 2023
1 parent 00c55c7 commit 7fee700
Show file tree
Hide file tree
Showing 5 changed files with 183 additions and 28 deletions.
13 changes: 2 additions & 11 deletions keyboards/lily58/keymaps/paulomp90/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Select hand configuration */

#define MASTER_LEFT
// #define MASTER_RIGHT
// #define EE_HANDS

#define QUICK_TAP_TERM 0
#define TAPPING_TERM 100
#define TAPPING_TERM 150

#undef RGBLED_NUM
#define RGBLIGHT_EFFECT_BREATHING
Expand All @@ -46,11 +44,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17

#define TAP_CODE_DELAY 10

// Underglow
/*
#undef RGBLED_NUM
#define RGBLED_NUM 14 // Number of LEDs
#define RGBLIGHT_SLEEP
*/
#define TAP_CODE_DELAY 10
54 changes: 54 additions & 0 deletions keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
// Copyright 2021-2023 Google LLC.
// SPDX-License-Identifier: Apache-2.0

#include "custom_shift_keys.h"

bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record) {
static uint16_t registered_keycode = KC_NO;

// If a custom shift key is registered, then this event is either
// releasing it or manipulating another key at the same time. Either way,
// we release the currently registered key.
if (registered_keycode != KC_NO) {
unregister_code16(registered_keycode);
registered_keycode = KC_NO;
}

if (record->event.pressed) { // Press event.
const uint8_t mods = get_mods();
#ifndef NO_ACTION_ONESHOT
if ((mods | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
#else
if ((mods | get_weak_mods()) & MOD_MASK_SHIFT) { // Shift is held.
#endif // NO_ACTION_ONESHOT
// Continue default handling if this is a tap-hold key being held.
if ((IS_QK_MOD_TAP(keycode) || IS_QK_LAYER_TAP(keycode)) &&
record->tap.count == 0) {
return true;
}

// Search for a custom shift key whose keycode is `keycode`.
for (int i = 0; i < NUM_CUSTOM_SHIFT_KEYS; ++i) {
if (keycode == custom_shift_keys[i].keycode) {
registered_keycode = custom_shift_keys[i].shifted_keycode;
if (IS_QK_MODS(registered_keycode) && // Should key be shifted?
(QK_MODS_GET_MODS(registered_keycode) & MOD_LSFT) != 0) {
register_code16(registered_keycode); // If so, press directly.
} else {
// If not, cancel shift mods, press the key, and restore mods.
del_weak_mods(MOD_MASK_SHIFT);
#ifndef NO_ACTION_ONESHOT
del_oneshot_mods(MOD_MASK_SHIFT);
#endif // NO_ACTION_ONESHOT
unregister_mods(MOD_MASK_SHIFT);
register_code16(registered_keycode);
set_mods(mods);
}
return false;
}
}
}
}

return true; // Continue with default handling.
}
15 changes: 15 additions & 0 deletions keyboards/lily58/keymaps/paulomp90/features/custom_shift_keys.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright 2021 Google LLC.
// SPDX-License-Identifier: Apache-2.0

#pragma once
#include QMK_KEYBOARD_H

typedef struct {
uint16_t keycode;
uint16_t shifted_keycode;
} custom_shift_key_t;

extern const custom_shift_key_t custom_shift_keys[];
extern uint8_t NUM_CUSTOM_SHIFT_KEYS;

bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record);
117 changes: 105 additions & 12 deletions keyboards/lily58/keymaps/paulomp90/keymap.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include QMK_KEYBOARD_H
#include "keymap_portuguese.h"
#include "features/custom_shift_keys.h"

enum layer_number {
_QWERTY = 0,
Expand All @@ -8,6 +9,36 @@ enum layer_number {
_ADJUST,
};

//-----------------------------
// tap dance shifts

typedef struct {
bool is_press_action;
int state;
} tap;

enum {
SINGLE_TAP = 1,
SINGLE_HOLD = 2,
};

//Tap dance enums
enum {
LEFT_SHIFT = 0,
RIGHT_SHIFT = 1
};
//---------------------
//Shifted values



const custom_shift_key_t custom_shift_keys[] = {
{KC_BSPC , KC_DEL}, // Shift . is ?
};
uint8_t NUM_CUSTOM_SHIFT_KEYS =
sizeof(custom_shift_keys) / sizeof(custom_shift_key_t);

//----------------------
#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)

Expand All @@ -19,41 +50,41 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | Tab | Q | W | E | R | T | | Y | U | I | O | P | +* |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* |LShift| A | S | D | F | G |-------. ,-------| H | J | K | L | Ç | ~ |
* |------+------+------+------+------+------| DEL | | BACK |------+------+------+------+------+------|
* |LShift| A | S | D | F | G |-------. ,-------| H | J | K | L | Ç | BACK |
* |------+------+------+------+------+------| <> | | ´` |------+------+------+------+------+------|
* |LCTRL | Z | X | C | V | B |-------| |-------| N | M | , | . | - |Shift|
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | \| |
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | RAlt |
* | | | |/ / \ \ | | | |
* `-------------------''-------' '------''--------------------'
*/
[_QWERTY] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_EQL,
KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_DEL, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_ENT, RAISE, KC_RGUI, KC_BSLS
TD(LEFT_SHIFT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_BSPC,
KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, TD(RIGHT_SHIFT),
KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_ENT, RAISE, KC_RGUI, KC_RALT
),

/* LOWER+
/* LOWER
* ,-----------------------------------------. ,-----------------------------------------.
* | | | | | | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | BRG- | BRG+ | VOL- | VOL+ | | | | | | | | |
* |------+------+------+------+------+------| |------+------+------+------+------+------|
* | | MUTE | PREV | PLAY | NEXT | |-------. ,-------| | | <> | ºª | ´` | |
* | | MUTE | PREV | PLAY | NEXT | |-------. ,-------| | | \| | ºª | ~^ | |
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |-------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | \| |
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | RAlt |
* | | | |/ / \ \ | | | |
* `-------------------''-------' '------''--------------------'
*/

[_LOWER] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______,_______, _______, _______,
_______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
_______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_GRV, KC_LBRC, KC_RBRC, _______,
_______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_BSLS, KC_LBRC, KC_QUOT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
Expand All @@ -68,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | | | | | | |-------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | \| |
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | RAlt |
* | | | |/ / \ \ | | | |
* `-------------------''-------' '------''--------------------'
*/
Expand All @@ -91,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------| | | |------+------+------+------+------+------|
* | MODE | HUE- | SAT- | VAL- | | |-------| |-------| | | | | | |
* `-----------------------------------------/ / \ \-----------------------------------------'
* | Alt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | \| |
* | LAlt | LGUI |LOWER | /Space / \Enter \ |RAISE | RGUI | RAlt |
* | | | |/ / \ \ | | | |
* `----------------------------' '------''--------------------'
*/
Expand Down Expand Up @@ -146,6 +177,7 @@ bool oled_task_user(void) {
#endif // OLED_ENABLE

bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!process_custom_shift_keys(keycode, record)) { return false; }
if (record->event.pressed) {
#ifdef OLED_ENABLE
set_keylog(keycode, record);
Expand All @@ -154,3 +186,64 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
return true;
}


//---------------------------------
// Tap dance shifts

int cur_dance (tap_dance_state_t *state) {
if (state->count == 1) {
if (state->pressed) return SINGLE_HOLD;
else return SINGLE_TAP;
}
else return 0;
}

static tap lshifttap_state = {
.is_press_action = true,
.state = 0
};

static tap rshifttap_state = {
.is_press_action = true,
.state = 0
};

void lshift_finished (tap_dance_state_t *state, void *user_data) {
lshifttap_state.state = cur_dance(state);
switch (lshifttap_state.state) {
case SINGLE_TAP: register_code16(LALT(KC_LEFT)); break;
case SINGLE_HOLD: register_code(KC_LSFT); break;
}
}

void lshift_reset (tap_dance_state_t *state, void *user_data) {
switch (lshifttap_state.state) {
case SINGLE_TAP: unregister_code16(LALT(KC_LEFT)); break;
case SINGLE_HOLD: unregister_code(KC_LSFT); break;
}
lshifttap_state.state = 0;
}

void rshift_finished (tap_dance_state_t *state, void *user_data) {
rshifttap_state.state = cur_dance(state);
switch (rshifttap_state.state) {
case SINGLE_TAP: register_code16(LALT(KC_RGHT)); break;
case SINGLE_HOLD: register_code(KC_RSFT); break;
}
}

void rshift_reset (tap_dance_state_t *state, void *user_data) {
switch (rshifttap_state.state) {
case SINGLE_TAP: unregister_code16(LALT(KC_RGHT)); break;
case SINGLE_HOLD: unregister_code(KC_RSFT); break;
}
rshifttap_state.state = 0;
}

tap_dance_action_t tap_dance_actions[] = {
[LEFT_SHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lshift_finished, lshift_reset),
[RIGHT_SHIFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rshift_finished, rshift_reset),
};

//-----------------
12 changes: 7 additions & 5 deletions keyboards/lily58/keymaps/paulomp90/rules.mk
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
# MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# CONSOLE_ENABLE = no # Console for debug
# COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
# AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
SWAP_HANDS_ENABLE = no # Enable one-hand typing
# SWAP_HANDS_ENABLE = no # Enable one-hand typing
OLED_ENABLE= yes # OLED display
TAP_DANCE_ENABLE = yes

# If you want to change the display of OLED, you need to change here
SRC += ./lib/rgb_state_reader.c \
./lib/layer_state_reader.c \
./lib/logo_reader.c \
./lib/keylogger.c \
features/custom_shift_keys.c \
# ./lib/mode_icon_reader.c \
# ./lib/host_led_state_reader.c \
# ./lib/timelogger.c \

0 comments on commit 7fee700

Please sign in to comment.