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

Update French and German macOS keymaps and add sendstring LUTs #8700

Merged
merged 1 commit into from
Apr 18, 2020

Conversation

fauxpark
Copy link
Member

@fauxpark fauxpark commented Apr 6, 2020

Description

🇫🇷/🇩🇪

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

@fauxpark fauxpark requested a review from a team April 6, 2020 03:42
@drashna drashna requested a review from a team April 12, 2020 17:58
@fauxpark fauxpark merged commit f43cb31 into qmk:master Apr 18, 2020
@fauxpark fauxpark deleted the keymap-extras-french-german-mac branch April 18, 2020 20:57
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
violet-fish pushed a commit to violet-fish/qmk_firmware that referenced this pull request May 3, 2020
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request May 24, 2020
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
@JonasGessner
Copy link

Hi @fauxpark , I'm having some issues with these changes. I have a keymap with one layer for macOS and one layer for windows (both german), and I used the DE_OSX_xxx and DE_xxx macros respectively. With these changes all the DE_xxx macros, originally only defined in keymap_german.h, are also defined in keymap_german_osx.h leading to conflicts between the macro definitions and compilation errors when importing both files.

Is there any specific reason for these changes? I currently do not see an elegant solution to this problem I am having except reverting these changes in my fork.

Thanks

fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 12, 2020
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
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