Fix Planck and Preonic builds #5658
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
Concatenate rules that are set and then overridden into one setting.
Concatenate rules that are set and then overridden into one setting.
Deleted BOOTLOADER setting code block, as the checks were only valid for revs. 3-5 and the Planck Light. Neither Planck rev1 or rev2 set the bootloader via rules.mk, so there's no setting of BOOTLOADER in their rules.mk files.
- update Hardware Supported - update/add Install Examples - update Docs paragraph
noroadsleft
commented
Apr 20, 2019
| @@ -6,11 +6,16 @@ Preonic | |||
| A compact 50% (12x5) ortholinear keyboard kit made and sold by OLKB and Massdrop. [More info on qmk.fm](http://qmk.fm/preonic/) | |||
There was a problem hiding this comment.
@jackhumbert The qmk.fm link on this line is Error 404, btw.
zvecr
approved these changes
Apr 20, 2019
There was a problem hiding this comment.
It should be noted that with this change, and #3497, Travis will now build every keymap against every board revision when it detects changes that affect keyboard ( 1077 keymap make invocations.....). For make all which is triggered for core changes, will build the default keymap against every board revision.
Note: This PR took almost 40 minutes to build due to the above.
Maybe as an extension to this work, we could add CI functionality to skip old board revisions?
drashna
requested review from
jackhumbert,
drashna,
algernon,
ezuk,
fredizzimo,
mechmerlin,
skullydazed and
yanfali
yanfali
reviewed
Apr 20, 2019
yanfali
reviewed
Apr 20, 2019
Enabled Bootmagic Lite for: - Planck Light - Planck revs. 1-5 - Preonic revs. 1 and 2
|
Enabled Bootmagic Lite for:
The other board revisions all had full Bootmagic enabled already. @yanfali The existing codebase for Planck revs. 1 and 2 did not specify a bootloader. QMK seems to be handling it through the default configuration for atmega32u4 at compile time. Only some revisions had it specified. |
Community has landed on `ortho_4x12`, which is already set; `planck_grid` is redundant.
drashna
approved these changes
Apr 29, 2019
akrob
pushed a commit
to akrob/qmk_firmware
that referenced
this pull request
Apr 30, 2019
* upstream/master: (779 commits) [Keyboard] Signum3.0 remove sortedcontainers (qmk#5679) Simple extended space cadet (qmk#5277) Removed forced in lining for lib8tion functions (qmk#5670) Change lib8tion library to be usable in user keymaps (qmk#5598) [Keyboard] Fixing drag-and-drop (qmk#5728) [Keyboard] Adding ortho_4x12 & planck_mit layouts for KBD4X (qmk#5729) [Keyboard] Minor fixes for Baguette (qmk#5737) Updated rgb_led struct field modifier to flags (qmk#5619) RGB Matrix: Custom effects on a kb/user level (qmk#5338) Fix Planck and Preonic builds (qmk#5658) [Keymap] dz60 keymap w/ hhkb-esque default layer (qmk#5708) [Keymap] Added compatibility for Planck rev6 (qmk#5706) [Keyboard] Satisfaction75 i2c fix and VIA layout (qmk#5726) A better new_project.sh (qmk#5191) Fix sendstring "#" producing "£" instead (qmk#5724) [Keyboard] Added WT69-A PCB (qmk#5721) [Keymap] Fix typo and function layer image for Quefrency (qmk#5719) [Keymap] Initial keyboard layout for KBD67 (qmk#5720) [Keymap] New keymap for Quefrency 65% with split backspace, RGB, media keys, mouse keys (qmk#5717) [Keyboard] Update Gergo to use newer Ergodox Matrix code (qmk#5703) ...
foosinn
pushed a commit
to foosinn/qmk_firmware
that referenced
this pull request
May 6, 2019
* Planck: Copy contents of Planck rules.mk to each revision * Planck: Delete Planck rules.mk * Planck: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Preonic: Copy contents of Preonic rules.mk to each revision * Preonic: Delete Preonic rules.mk * Preonic: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Planck: Delete non-specific Bootloader settings from revs. 1 and 2 Deleted BOOTLOADER setting code block, as the checks were only valid for revs. 3-5 and the Planck Light. Neither Planck rev1 or rev2 set the bootloader via rules.mk, so there's no setting of BOOTLOADER in their rules.mk files. * Preonic: Fix BOOTLOADER settings code blocks * Preonic: delete extra blank lines from rules.mk files * Preonic: delete AVR-type hardware config blocks from rev3 * Update Planck and Preonic readme files - update Hardware Supported - update/add Install Examples - update Docs paragraph * Enable Bootmagic Lite where it is disabled Enabled Bootmagic Lite for: - Planck Light - Planck revs. 1-5 - Preonic revs. 1 and 2 * Remove `planck_grid` from LAYOUTS rule for all Planck revisions Community has landed on `ortho_4x12`, which is already set; `planck_grid` is redundant.
Timbus
pushed a commit
to Timbus/qmk_firmware
that referenced
this pull request
Jun 23, 2019
* Planck: Copy contents of Planck rules.mk to each revision * Planck: Delete Planck rules.mk * Planck: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Preonic: Copy contents of Preonic rules.mk to each revision * Preonic: Delete Preonic rules.mk * Preonic: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Planck: Delete non-specific Bootloader settings from revs. 1 and 2 Deleted BOOTLOADER setting code block, as the checks were only valid for revs. 3-5 and the Planck Light. Neither Planck rev1 or rev2 set the bootloader via rules.mk, so there's no setting of BOOTLOADER in their rules.mk files. * Preonic: Fix BOOTLOADER settings code blocks * Preonic: delete extra blank lines from rules.mk files * Preonic: delete AVR-type hardware config blocks from rev3 * Update Planck and Preonic readme files - update Hardware Supported - update/add Install Examples - update Docs paragraph * Enable Bootmagic Lite where it is disabled Enabled Bootmagic Lite for: - Planck Light - Planck revs. 1-5 - Preonic revs. 1 and 2 * Remove `planck_grid` from LAYOUTS rule for all Planck revisions Community has landed on `ortho_4x12`, which is already set; `planck_grid` is redundant.
ridingqwerty
pushed a commit
to ridingqwerty/qmk_firmware
that referenced
this pull request
Jan 10, 2020
* Planck: Copy contents of Planck rules.mk to each revision * Planck: Delete Planck rules.mk * Planck: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Preonic: Copy contents of Preonic rules.mk to each revision * Preonic: Delete Preonic rules.mk * Preonic: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Planck: Delete non-specific Bootloader settings from revs. 1 and 2 Deleted BOOTLOADER setting code block, as the checks were only valid for revs. 3-5 and the Planck Light. Neither Planck rev1 or rev2 set the bootloader via rules.mk, so there's no setting of BOOTLOADER in their rules.mk files. * Preonic: Fix BOOTLOADER settings code blocks * Preonic: delete extra blank lines from rules.mk files * Preonic: delete AVR-type hardware config blocks from rev3 * Update Planck and Preonic readme files - update Hardware Supported - update/add Install Examples - update Docs paragraph * Enable Bootmagic Lite where it is disabled Enabled Bootmagic Lite for: - Planck Light - Planck revs. 1-5 - Preonic revs. 1 and 2 * Remove `planck_grid` from LAYOUTS rule for all Planck revisions Community has landed on `ortho_4x12`, which is already set; `planck_grid` is redundant.
JeffreyPalmer
pushed a commit
to JeffreyPalmer/qmk_firmware
that referenced
this pull request
Feb 27, 2020
* Planck: Copy contents of Planck rules.mk to each revision * Planck: Delete Planck rules.mk * Planck: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Preonic: Copy contents of Preonic rules.mk to each revision * Preonic: Delete Preonic rules.mk * Preonic: Concatenate duplicate rules Concatenate rules that are set and then overridden into one setting. * Planck: Delete non-specific Bootloader settings from revs. 1 and 2 Deleted BOOTLOADER setting code block, as the checks were only valid for revs. 3-5 and the Planck Light. Neither Planck rev1 or rev2 set the bootloader via rules.mk, so there's no setting of BOOTLOADER in their rules.mk files. * Preonic: Fix BOOTLOADER settings code blocks * Preonic: delete extra blank lines from rules.mk files * Preonic: delete AVR-type hardware config blocks from rev3 * Update Planck and Preonic readme files - update Hardware Supported - update/add Install Examples - update Docs paragraph * Enable Bootmagic Lite where it is disabled Enabled Bootmagic Lite for: - Planck Light - Planck revs. 1-5 - Preonic revs. 1 and 2 * Remove `planck_grid` from LAYOUTS rule for all Planck revisions Community has landed on `ortho_4x12`, which is already set; `planck_grid` is redundant.
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 / Notes
The merge of #3497 broke compilation for Planck and Preonic because
make planckandmake preonicare no longer valid build targets.This PR takes the existing contents of each board's
rules.mkfile and merges it with therules.mkfile for each revision. Building keymaps for Planck or Preonic now requires that the user specify a revision.Also updated both readme files because they were outdated and a bit incomplete.
Thanks to @zvecr for reviewing this earlier.