summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-07-03 08:16:45 +0000
committerQMK Bot <hello@qmk.fm>2021-07-03 08:16:45 +0000
commit4f0a7e43647c95eba65ea555a47bcc2431a49375 (patch)
treedade4aae5f12165d5268479ade42008f9b780f05
parent8465d28d0fcf08139a13b54f2a1323874cf5a954 (diff)
parent5878e86c8a028ad3878aeed158b413afe2e3498c (diff)
downloadqmk_firmware-4f0a7e43647c95eba65ea555a47bcc2431a49375.tar.gz
qmk_firmware-4f0a7e43647c95eba65ea555a47bcc2431a49375.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/config.h2
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/keymap.c54
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/readme.md7
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/rules.mk5
-rw-r--r--keyboards/mechwild/mercutio/keymaps/jonavin/config.h2
5 files changed, 58 insertions, 12 deletions
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/config.h b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
index 0e6f66d503..4d65c137af 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/config.h
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
@@ -35,3 +35,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//Always send Escape if Alt is pressed
#define GRAVE_ESC_CTRL_OVERRIDE
//Always send Escape if Control is pressed
+
+#define TAPPING_TERM 180
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
index 6cea7338d3..171b5203e8 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
@@ -29,12 +29,21 @@ enum custom_layers {
_MO3,
};
-
enum custom_keycodes {
DOUBLEZERO = SAFE_RANGE,
};
+// Tap Dance Definitions
+enum custom_tapdance {
+ TD_LSFT_CAPSLOCK,
+};
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+ // Tap once for shift, twice for Caps Lock
+ [TD_LSFT_CAPSLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
+};
+#define KC_LSFTCAPS TD(TD_LSFT_CAPSLOCK)
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
@@ -50,13 +59,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_65(
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_INS,
KC_PSCR, 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_DEL,
TT(_MO2), 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_PGUP,
- 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_UP, KC_PGDN,
+ KC_LSFTCAPS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, LT(_FN1, KC_SPC), KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[_FN1] = LAYOUT_65(
KC_TRNS, 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_F13, KC_CALC, KC_NO,
@@ -78,19 +86,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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),
};
+#ifdef ENCODER_ENABLE // Encoder Functionality
bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) {
- if (clockwise) {
+ switch (index)
+ {
+ case 0: // first encoder (Left Macro set)
+ if (clockwise) {
tap_code(KC_PGDN);
- } else {
+ } else {
tap_code(KC_PGUP);
}
- } else if (index == 1) {
- if (clockwise) {
- tap_code(KC_VOLU);
+
+ default: // other encoder (Top right)
+ if ( clockwise ) {
+ if (keyboard_report->mods & MOD_BIT(KC_LSFT) ) { // If you are holding L shift, Page up
+ unregister_mods(MOD_BIT(KC_LSFT));
+ register_code(KC_PGDN);
+ register_mods(MOD_BIT(KC_LSFT));
+ } else if (keyboard_report->mods & MOD_BIT(KC_LCTL)) { // if holding Left Ctrl, navigate next word
+ tap_code16(LCTL(KC_RGHT));
+ } else if (keyboard_report->mods & MOD_BIT(KC_LALT)) { // if holding Left Alt, change media next track
+ tap_code(KC_MEDIA_NEXT_TRACK);
+ } else {
+ tap_code(KC_VOLU); // Otherwise it just changes volume
+ }
} else {
- tap_code(KC_VOLD);
+ if (keyboard_report->mods & MOD_BIT(KC_LSFT) ) {
+ unregister_mods(MOD_BIT(KC_LSFT));
+ register_code(KC_PGUP);
+ register_mods(MOD_BIT(KC_LSFT));
+ } else if (keyboard_report->mods & MOD_BIT(KC_LCTL)) { // if holding Left Ctrl, navigate previous word
+ tap_code16(LCTL(KC_LEFT));
+ } else if (keyboard_report->mods & MOD_BIT(KC_LALT)) { // if holding Left Alt, change media previous track
+ tap_code(KC_MEDIA_PREV_TRACK);
+ } else {
+ tap_code(KC_VOLD);
+ }
}
+ break;
}
return true;
}
+#endif
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/readme.md b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md
index 325ab1af66..bf009dee91 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/readme.md
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md
@@ -6,7 +6,12 @@
- Layer 2 provides arrows on WASD and additional nav keys + right hand numpad with 00
- ESC is set to GRAVESC (Esc when pressed, Shift-Esc is ~ and Win-ESC is `), plus handling for Ctrl-Shift-ESC to bring up Task Manager in Windows
- Layer 2 left spacebar Backspace
-
+- add double tap of Left Shift to toggle Caps Lock
+- additional encoder functionality
+ - holding L shift, Navigate page up/down
+ - holding Left Ctrl, navigate prev/next word
+ - holding Left Alt, change media prev/next track
+ - default is change volume
## All layers diagram
![image](https://user-images.githubusercontent.com/71780717/118903429-c52cc800-b8e5-11eb-9c45-3d9815a50123.png)
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk b/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk
index 4b1bcabda8..eff3d692ee 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/rules.mk
@@ -1,3 +1,6 @@
VIA_ENABLE = yes
-CONSOLE_ENABLE = yes
+CONSOLE_ENABLE = no
LTO_ENABLE = yes
+
+MOUSEKEY_ENABLE = no
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/config.h b/keyboards/mechwild/mercutio/keymaps/jonavin/config.h
index 7272cd4c3a..09909e28c9 100644
--- a/keyboards/mechwild/mercutio/keymaps/jonavin/config.h
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/config.h
@@ -28,3 +28,5 @@
//Always send Escape if Alt is pressed
#define GRAVE_ESC_CTRL_OVERRIDE
//Always send Escape if Control is pressed
+
+#define TAPPING_TERM 180