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

[Keyboard] Relocalize and Update p1800fl #12425

Merged
merged 10 commits into from
Jul 3, 2021
Merged

Conversation

team0110
Copy link

Description

We are currently in Production Stage, so i could like to relocalize p1800fl to desired folder, also update VIA keymap

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

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Mar 30, 2021
@team0110 team0110 changed the title [Keyboard] Relocalize and Upate p1800fl [Keyboard] Relocalize and Update p1800fl Mar 30, 2021
keyboards/team0110/p1800fl/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/team0110/p1800fl/readme.md Outdated Show resolved Hide resolved
keyboards/team0110/p1800fl/rules.mk Outdated Show resolved Hide resolved
keyboards/team0110/p1800fl/rules.mk Outdated Show resolved Hide resolved
keyboards/team0110/p1800fl/rules.mk Outdated Show resolved Hide resolved
keyboards/team0110/p1800fl/rules.mk Outdated Show resolved Hide resolved
keyboards/team0110/p1800fl/rules.mk Outdated Show resolved Hide resolved
keyboards/team0110/p1800fl/rules.mk Outdated Show resolved Hide resolved
@team0110
Copy link
Author

Thank for your advise @fauxpark

@team0110 team0110 requested a review from fauxpark March 30, 2021 05:50
keyboards/team0110/p1800fl/rules.mk Outdated Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team March 30, 2021 06:03
@drashna
Copy link
Member

drashna commented Apr 3, 2021

Since this is moving the board's location, it should target the develop branch.

@marhalloweenvt
Copy link
Contributor

marhalloweenvt commented Apr 5, 2021

Since this is moving the board's location, it should target the develop branch.

Thank for your reply, @drashna .
Does it mean i need to commit it in Dev Bracnh? And how long will it take to be merged in master branch?

@drashna
Copy link
Member

drashna commented Apr 19, 2021

Since this is moving the board's location, it should target the develop branch.

Thank for your reply, @drashna .
Does it mean i need to commit it in Dev Bracnh? And how long will it take to be merged in master branch?

It would be targeted to and merged into develop, yes. And the timeline is:
https://docs.qmk.fm/#/breaking_changes?id=important-dates

So a month before it hit master.

@drashna drashna changed the base branch from master to develop April 19, 2021 06:30
@tzarc
Copy link
Member

tzarc commented Apr 25, 2021

Apparently there's now a conflict.

@marhalloweenvt
Copy link
Contributor

Apparently there's now a conflict.

How can I help you to resolve the conflict? From my side, I can't see any recommends.

@drashna
Copy link
Member

drashna commented May 14, 2021

Apparently there's now a conflict.

How can I help you to resolve the conflict? From my side, I can't see any recommends.

You'd need to rebase the branch, I think.

@stale
Copy link

stale bot commented Jun 28, 2021

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@stale stale bot removed the awaiting changes label Jul 3, 2021
@drashna drashna merged commit 7629b7f into qmk:develop Jul 3, 2021
@drashna
Copy link
Member

drashna commented Jul 3, 2021

Thanks!

And I fixed up the merge conflicts for you.
Mostly, it's just git merge upstream/develop and fix the conflicts. (that or git rebase upstream/develop)

@marhalloweenvt
Copy link
Contributor

Thanks!

And I fixed up the merge conflicts for you.
Mostly, it's just git merge upstream/develop and fix the conflicts. (that or git rebase upstream/develop)

Thanks for your kind support. If there is any issues, please let me know.

nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
Co-authored-by: Ryan <[email protected]>
Co-authored-by: marhalloweenvt <[email protected]>
Co-authored-by: Drashna Jael're <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants