mirrors/qmk_userspace
Watch
1
0
Fork
You've already forked qmk_userspace
 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2026-07-30 21:21:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Updating again

Browse source
This commit is contained in:
Drew Whitney 2025-06-15 17:02:18 -06:00
commit b7207600a4
20 changed files with 49 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TODO.md
View file

@ -1 +1,2 @@
Remove all tap-dance keys. Remove all tap-dance keys.

6
keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.c
View file

@ -20,11 +20,13 @@ void turn_on_caps_word(custom_key_t* custom_key) {
custom_key_t custom_keys[] = { custom_key_t custom_keys[] = {
// _BASE layer // _BASE layer
[NK_Q] = CUSTOM_KEY(KC_Q, 1, REMAP_WITH_OPTIONS(A(KC_F4), MOD_MASK_GUI, REMOVE_TRIGGER, false)), [NK_Q] = CUSTOM_KEY(KC_Q, 1, REMAP_WITH_OPTIONS(A(KC_F4), MOD_MASK_GUI, REMOVE_TRIGGER, false)),
[NK_R] = CUSTOM_KEY(KC_R, 1, REMAP(KC_Y, MOD_MASK_CTRL)),
// _NUM layer // _NUM layer
[NK_COLN] = CUSTOM_KEY(KC_COLN, 1, REMAP(KC_M, MOD_MASK_CTRL)), [NK_COLN] = CUSTOM_KEY(KC_COLN, 1, REMAP(KC_M, MOD_MASK_CTRL)),
[NK_MINS_NUM] = CUSTOM_KEY(KC_MINS, 1, REMAP(KC_Y, MOD_MASK_CTRL)), [NK_MINS_NUM] = CUSTOM_KEY(
KC_MINS, 2, REMAP(KC_R, MOD_MASK_CTRL),
REMAP_WITH_OPTIONS(KC_MINS, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)
),
[NK_1] = CUSTOM_KEY( [NK_1] = CUSTOM_KEY(
KC_1, 2, REMAP(KC_A, MOD_MASK_CTRL), KC_1, 2, REMAP(KC_A, MOD_MASK_CTRL),
REMAP_WITH_OPTIONS(KC_1, MOD_MASK_SHIFT, REMOVE_TRIGGER, false) REMAP_WITH_OPTIONS(KC_1, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)

1
keyboards/keebio/nyquist/rev4/keymaps/drew/custom_keys/mapping.h
View file

@ -15,7 +15,6 @@
enum custom_keycodes { enum custom_keycodes {
// _BASE layer // _BASE layer
NK_Q, NK_Q,
NK_R,
// _NUM layer // _NUM layer
NK_COLN, NK_COLN,
NK_MINS_NUM, NK_MINS_NUM,

5
keyboards/keebio/nyquist/rev4/keymaps/drew/keymap.c
View file

@ -4,6 +4,7 @@
#include "custom_keys/custom_keys.h" #include "custom_keys/custom_keys.h"
#include "custom_keys/mapping.h" #include "custom_keys/mapping.h"
#include "layers.h" #include "layers.h"
#include "tap_dance/tap_dance.c"
#include "tap_dance/tap_dance.h" #include "tap_dance/tap_dance.h"
#include "taphold/taphold_options.h" #include "taphold/taphold_options.h"
@ -13,14 +14,14 @@ bool NAV_enabled = false;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// base // base
[_BASE] = LAYOUT_ortho_4x12( [_BASE] = LAYOUT_ortho_4x12(
NK(NK_ESC), NK(NK_Q), KC_W, KC_E, NK(NK_R), KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NK(NK_BSPC), NK(NK_ESC), NK(NK_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NK(NK_BSPC),
CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
SFT_SFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, ALT_DEL, SFT_SFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, ALT_DEL,
KC_RCTL, LT(_FUNC, KC_MPLY), ALT_T(KC_LALT), TD(TD_CAD_LOCK), GUI_LAUNCH, NUM_SPC, NAV_ENT, ALT_COMP, KC_LEFT, NK(NK_DOWN), NK(NK_UP), KC_RGHT KC_RCTL, LT(_FUNC, KC_MPLY), ALT_T(KC_LALT), TD(TD_CAD_LOCK), GUI_LAUNCH, NUM_SPC, NAV_ENT, ALT_COMP, KC_LEFT, NK(NK_DOWN), NK(NK_UP), KC_RGHT
), ),
// gamer // gamer
[_GAME] = LAYOUT_ortho_4x12( [_GAME] = LAYOUT_ortho_4x12(
KC_TRNS, KC_Q, KC_TRNS, KC_TRNS, KC_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_Q, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS

2
keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.c
View file

@ -1,4 +1,6 @@
#include "tap_dance.h" #include "tap_dance.h"
#include "../common.h"
#include "../custom_keys/alias.h"
tap_dance_action_t tap_dance_actions[] = { tap_dance_action_t tap_dance_actions[] = {
[TD_CAD_LOCK] = ACTION_TAP_DANCE_DOUBLE(CAD, LOCK), [TD_CAD_LOCK] = ACTION_TAP_DANCE_DOUBLE(CAD, LOCK),

2
keyboards/keebio/nyquist/rev4/keymaps/drew/tap_dance/tap_dance.h
View file

@ -5,5 +5,3 @@
enum { enum {
TD_CAD_LOCK, TD_CAD_LOCK,
}; };
extern tap_dance_action_t tap_dance_actions[];

2
keyboards/keebio/nyquist/rev4/keymaps/drew/taphold/taphold_options.h
View file

@ -5,7 +5,7 @@
#include "../custom_keys/alias.h" #include "../custom_keys/alias.h"
#include "../custom_keys/mapping.h" #include "../custom_keys/mapping.h"
#include "../layers.h" #include "../layers.h"
#include "../tap_dance.h" #include "../tap_dance/tap_dance.h"
uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record); uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record);
bool get_permissive_hold(uint16_t keycode, keyrecord_t* record); bool get_permissive_hold(uint16_t keycode, keyrecord_t* record);

4
keyboards/planck/rev7/keymaps/drew/common.h Normal file
View file

@ -0,0 +1,4 @@
#pragma once
#include <stdbool.h>
#include <stdint.h>

4
keyboards/planck/rev7/keymaps/drew/custom_keys/alias.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "../common.h"
#define TAB_FORWARD C(KC_TAB) #define TAB_FORWARD C(KC_TAB)
#define TAB_BACKWARD (C(S(KC_TAB))) #define TAB_BACKWARD (C(S(KC_TAB)))
@ -17,4 +19,4 @@
#define NUM_SPC LT(_NUM, TH_SPC) #define NUM_SPC LT(_NUM, TH_SPC)
#define NAV_ENT LT(_NAV, KC_ENT) #define NAV_ENT LT(_NAV, KC_ENT)
#define CAD C(A(KC_DEL)) #define CAD C(A(KC_DEL))
#define LOCK G(KC_L) #define LOCK G(KC_L)

1
keyboards/planck/rev7/keymaps/drew/custom_keys/custom_keys.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "../common.h"
#include "../utils/mod_suppression.h" #include "../utils/mod_suppression.h"
#include "alias.h" #include "alias.h"

6
keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.c
View file

@ -20,11 +20,13 @@ void turn_on_caps_word(custom_key_t* custom_key) {
custom_key_t custom_keys[] = { custom_key_t custom_keys[] = {
// _BASE layer // _BASE layer
[NK_Q] = CUSTOM_KEY(KC_Q, 1, REMAP_WITH_OPTIONS(A(KC_F4), MOD_MASK_GUI, REMOVE_TRIGGER, false)), [NK_Q] = CUSTOM_KEY(KC_Q, 1, REMAP_WITH_OPTIONS(A(KC_F4), MOD_MASK_GUI, REMOVE_TRIGGER, false)),
[NK_R] = CUSTOM_KEY(KC_R, 1, REMAP(KC_Y, MOD_MASK_CTRL)),
// _NUM layer // _NUM layer
[NK_COLN] = CUSTOM_KEY(KC_COLN, 1, REMAP(KC_M, MOD_MASK_CTRL)), [NK_COLN] = CUSTOM_KEY(KC_COLN, 1, REMAP(KC_M, MOD_MASK_CTRL)),
[NK_MINS_NUM] = CUSTOM_KEY(KC_MINS, 1, REMAP(KC_Y, MOD_MASK_CTRL)), [NK_MINS_NUM] = CUSTOM_KEY(
KC_MINS, 2, REMAP(KC_R, MOD_MASK_CTRL),
REMAP_WITH_OPTIONS(KC_MINS, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)
),
[NK_1] = CUSTOM_KEY( [NK_1] = CUSTOM_KEY(
KC_1, 2, REMAP(KC_A, MOD_MASK_CTRL), KC_1, 2, REMAP(KC_A, MOD_MASK_CTRL),
REMAP_WITH_OPTIONS(KC_1, MOD_MASK_SHIFT, REMOVE_TRIGGER, false) REMAP_WITH_OPTIONS(KC_1, MOD_MASK_SHIFT, REMOVE_TRIGGER, false)

2
keyboards/planck/rev7/keymaps/drew/custom_keys/mapping.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "../common.h"
#include "../layers.h" #include "../layers.h"
#include "../utils/deletion.h" #include "../utils/deletion.h"
#include "alias.h" #include "alias.h"
@ -14,7 +15,6 @@
enum custom_keycodes { enum custom_keycodes {
// _BASE layer // _BASE layer
NK_Q, NK_Q,
NK_R,
// _NUM layer // _NUM layer
NK_COLN, NK_COLN,
NK_MINS_NUM, NK_MINS_NUM,

10
keyboards/planck/rev7/keymaps/drew/keymap.c
View file

@ -1,9 +1,11 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "caps_word/caps_word.h" #include "caps_word/caps_word.h"
#include "common.h"
#include "custom_keys/custom_keys.h" #include "custom_keys/custom_keys.h"
#include "custom_keys/mapping.h" #include "custom_keys/mapping.h"
#include "layers.h" #include "layers.h"
#include "tap_dance.c" #include "tap_dance/tap_dance.c"
#include "tap_dance/tap_dance.h"
#include "taphold/taphold_options.h" #include "taphold/taphold_options.h"
bool NAV_enabled = false; bool NAV_enabled = false;
@ -12,14 +14,14 @@ bool NAV_enabled = false;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// base // base
[_BASE] = LAYOUT_ortho_4x12( [_BASE] = LAYOUT_ortho_4x12(
NK(NK_ESC), NK(NK_Q), KC_W, KC_E, NK(NK_R), KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NK(NK_BSPC), NK(NK_ESC), NK(NK_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, NK(NK_BSPC),
CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
SFT_SFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, ALT_DEL, SFT_SFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, ALT_DEL,
KC_RCTL, LT(_FUNC, KC_MPLY), ALT_T(KC_LALT), TD(TD_CAD_LOCK), GUI_LAUNCH, NUM_SPC, NAV_ENT, ALT_COMP, KC_LEFT, NK(NK_DOWN), NK(NK_UP), KC_RGHT KC_RCTL, LT(_FUNC, KC_MPLY), ALT_T(KC_LALT), TD(TD_CAD_LOCK), GUI_LAUNCH, NUM_SPC, NAV_ENT, ALT_COMP, KC_LEFT, NK(NK_DOWN), NK(NK_UP), KC_RGHT
), ),
// gamer // gamer
[_GAME] = LAYOUT_ortho_4x12( [_GAME] = LAYOUT_ortho_4x12(
KC_TRNS, KC_Q, KC_TRNS, KC_TRNS, KC_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_Q, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
@ -42,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNC] = LAYOUT_ortho_4x12( [_FUNC] = LAYOUT_ortho_4x12(
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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_MUTE, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_NO, KC_NO, KC_NO, QK_AUDIO_OFF, TG(_GAME), QK_BOOT, KC_TRNS, KC_MUTE, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, TG(_GAME), QK_BOOT,
KC_TRNS, KC_NO, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_RBT KC_TRNS, KC_NO, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_RBT
), ),
}; };

1
keyboards/planck/rev7/keymaps/drew/rules.mk
View file

@ -5,7 +5,6 @@ SRC += utils/deletion.c
SRC += custom_keys/custom_keys.c SRC += custom_keys/custom_keys.c
SRC += custom_keys/mapping.c SRC += custom_keys/mapping.c
VIA_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
CAPS_WORD_ENABLE = yes CAPS_WORD_ENABLE = yes

20
keyboards/planck/rev7/keymaps/drew/tap_dance.c
View file

@ -1,20 +0,0 @@
#include "tap_dance.h"
void on_password_tap(tap_dance_state_t* state, void* user_data) {
switch (state->count) {
case 1:
tap_code16(C(A(KC_DEL)));
break;
case 2:
SEND_STRING("240303");
break;
case 3:
tap_code(KC_ENT);
break;
}
}
tap_dance_action_t tap_dance_actions[] = {
[TD_PASSWORD] = ACTION_TAP_DANCE_FN_ADVANCED(on_password_tap, NULL, NULL),
[TD_CAD_LOCK] = ACTION_TAP_DANCE_DOUBLE(CAD, LOCK),
};

6
keyboards/planck/rev7/keymaps/drew/tap_dance.h
View file

@ -1,6 +0,0 @@
#pragma once
enum {
TD_CAD_LOCK,
TD_PASSWORD,
};

7
keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.c Normal file
View file

@ -0,0 +1,7 @@
#include "tap_dance.h"
#include "../common.h"
#include "../custom_keys/alias.h"
tap_dance_action_t tap_dance_actions[] = {
[TD_CAD_LOCK] = ACTION_TAP_DANCE_DOUBLE(CAD, LOCK),
};

9
keyboards/planck/rev7/keymaps/drew/tap_dance/tap_dance.h Normal file
View file

@ -0,0 +1,9 @@
#pragma once
#include "../common.h"
enum {
TD_CAD_LOCK,
};
// tap_dance_action_t tap_dance_actions;

3
keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.c
View file

@ -41,9 +41,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t* record) {
case GUI_LAUNCH: case GUI_LAUNCH:
return 500; return 500;
break; break;
case TD(TD_PASSWORD):
return 800;
break;
default: default:
return TAPPING_TERM; return TAPPING_TERM;
break; break;

4
keyboards/planck/rev7/keymaps/drew/taphold/taphold_options.h
View file

@ -1,9 +1,11 @@
#pragma once #pragma once
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "../common.h"
#include "../custom_keys/alias.h" #include "../custom_keys/alias.h"
#include "../custom_keys/mapping.h" #include "../custom_keys/mapping.h"
#include "../layers.h" #include "../layers.h"
#include "../tap_dance.h" #include "../tap_dance/tap_dance.h"
uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record); uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t* record);
bool get_permissive_hold(uint16_t keycode, keyrecord_t* record); bool get_permissive_hold(uint16_t keycode, keyrecord_t* record);