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.

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

Jonavin merc additional encoder functionality #13039

Merged
merged 31 commits into from
Jul 3, 2021

Conversation

Jonavin
Copy link
Contributor

@Jonavin Jonavin commented May 30, 2021

Description

  • FN layer has encoder dynamic selectable key codes and display on OLED

    Change these in keymap.c to assign your desired key selection
    

static const keycodedescType PROGMEM keyselection[] = {
// list of key codes that will be scrollled through by encoder and description
{"TASK", KC_TASK},
{"INS", KC_INS},
{"DEL", KC_DEL},
{"PrtSc", KC_PSCR},
{"ScrLk", KC_SCLN},
{"Break", KC_PAUS},
{"C-A-D", KC_CAD}, // Ctrl-Alt-Del
{"AltF4", KC_AF4},
{"PLAY", KC_MEDIA_PLAY_PAUSE}
};

  • Additional encoder functionality
    While holding Left Ctrl, navigates next or previous word
    While holding Left Alt, media next track or previous track

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@Jonavin
Copy link
Contributor Author

Jonavin commented May 31, 2021

I rewrote the whole key selection desc storage array to use a PROGMEM typedef struct to reduce the memory footprint

@drashna drashna requested a review from a team June 7, 2021 05:53
@Jonavin Jonavin requested review from drashna and removed request for a team June 24, 2021 13:43
@fauxpark fauxpark requested a review from a team June 27, 2021 04:26
@drashna
Copy link
Member

drashna commented Jul 3, 2021

Thanks!

@drashna drashna merged commit 002d90b into qmk:master Jul 3, 2021
@Jonavin Jonavin deleted the jonavin-merc-encoderFkeys branch July 3, 2021 17:21
cadusk pushed a commit to cadusk/qmk_firmware that referenced this pull request Jul 4, 2021
…velop

* 'develop' of https://github.com/qmk/qmk_firmware: (37 commits)
  [Keyboard] Add CX60 (qmk#13402)
  Specskeys Configurator Bugfix and Refactor (qmk#13439)
  [Keyboard] IDOBAO ID67 (qmk#13378)
  [Keyboard] ortho boards from the technik gb (qmk#13382)
  [Keyboard] Add soldered variant of Titan 65 keyboard.  (qmk#13270)
  Pisces: correct layout macro reference in info.json (qmk#13410)
  [Keymap] Update Miryoku (qmk#13307)
  [Keyboard] Add wings42 keyboard (qmk#12734)
  [Keyboard] Added LAYOUT_60_iso_split_rshift to ok60 (qmk#12902)
  [Keymap] Jonavin merc additional encoder functionality (qmk#13039)
  [Bug] Pachi RGB - fix rgb placement (qmk#13428)
  AW20216 use register increment for framebuffer flushes (qmk#13430)
  Improve 'show_build_options' target (qmk#13425)
  [Keymap] gmmk pro keymap with numpad, enhanced encoder functionality and Win key lock (qmk#13406)
  [Keymap] Jonavin quefrency keymap add encoder functionality + 2tap Shift CAPSLOCK (qmk#13376)
  [Docs] RGB Matrix Caps Lock and Layer indicator example (qmk#13367)
  [Keymap] Add stanrc85 community layout (qmk#13338)
  [Keymap] 2Moons-JP Keymap Update (qmk#13279)
  [Keyboard] Added pistachio rev2 (qmk#13248)
  [Keymap] niclake - Keymap updates - Boardwalk updates & DZ60 create (qmk#13245)
  ...
jakeprime pushed a commit to jakeprime/qmk_firmware that referenced this pull request Jul 10, 2021
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
wox pushed a commit to wox/qmk_firmware that referenced this pull request Aug 14, 2021
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants