Skip to content

[develop] Fix builds broken by #12240 #13641

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

Merged
merged 1 commit into from
Jul 22, 2021
Merged

Conversation

daskygit
Copy link
Member

Description

Add avr/timer_avr.h as an include to the matrix.c files. This is a quick fix and I guess they all could do with reworking properly.

I've added the include above "hhkb_avr.h" as it's required in that header.

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 July 22, 2021 16:34
@drashna drashna merged commit f335327 into qmk:develop Jul 22, 2021
@daskygit daskygit deleted the fix/timer_avr branch August 2, 2021 22:51
@shelaf
Copy link
Contributor

shelaf commented Aug 19, 2021

I think this PR should be merged into the master branch.
If not apply the same patch to the master branch, the corresponding keyboard will fail to build currently.

@fauxpark
Copy link
Member

develop will be merged into master at the end of the month anyway: https://docs.qmk.fm/#/breaking_changes?id=when-is-the-next-breaking-change

@shelaf
Copy link
Contributor

shelaf commented Aug 19, 2021

I understand everything...
I found out that the same fix as #12240 was made in #13675, so I will open another PR that does the same patch.

@shelaf
Copy link
Contributor

shelaf commented Aug 19, 2021

cf. #14072

@fauxpark
Copy link
Member

My point was that it may just be worth waiting it out, since the merge date is in just over a week.

@shelaf
Copy link
Contributor

shelaf commented Aug 19, 2021

Oh sure. I will wait for the merge.

nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
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.

4 participants