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.

Sign up for GitHub

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

[Keyboard] [Keymap] Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps #21120

Merged
merged 13 commits into from
Jun 5, 2023
Merged

[Keyboard] [Keymap] Update G60BLE folder to allow firmware to use Bluetooth with QMK keymaps #21120

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d3cecce
added bluetooth code to rules.mk for BT + QMK
will-hedges Jun 2, 2023
aeb58be
added my keymap
will-hedges Jun 2, 2023
9cf5990
reverted licensing, removed VIA_ENABLE from kb rules.mk
will-hedges Jun 3, 2023
59d9f5e
moved tap dance C file to keymap, disabled NKRO at kb level
will-hedges Jun 3, 2023
19889da
Move layers from #define to enum layers
will-hedges Jun 3, 2023
30b4bb4
Update maxtrix diagram description from g60 to g60ble
will-hedges Jun 3, 2023
e8be5fe
added license to my keymap.c
will-hedges Jun 3, 2023
1ff6254
changed layer order, added mod taps
will-hedges Jun 3, 2023
df6c741
added Ctrl + Alt + Del to _WORK
will-hedges Jun 3, 2023
5bd0dd5
added BSLS_DEL tap dance
will-hedges Jun 3, 2023
8f7d6d8
[g60ble/chemicalwill] moved Ctrl+Alt+Del to _FN1, KC_APP back to _WORK
will-hedges Jun 3, 2023
ce21405
added persistent default layer switching
will-hedges Jun 3, 2023
b9655f2
added F8 tap dance
will-hedges Jun 5, 2023
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
added F8 tap dance
  • Loading branch information
@will-hedges
will-hedges committed Jun 5, 2023
commit b9655f262e1020afd69da0f0faa0fc70fe9b5671
20 changes: 15 additions & 5 deletions keyboards/bioi/g60ble/keymaps/chemicalwill/keymap.c
View file
Open in desktop
will-hedges marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ enum custom_keycodes {

// Tap Dance enum
enum {
N8_F8,
N9_F9,
N0_F10,
MINS_F11,
Expand All @@ -43,11 +44,11 @@ enum {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[_WORK] = LAYOUT_60_ansi(
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, TD(N9_F9), TD(N0_F10), TD(MINS_F11), TD(EQL_F12), KC_BSPC,
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, TD(DEL_BSLS),
LT(_FN1, KC_CAPS), KC_A, KC_S, KC_D, KC_F, TD(G_END), TD(H_HOME), KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, LALT_T(KC_PGUP), KC_SPC, RALT_T(KC_PGDN), KC_APP, MO(_FN1), KC_RCTL
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, TD(N8_F8), TD(N9_F9), TD(N0_F10), TD(MINS_F11), TD(EQL_F12), KC_BSPC,
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, TD(DEL_BSLS),
LT(_FN1, KC_CAPS), KC_A, KC_S, KC_D, KC_F, TD(G_END), TD(H_HOME), KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
KC_LCTL, KC_LGUI, LALT_T(KC_PGUP), KC_SPC, RALT_T(KC_PGDN), KC_APP, MO(_FN1), KC_RCTL
),

[_QWER] = LAYOUT_60_ansi(
Expand Down Expand Up @@ -95,6 +96,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
break;

// TAP DANCES
case TD(N8_F8):
action = &tap_dance_actions[TD_INDEX(keycode)];
if (!record->event.pressed && action->state.count && !action->state.finished) {
tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)action->user_data;
tap_code16(tap_hold->tap);
}
break;

case TD(N9_F9):
action = &tap_dance_actions[TD_INDEX(keycode)];
if (!record->event.pressed && action->state.count && !action->state.finished) {
Expand Down Expand Up @@ -186,6 +195,7 @@ void tap_dance_tap_hold_reset(tap_dance_state_t *state, void *user_data) {
{ .fn = {NULL, tap_dance_tap_hold_finished, tap_dance_tap_hold_reset}, .user_data = (void *)&((tap_dance_tap_hold_t){tap, hold, 0}), }

tap_dance_action_t tap_dance_actions[] = {
[N8_F8] = ACTION_TAP_DANCE_TAP_HOLD(KC_8, KC_F8),
[N9_F9] = ACTION_TAP_DANCE_TAP_HOLD(KC_9, KC_F9),
[N0_F10] = ACTION_TAP_DANCE_TAP_HOLD(KC_0, KC_F10),
[MINS_F11] = ACTION_TAP_DANCE_TAP_HOLD(KC_MINS, KC_F11),
Expand Down