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.

Sign up for GitHub

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

Jump to bottom

Cleanup rules.mk for 32U4 keyboards, H #7030

Merged
merged 3 commits into from
Oct 20, 2019
Merged

Cleanup rules.mk for 32U4 keyboards, H #7030

merged 3 commits into from
Oct 20, 2019

Conversation

fauxpark
Copy link
Member

@fauxpark fauxpark commented Oct 14, 2019 •
edited
Loading

Description

H, and handwired boards.
The filesets should be a bit smaller from this point on.

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 October 14, 2019 03:25
zvecr
zvecr requested changes Oct 14, 2019
View reviewed changes
keyboards/handwired/magicforce68/rules.mk Outdated Show resolved Hide resolved
keyboards/handwired/gamenum/rules.mk Outdated Show resolved Hide resolved
@mtei
Copy link
Contributor

mtei commented Oct 14, 2019 •
edited
Loading

@fauxpark: Can you not change rules.mk under keyboards/helix ? Because the same change is already planned in #6952. So this PR will conflict.

@fauxpark
Copy link
Member Author

There are some changes here that that PR doesn't do (removing F_CPU, ARCH etc). This is what merge conflict resolution is for ;)

@mtei
Copy link
Contributor

mtei commented Oct 14, 2019

In #6952, if I remove the following, will it be solved?

F_CPU = 16000000

ARCH = AVR8

F_USB = $(F_CPU)

# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT

@fauxpark
Copy link
Member Author

Yep. I made the suggestion on the PR.

@drashna
Copy link
Member

drashna commented Oct 16, 2019

Has some conflicts now.

@fauxpark
Copy link
Member Author

Fixed

@drashna drashna merged commit 3dbf08b into qmk:master Oct 20, 2019
@fauxpark fauxpark deleted the 32u4-rules-cleanup-h branch October 20, 2019 21:46
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
@fauxpark
Cleanup rules.mk for 32U4 keyboards, H (qmk#7030)
1e3477f 
* Cleanup rules.mk for 32U4 keyboards, H

* Change some boards incorrectly assumed to be halfkay
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@fauxpark @HokieGeek
Cleanup rules.mk for 32U4 keyboards, H (qmk#7030)
780ee34 
* Cleanup rules.mk for 32U4 keyboards, H

* Change some boards incorrectly assumed to be halfkay
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
enhancement keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fauxpark @mtei @drashna @zvecr