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

Ignore defaults.hjson values if already set #19511

Merged
merged 2 commits into from
Jan 7, 2023

Conversation

zvecr
Copy link
Member

@zvecr zvecr commented Jan 5, 2023

Description

{
    "development_board": "blackpill_f401",
    "bootloader": "tinyuf2"
}

Previously, this would have resulted in bootloader being overwritten to stm-dfu.

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

@zvecr zvecr added the bug label Jan 5, 2023
@zvecr zvecr requested a review from a team January 5, 2023 23:49
@github-actions github-actions bot added cli qmk cli command keyboard python labels Jan 5, 2023
Copy link
Contributor

@sigprof sigprof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually fixes another instance of the problem noted in #19195 (comment) (another part of that problem was a wrong "pin_compatible": "promicro" setting in the definition of "development_board": "elite_c", but without this fix the "pin_compatible": "elite_c" override in info.json did not work, therefore a rules.mk override needed to be added).

With both #19511 and #19512 in the argo_works/ishi/80/mk0_avr_extra code compiles with CONVERT_TO=elite_pi even when both PIN_COMPATIBLE = elite_c and "pin_compatible": "elite_c" are removed (just "development_board": "elite_c" is enough).

@zvecr zvecr merged commit 974a1ea into qmk:develop Jan 7, 2023
omikronik pushed a commit to omikronik/qmk_firmware that referenced this pull request Jan 22, 2023
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
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.

3 participants