[develop] Fix builds broken by #12240 #13641
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
drashna
approved these changes
Jul 22, 2021
fauxpark
approved these changes
Jul 22, 2021
cadusk
pushed a commit
to cadusk/qmk_firmware
that referenced
this pull request
Jul 22, 2021
* qmk/develop: (141 commits) Implement GPIO abstraction for atsam (qmk#13567) [Keyboard][Bug] Add timer_avr to includes for broken builds (qmk#13641) [Keyboard] adds new revision: dztech/dz60rgb/v2_1 (qmk#13636) [Keyboard] Fixing info.json for h0oni/hotduck (qmk#13640) [Keyboard] Ymd40v2new layouts and fixed per-switch backlight (qmk#13622) [Bug] Develop - DC01 left (qmk#13597) [Keyboard] Fix clawsome/hatchback and reviung5 compile issues (qmk#13607) [Keyboard] add ogurec (qmk#13242) [Keyboard] Add Durgod Taurus K310 keyboard (qmk#12314) [Keyboard] Updated keyboard & keymaps (qmk#12667) [Keyboard] add SPRH keyboard (qmk#12999) Retain brightness with lighting layers (qmk#13025) [Keyboard] Add keypad Satxri6key (qmk#13423) [Keyboard] Initial Tron Guy Labs keyboard implementation. (qmk#13438) [Keyboard] Add Ristretto Keyboard (qmk#13479) [Keyboard] New Keyboard - OBE (qmk#13545) [Keyboard] Add personal planck keymap (qmk#13635) [Keymap] narze/xd004 (qmk#13634) [Keyboard] Add h0oni hotduck keyboard (qmk#13609) Fix API generation failure caused by GRS-70EC (qmk#13631) ...
|
I think this PR should be merged into the master branch. |
|
|
|
cf. #14072 |
|
My point was that it may just be worth waiting it out, since the merge date is in just over a week. |
|
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Checklist