From ab5764b17bc0b2be4adaf19cf825241881d142b2 Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 12:27:02 -0400 Subject: [PATCH 01/11] change gestures scroll flag --- keyboards/hazel/bad_wings/keymaps/default/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/hazel/bad_wings/keymaps/default/config.h b/keyboards/hazel/bad_wings/keymaps/default/config.h index bd395ec9e5d2..c572b4b011aa 100644 --- a/keyboards/hazel/bad_wings/keymaps/default/config.h +++ b/keyboards/hazel/bad_wings/keymaps/default/config.h @@ -12,5 +12,5 @@ #define ONESHOT_TIMEOUT 500 #define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD #define CIRQUE_PINNACLE_TAP_ENABLE -#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE -#define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file +#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE +#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file From 61442604a77fcdeeb5e4a7ae18670735771af8ee Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 12:39:18 -0400 Subject: [PATCH 02/11] add personal keymap --- .../bad_wings/keymaps/jasonhazel/config.h | 17 +++ .../bad_wings/keymaps/jasonhazel/keymap.c | 115 ++++++++++++++++++ .../bad_wings/keymaps/jasonhazel/rules.mk | 4 + 3 files changed, 136 insertions(+) create mode 100644 keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h create mode 100644 keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c create mode 100644 keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h b/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h new file mode 100644 index 000000000000..035419eee685 --- /dev/null +++ b/keyboards/hazel/bad_wings/keymaps/jasonhazel/config.h @@ -0,0 +1,17 @@ +// Copyright 2023 Jason Hazel (@jasonhazel) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#define TAPPING_TERM 200 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD +#define TAPPING_TERM_PER_KEY +#define ONESHOT_TAP_TOGGLE 10 +#define ONESHOT_TIMEOUT 500 +#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD +#define CIRQUE_PINNACLE_TAP_ENABLE +#define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE + +#define POINTING_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c new file mode 100644 index 000000000000..e9daa08e8b59 --- /dev/null +++ b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c @@ -0,0 +1,115 @@ +#include QMK_KEYBOARD_H + +enum layers { + _ALPHA, + _SYMBOL, + _NUMBER, + _NAVIGATION, + LAYER_LENGTH +}; + + +enum tapdances { + TD_QESC, + TD_SBKT, + TD_CBKT, + TD_PARN, + TD_LTGT, + TD_ATAB, + TAPDANCE_LENGTH +}; + +enum combos { + COMBO_NAVIGATION, + COMBO_LENGTH +}; + + +// begin tapdances +#define KC_QESC TD(TD_QESC) +#define KC_SBKT TD(TD_SBKT) +#define KC_CBKT TD(TD_CBKT) +#define KC_PARN TD(TD_PARN) +#define KC_LTGT TD(TD_LTGT) +#define KC_ATAB TD(TD_ATAB) + +#define KC_GUIX LGUI_T(KC_X) +#define KC_ALTC LALT_T(KC_C) + +// oneshots +#define KC_OSFT OSM(MOD_LSFT) +#define KC_OALT OSM(MOD_LALT) + +// layer changing +#define KC_OSYM OSL(_SYMBOL) +#define KC_ONUM LT(_NUMBER, KC_BSPC) + +uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { + switch(keycode) { + case KC_GUIX: + case KC_ALTC: + return TAPPING_TERM * 2; + default: + return TAPPING_TERM; + } +} + +// tapdances +tap_dance_action_t tap_dance_actions[] = { + [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), + [TD_SBKT] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), + [TD_CBKT] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), + [TD_PARN] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), + [TD_LTGT] = ACTION_TAP_DANCE_DOUBLE(KC_LABK, KC_RABK), + [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB) +}; +// end tapdances + +uint16_t COMBO_LEN = COMBO_LENGTH; + +const uint16_t PROGMEM combo_navigation[] = { KC_OSYM, KC_ONUM, COMBO_END }; +combo_t key_combos[] = { + [COMBO_NAVIGATION] = COMBO(combo_navigation, OSL(_NAVIGATION)), +}; + +uint16_t get_combo_term(uint16_t index, combo_t *combo) { + switch(index) { + case COMBO_NAVIGATION: // extending the combo term here helps reduce sticky layers some more. + return 250; + default: + return COMBO_TERM; + } +} +// end combos + + +// begin layers +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_ALPHA] = LAYOUT_split_3x5_3( + KC_QESC, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ + KC_Z, KC_GUIX, KC_ALTC, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ + KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT + ), + [_SYMBOL] = LAYOUT_split_3x5_3( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_PIPE, KC_NO, \ + KC_GRV, KC_TILD, KC_UNDS, KC_EQL, KC_NO, KC_SBKT, KC_CBKT, KC_PARN, KC_LTGT, KC_BACKSLASH, \ + KC_NO, KC_NO, KC_PLUS, KC_MINS, KC_NO, KC_NO, KC_NO, KC_COLN, KC_DOT, KC_SCLN, \ + KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT + ), + [_NUMBER] = LAYOUT_split_3x5_3( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_NO, \ + KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT + ), + [_NAVIGATION] = LAYOUT_split_3x5_3( + KC_NO, KC_F2, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_END, KC_BSPC, \ + KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENT, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL, \ + KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT + ) +}; + + + diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk new file mode 100644 index 000000000000..26d76a0df6ed --- /dev/null +++ b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk @@ -0,0 +1,4 @@ +MOUSEKEY_ENABLE = yes +EXTRAKEY_ENABLE = yes +COMBO_ENABLE = yes +TAP_DANCE_ENABLE = yes \ No newline at end of file From 58c6760443484e1daab12e3e1574c060d8dfcb69 Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 13:14:29 -0400 Subject: [PATCH 03/11] convert to keymap.json --- .../hazel/bad_wings/keymaps/default/keymap.c | 35 ---- .../bad_wings/keymaps/default/keymap.json | 163 ++++++++++++++++++ 2 files changed, 163 insertions(+), 35 deletions(-) delete mode 100644 keyboards/hazel/bad_wings/keymaps/default/keymap.c create mode 100644 keyboards/hazel/bad_wings/keymaps/default/keymap.json diff --git a/keyboards/hazel/bad_wings/keymaps/default/keymap.c b/keyboards/hazel/bad_wings/keymaps/default/keymap.c deleted file mode 100644 index e9adc7cc2e9f..000000000000 --- a/keyboards/hazel/bad_wings/keymaps/default/keymap.c +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2023 Jason Hazel (@jasonhazel) -// SPDX-License-Identifier: GPL-3.0-or-later - -#include QMK_KEYBOARD_H - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, 1, 2, 3); -} - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_split_3x5_3( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ - KC_Z, LGUI_T(KC_X), LALT_T(KC_C), KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ - KC_LCTL, OSL(1), OSM(MOD_LSFT), KC_SPC, LT(2, KC_BSPC), KC_ENT - ), - [1] = LAYOUT_split_3x5_3( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RBRC, KC_RCBR, KC_RPRN, KC_RABK, KC_NO, \ - KC_GRV, KC_TILD, KC_UNDS, KC_EQL, KC_NO, KC_LBRC, KC_LCBR, KC_LPRN, KC_LABK, KC_BACKSLASH, \ - KC_NO, KC_NO, KC_PLUS, KC_MINS, KC_NO, KC_NO, KC_NO, KC_COLN, KC_DOT, KC_SCLN, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [2] = LAYOUT_split_3x5_3( - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_PIPE, KC_NO, \ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_NO, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT_split_3x5_3( - KC_ESC, KC_F1, KC_F4, KC_F7, KC_F10, KC_NO, KC_HOME, KC_UP, KC_END, KC_BSPC, \ - KC_TAB, KC_F2, KC_F5, KC_F8, KC_F11, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENT, \ - KC_NO, KC_F3, KC_F6, KC_F9, KC_F12, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL, \ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; \ No newline at end of file diff --git a/keyboards/hazel/bad_wings/keymaps/default/keymap.json b/keyboards/hazel/bad_wings/keymaps/default/keymap.json new file mode 100644 index 000000000000..a94a05d33835 --- /dev/null +++ b/keyboards/hazel/bad_wings/keymaps/default/keymap.json @@ -0,0 +1,163 @@ +{ + "version": 1, + "notes": "", + "documentation": "", + "keyboard": "hazel/bad_wings", + "keymap": "default", + "layout": "LAYOUT_split_3x5_3", + "layers": [ + [ + "KC_Q", + "KC_W", + "KC_E", + "KC_R", + "KC_T", + "KC_Y", + "KC_U", + "KC_I", + "KC_O", + "KC_P", + "KC_A", + "KC_S", + "KC_D", + "KC_F", + "KC_G", + "KC_H", + "KC_J", + "KC_K", + "KC_L", + "KC_QUOT", + "KC_Z", + "LGUI_T(KC_X)", + "LALT_T(KC_C)", + "KC_V", + "KC_B", + "KC_N", + "KC_M", + "KC_COMM", + "KC_DOT", + "KC_SLSH", + "KC_LCTL", + "OSL(1)", + "OSM(MOD_LSFT)", + "LT(3,KC_SPC)", + "LT(2,KC_BSPC)", + "KC_ENT" + ], + [ + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_RBRC", + "KC_RCBR", + "KC_RPRN", + "KC_GT", + "KC_NO", + "KC_TILD", + "KC_TILD", + "KC_UNDS", + "KC_EQL", + "KC_NO", + "KC_LBRC", + "KC_LCBR", + "KC_LPRN", + "KC_LT", + "KC_BSLS", + "KC_NO", + "KC_NO", + "KC_PLUS", + "KC_MINS", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_COLN", + "KC_DOT", + "KC_SCLN", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS" + ], + [ + "KC_EXLM", + "KC_AT", + "KC_HASH", + "KC_DLR", + "KC_PERC", + "KC_CIRC", + "KC_AMPR", + "KC_ASTR", + "KC_PIPE", + "KC_NO", + "KC_P1", + "KC_P2", + "KC_P3", + "KC_P4", + "KC_P5", + "KC_P6", + "KC_P7", + "KC_P8", + "KC_P9", + "KC_P0", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS" + ], + [ + "KC_ESC", + "KC_F1", + "KC_F4", + "KC_F7", + "KC_F10", + "KC_NO", + "KC_HOME", + "KC_UP", + "KC_END", + "KC_NO", + "KC_TAB", + "KC_F2", + "KC_F5", + "KC_F8", + "KC_F11", + "KC_NO", + "KC_LEFT", + "KC_DOWN", + "KC_RGHT", + "KC_NO", + "KC_NO", + "KC_F3", + "KC_F6", + "KC_F9", + "KC_F12", + "KC_NO", + "KC_MRWD", + "KC_MPLY", + "KC_MFFD", + "KC_DEL", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS" + ] + ], + "author": "Jason Hazel" +} \ No newline at end of file From 9f5ba0dacdecb79e64d22e9757e44790a3c0021b Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 13:18:47 -0400 Subject: [PATCH 04/11] add GRV instead of TILDE --- keyboards/hazel/bad_wings/keymaps/default/keymap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/hazel/bad_wings/keymaps/default/keymap.json b/keyboards/hazel/bad_wings/keymaps/default/keymap.json index a94a05d33835..46443b77a0ec 100644 --- a/keyboards/hazel/bad_wings/keymaps/default/keymap.json +++ b/keyboards/hazel/bad_wings/keymaps/default/keymap.json @@ -55,7 +55,7 @@ "KC_RPRN", "KC_GT", "KC_NO", - "KC_TILD", + "KC_GRV", "KC_TILD", "KC_UNDS", "KC_EQL", From ad92db82119b94b923d121c87db4ea48f4f572ac Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 13:25:13 -0400 Subject: [PATCH 05/11] fix keycodes used for numbers --- .../bad_wings/keymaps/default/keymap.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/hazel/bad_wings/keymaps/default/keymap.json b/keyboards/hazel/bad_wings/keymaps/default/keymap.json index 46443b77a0ec..670506eaf61a 100644 --- a/keyboards/hazel/bad_wings/keymaps/default/keymap.json +++ b/keyboards/hazel/bad_wings/keymaps/default/keymap.json @@ -93,16 +93,16 @@ "KC_ASTR", "KC_PIPE", "KC_NO", - "KC_P1", - "KC_P2", - "KC_P3", - "KC_P4", - "KC_P5", - "KC_P6", - "KC_P7", - "KC_P8", - "KC_P9", - "KC_P0", + "KC_1", + "KC_2", + "KC_3", + "KC_4", + "KC_5", + "KC_6", + "KC_7", + "KC_8", + "KC_9", + "KC_0", "KC_NO", "KC_NO", "KC_NO", From 410c6149ca73d1b969143b7c259966514131d4e9 Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 14:21:02 -0400 Subject: [PATCH 06/11] add licence info to jasonhazel/keymap.c --- keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c index e9daa08e8b59..496056c99787 100644 --- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c +++ b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2023 Jason Hazel (@jasonhazel) +// SPDX-License-Identifier: GPL-3.0-or-later + #include QMK_KEYBOARD_H enum layers { From fd85f4093ba31f6a0951b70c805b6b608d1768ee Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 14:34:22 -0400 Subject: [PATCH 07/11] add more missing license info --- keyboards/hazel/bad_wings/keymaps/default/rules.mk | 3 +++ keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk | 3 +++ keyboards/hazel/bad_wings/rules.mk | 3 +++ 3 files changed, 9 insertions(+) diff --git a/keyboards/hazel/bad_wings/keymaps/default/rules.mk b/keyboards/hazel/bad_wings/keymaps/default/rules.mk index cb8ebf227ec3..b4c090999f1c 100644 --- a/keyboards/hazel/bad_wings/keymaps/default/rules.mk +++ b/keyboards/hazel/bad_wings/keymaps/default/rules.mk @@ -1,2 +1,5 @@ +# Copyright 2023 Jason Hazel (@jasonhazel) +# SPDX-License-Identifier: GPL-2.0-or-later + MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes \ No newline at end of file diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk index 26d76a0df6ed..4ab5dc6a5312 100644 --- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk +++ b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk @@ -1,3 +1,6 @@ +# Copyright 2023 Jason Hazel (@jasonhazel) +# SPDX-License-Identifier: GPL-2.0-or-later + MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes COMBO_ENABLE = yes diff --git a/keyboards/hazel/bad_wings/rules.mk b/keyboards/hazel/bad_wings/rules.mk index 1001af0186bb..ee76ca53faba 100644 --- a/keyboards/hazel/bad_wings/rules.mk +++ b/keyboards/hazel/bad_wings/rules.mk @@ -1,3 +1,6 @@ +# Copyright 2023 Jason Hazel (@jasonhazel) +# SPDX-License-Identifier: GPL-2.0-or-later + TRI_LAYER_ENABLE = yes CAPS_WORD_ENABLE = yes From 75fe7b529d0254a5d5a533eed28e02dc2d866b06 Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 15:07:02 -0400 Subject: [PATCH 08/11] Update keyboards/hazel/bad_wings/rules.mk Co-authored-by: Joel Challis --- keyboards/hazel/bad_wings/rules.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/hazel/bad_wings/rules.mk b/keyboards/hazel/bad_wings/rules.mk index ee76ca53faba..1001af0186bb 100644 --- a/keyboards/hazel/bad_wings/rules.mk +++ b/keyboards/hazel/bad_wings/rules.mk @@ -1,6 +1,3 @@ -# Copyright 2023 Jason Hazel (@jasonhazel) -# SPDX-License-Identifier: GPL-2.0-or-later - TRI_LAYER_ENABLE = yes CAPS_WORD_ENABLE = yes From 13f32b929de32bd9b47bd036cff57f6269539f7d Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 15:07:07 -0400 Subject: [PATCH 09/11] Update keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk Co-authored-by: Joel Challis --- keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk index 4ab5dc6a5312..26d76a0df6ed 100644 --- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk +++ b/keyboards/hazel/bad_wings/keymaps/jasonhazel/rules.mk @@ -1,6 +1,3 @@ -# Copyright 2023 Jason Hazel (@jasonhazel) -# SPDX-License-Identifier: GPL-2.0-or-later - MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes COMBO_ENABLE = yes From 30f3a5bc8f456ca8b654dd11b376cff790dd6c78 Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 15:07:20 -0400 Subject: [PATCH 10/11] Update keyboards/hazel/bad_wings/keymaps/default/rules.mk Co-authored-by: Joel Challis --- keyboards/hazel/bad_wings/keymaps/default/rules.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/hazel/bad_wings/keymaps/default/rules.mk b/keyboards/hazel/bad_wings/keymaps/default/rules.mk index b4c090999f1c..cb8ebf227ec3 100644 --- a/keyboards/hazel/bad_wings/keymaps/default/rules.mk +++ b/keyboards/hazel/bad_wings/keymaps/default/rules.mk @@ -1,5 +1,2 @@ -# Copyright 2023 Jason Hazel (@jasonhazel) -# SPDX-License-Identifier: GPL-2.0-or-later - MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes \ No newline at end of file From 57c5d094c27ef729d60a2748a2e8fb7a6e44082a Mon Sep 17 00:00:00 2001 From: Jason Hazel Date: Sun, 14 May 2023 21:05:54 -0400 Subject: [PATCH 11/11] Update keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c Co-authored-by: Ryan --- .../bad_wings/keymaps/jasonhazel/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c index 496056c99787..0c3d9c70afab 100644 --- a/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c +++ b/keyboards/hazel/bad_wings/keymaps/jasonhazel/keymap.c @@ -89,27 +89,27 @@ uint16_t get_combo_term(uint16_t index, combo_t *combo) { // begin layers const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ALPHA] = LAYOUT_split_3x5_3( - KC_QESC, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ - KC_Z, KC_GUIX, KC_ALTC, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ + KC_QESC, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, + KC_Z, KC_GUIX, KC_ALTC, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT ), [_SYMBOL] = LAYOUT_split_3x5_3( - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_PIPE, KC_NO, \ - KC_GRV, KC_TILD, KC_UNDS, KC_EQL, KC_NO, KC_SBKT, KC_CBKT, KC_PARN, KC_LTGT, KC_BACKSLASH, \ - KC_NO, KC_NO, KC_PLUS, KC_MINS, KC_NO, KC_NO, KC_NO, KC_COLN, KC_DOT, KC_SCLN, \ + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_PIPE, KC_NO, + KC_GRV, KC_TILD, KC_UNDS, KC_EQL, KC_NO, KC_SBKT, KC_CBKT, KC_PARN, KC_LTGT, KC_BACKSLASH, + KC_NO, KC_NO, KC_PLUS, KC_MINS, KC_NO, KC_NO, KC_NO, KC_COLN, KC_DOT, KC_SCLN, KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT ), [_NUMBER] = LAYOUT_split_3x5_3( - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_NO, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_NO, KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT ), [_NAVIGATION] = LAYOUT_split_3x5_3( - KC_NO, KC_F2, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_END, KC_BSPC, \ - KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENT, \ - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL, \ + KC_NO, KC_F2, KC_NO, KC_NO, KC_NO, KC_NO, KC_HOME, KC_UP, KC_END, KC_BSPC, + KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENT, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL, KC_LCTL, KC_OSYM, KC_OSFT, KC_SPC, KC_ONUM, KC_ENT ) };