diff options
| author | Dusty Pomerleau <dustypomerleau@users.noreply.github.com> | 2019-03-01 10:27:34 +1100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-02-28 15:27:34 -0800 |
| commit | f6a0ee85fd7c4a2452d0f42bd948746525194009 (patch) | |
| tree | 53253e35b6548fb81f1a01ae01a0207752d52385 /keyboards/minidox | |
| parent | beb292e7f01712f1b8dd7bd3a2d4469e814bb567 (diff) | |
| download | qmk_firmware-f6a0ee85fd7c4a2452d0f42bd948746525194009.tar.gz qmk_firmware-f6a0ee85fd7c4a2452d0f42bd948746525194009.zip | |
[Keymap] update: add extrakey support for macOS media keys (#5263)
* add dusty keymap
* change keymap folder to match my github username
* initial keymap completed in comments only
* layout without NAV completed in comments only
* disable Command to prevent interference with Space Cadet keys
* switch _ and \ in the symbol layer
* Layers complete through _NAV
* add thumb keys to _NAV
* complete _NUM
* all layouts complete; still needs `process_user_record()`
* completed first draft of keymap; still needs config.h to match
* corrected keycodes for Mac macro-volume keys
* fix Mac mute keycode
* add missing Mac keycodes for previous and next track
* placeholder for qwerty layout, not yet completed;
remove unnecessary breaks;
add todos
* eliminate Preonic branch before switching to Minidox branch:
• delete dustypomerleau Preonic keymap folder
• complete keymap.c (QWERTY layer, vanilla numbers layer)
TODO:
• add preferences to config.h
• complete the README
* edit commented keymap diagrams for clarity in dual function keys
* define initial config.h and add rules.mk for mouse key support
* fix redundant line after implementation of tap_code()
* fixed key_timer declaration, added README and rules
* formatting of keymap
* add CTPC to config
* cycle thumb keys to favor center position
* modify config.h for temporary Pro Micro compatibility
* remove superfluous call to use serial; homebrewed mod tap keys are still broken with OSL
* merge _SYS and _MEDIA on new Z_SYS key
* ALT_OP example of new MT macro complete
* initial narze-inspired MT fixes in PRU
* add (currently superfluous) custom keycode for the _SYS layer
* rudimentary `OSL` symbol macros that immediately register the mod and fail to reset the oneshot layer, but do output the proper keys—fix both of these things
* remove permissive hold to improve tapping performance
* remove calls to `clear_oneshot_layer_state()`, as they have no effect inside `process_record_user()`. Tapdance appears to be the way forward.
* final commit before tapdance code; correct layout in comments
* initial tapdance code for shifted mod taps
* add numeric and ergo NUM layers and pinky shifts for keycuts
* add TD() wrappers to tapdance codes and clean up commented layout guides
* add faux return to cur_dance to allow compilation - TODO: research what the default clause should be in cur_dance
* update commented schematics for better readability
* add backspace and delete to lockable layers, Z_SYS -> SYS_Z for consistency, fix schematic errors
* add `DOUBLE_SINGLE_TAP` to tapdance cases to allow doubling of the single tap character without waiting tapping term
* remove reduced oneshot tapping toggles
* update README
* newline tweak :)
* Update keyboards/minidox/keymaps/dustypomerleau/keymap.c
Co-Authored-By: dustypomerleau <dustypomerleau@users.noreply.github.com>
* Update keyboards/minidox/keymaps/dustypomerleau/config.h
Co-Authored-By: dustypomerleau <dustypomerleau@users.noreply.github.com>
* Update keyboards/minidox/keymaps/dustypomerleau/config.h
Co-Authored-By: dustypomerleau <dustypomerleau@users.noreply.github.com>
* Update keyboards/minidox/keymaps/dustypomerleau/config.h
Co-Authored-By: dustypomerleau <dustypomerleau@users.noreply.github.com>
* Update keyboards/minidox/keymaps/dustypomerleau/config.h
Co-Authored-By: dustypomerleau <dustypomerleau@users.noreply.github.com>
* remove `PREVENT_STUCK_MODIFIERS`, as this is default behavior
* enable extrakey in rules to enable media keys
* enable extrakeys for media key compatibility on macOS
* add dash and slash to _NUM layers
* change to universal volume keycodes
* revert micro volume adjustments to macOS-specific codes due to lack of functionality (macro volume adjustments are still universal)
Diffstat (limited to 'keyboards/minidox')
| -rw-r--r-- | keyboards/minidox/keymaps/dustypomerleau/config.h | 1 | ||||
| -rw-r--r-- | keyboards/minidox/keymaps/dustypomerleau/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/minidox/keymaps/dustypomerleau/rules.mk | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/keyboards/minidox/keymaps/dustypomerleau/config.h b/keyboards/minidox/keymaps/dustypomerleau/config.h index 5166e06d8..b2169947b 100644 --- a/keyboards/minidox/keymaps/dustypomerleau/config.h +++ b/keyboards/minidox/keymaps/dustypomerleau/config.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | #pragma once | 3 | #pragma once |
| 4 | 4 | ||
| 5 | |||
| 6 | #define EE_HANDS | 5 | #define EE_HANDS |
| 7 | #define IGNORE_MOD_TAP_INTERRUPT | 6 | #define IGNORE_MOD_TAP_INTERRUPT |
| 8 | #define ONESHOT_TIMEOUT 1000 | 7 | #define ONESHOT_TIMEOUT 1000 |
diff --git a/keyboards/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/minidox/keymaps/dustypomerleau/keymap.c index e8b1ca1b5..d0eab98b4 100644 --- a/keyboards/minidox/keymaps/dustypomerleau/keymap.c +++ b/keyboards/minidox/keymaps/dustypomerleau/keymap.c | |||
| @@ -166,10 +166,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 166 | * `------' `------' | 166 | * `------' `------' |
| 167 | */ | 167 | */ |
| 168 | [_SYS] = LAYOUT( \ | 168 | [_SYS] = LAYOUT( \ |
| 169 | RESET, DEBUG, QWERTY, CMK_DHM, _______, _______, KC__VOLDOWN, KC__VOLUP, _______, _______, \ | 169 | RESET, DEBUG, QWERTY, CMK_DHM, _______, _______, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, \ |
| 170 | KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK, KC_POWER, VOL_DN, VOL_UP, KC__MUTE, KC_MPLY, \ | 170 | KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, NAV_LK, KC_POWER, VOL_DN, VOL_UP, KC__MUTE, KC_MPLY, \ |
| 171 | _______, _______, AU_OFF, AU_ON, _______, _______, NUMLK_E, KC_MRWD, KC_MFFD, _______, \ | 171 | _______, _______, AU_OFF, AU_ON, _______, _______, NUMLK_E, KC_MRWD, KC_MFFD, _______, \ |
| 172 | _______, _______, _______, _______, _______, _______ \ | 172 | _______, _______, _______, _______, _______, _______ \ |
| 173 | ), | 173 | ), |
| 174 | 174 | ||
| 175 | /* Navigation + mouse keys | 175 | /* Navigation + mouse keys |
| @@ -212,7 +212,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 212 | [_NUM_E] = LAYOUT( \ | 212 | [_NUM_E] = LAYOUT( \ |
| 213 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ | 213 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ |
| 214 | SFT_7, CTRL_5, ALT_3, GUI_1, KC_9, KC_8, GUI_0, ALT_2, CTRL_4, SFT_6, \ | 214 | SFT_7, CTRL_5, ALT_3, GUI_1, KC_9, KC_8, GUI_0, ALT_2, CTRL_4, SFT_6, \ |
| 215 | _______, _______, KC_F11, KC_F12, KC_BSPC, KC_DEL, NUMLK_E, _______, _______, _______, \ | 215 | KC_F11, KC_F12, KC_MINS, KC_SLSH, KC_BSPC, KC_DEL, NUMLK_E, _______, _______, _______, \ |
| 216 | _______, KC_TAB, KC_ESC, _______, _______, _______ \ | 216 | _______, KC_TAB, KC_ESC, _______, _______, _______ \ |
| 217 | ), | 217 | ), |
| 218 | 218 | ||
| @@ -234,7 +234,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 234 | [_NUM_N] = LAYOUT( \ | 234 | [_NUM_N] = LAYOUT( \ |
| 235 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ | 235 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, \ |
| 236 | SFT_1, CTRL_2, ALT_3, GUI_4, KC_5, KC_6, GUI_7, ALT_8, CTRL_9, SFT_0, \ | 236 | SFT_1, CTRL_2, ALT_3, GUI_4, KC_5, KC_6, GUI_7, ALT_8, CTRL_9, SFT_0, \ |
| 237 | _______, _______, KC_F11, KC_F12, KC_BSPC, KC_DEL, NUMLK_N, _______, _______, _______, \ | 237 | KC_F11, KC_F12, KC_MINS, KC_SLSH, KC_BSPC, KC_DEL, NUMLK_N, _______, _______, _______, \ |
| 238 | _______, KC_TAB, KC_ESC, _______, _______, _______ \ | 238 | _______, KC_TAB, KC_ESC, _______, _______, _______ \ |
| 239 | ), | 239 | ), |
| 240 | 240 | ||
diff --git a/keyboards/minidox/keymaps/dustypomerleau/rules.mk b/keyboards/minidox/keymaps/dustypomerleau/rules.mk index 5ed4c5446..2a74d9553 100644 --- a/keyboards/minidox/keymaps/dustypomerleau/rules.mk +++ b/keyboards/minidox/keymaps/dustypomerleau/rules.mk | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | # dustypomerleau, Minidox rules | 1 | # dustypomerleau, Minidox rules |
| 2 | 2 | ||
| 3 | EXTRAKEY_ENABLE = yes | ||
| 3 | MOUSEKEY_ENABLE = yes | 4 | MOUSEKEY_ENABLE = yes |
| 4 | TAP_DANCE_ENABLE = yes | 5 | TAP_DANCE_ENABLE = yes |
