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

Use layer number as example for COMBO_ONLY_FROM_LAYER #18072

Merged
merged 2 commits into from
Aug 17, 2022

Conversation

filterpaper
Copy link
Contributor

Description

Names may not be recognised when COMBO_ONLY_FROM_LAYER is defined with layer macros in config.h. This changes the example to actual layer numbers.

Types of Changes

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

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).

@drashna drashna requested a review from a team August 16, 2022 17:54
docs/feature_combo.md Outdated Show resolved Hide resolved
Co-authored-by: Ryan <fauxpark@gmail.com>
@drashna drashna merged commit a1f0208 into qmk:master Aug 17, 2022
@filterpaper filterpaper deleted the combo-from-layer-number branch August 17, 2022 02:37
imhoffman pushed a commit to imhoffman/qmk_firmware that referenced this pull request Aug 20, 2022
SjB added a commit to SjB/qmk_firmware that referenced this pull request Aug 27, 2022
* upstream/master: (595 commits)
  [Keyboard] Add ibis80 (qmk#18051)
  [Keymap] toshi0383 keymaps update (qmk#18073)
  [Docs] Use layer number as example for COMBO_ONLY_FROM_LAYER (qmk#18072)
  [Keymap] jotix's community/ortho4x12 change (qmk#18069)
  Adjust the hierarchy of chapter `Deferred Execution` (qmk#18075)
  Fix WS2812 order for aurora65 and loki65 (qmk#18074)
  [Docs] update pr_checklist.md with info about data-driven (qmk#18068)
  Use correct board file in xelus/valor_frl_tkl/rev2_0 (qmk#18071)
  Migrate more F4x1 board files (qmk#18054)
  ADB to USB converter: split into rev1 and rev2 (qmk#18052)
  Move keyboard USB IDs and strings to data driven, pass 2: D-E (qmk#17956)
  Move keyboard USB IDs and strings to data driven, pass 2: F-I (qmk#17958)
  Allow disabling RGB_MATRIX_ANIMATIONS system76 keyboards (qmk#17478)
  Migrate more F4x1 board files (qmk#18046)
  Feat/port ft mars 65 (qmk#17994)
  Improve Drop Alt compatibility with VIA (qmk#18041)
  [Keyboard] Add Valor FRL TKL rev2.0 and 2.1 (qmk#17992)
  Move keyboard USB IDs and strings to data driven, pass 2: B-C (qmk#17945)
  [Keyboard] add bajjak keyboard (qmk#12377)
  Add texts for Discord Events to be created post-merge. (qmk#17944)
  ...
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants