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

Moved s7_elephant and bear65 into 1 folder #10528

Merged
merged 1 commit into from Dec 24, 2020

Conversation

MudkipMao
Copy link
Contributor

@MudkipMao MudkipMao commented Oct 3, 2020

Jacky, the designer of S7 Elephant and Bear 65 will have his own folder now, in the event that he runs more products in the future (which is likely).

Description

The 2 boards are now moved into the folder jacky_studio/
I have checked with Jacky, and he is ok with this naming convention

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

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 breaking_change Changes that need to wait for a version increment keyboard labels Oct 4, 2020
@zvecr zvecr changed the base branch from master to develop October 4, 2020 00:09
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

Keyboard moves are currently considered a "breaking change" and will need to target develop. Also build commands within readmes should be updated.

@MudkipMao
Copy link
Contributor Author

MudkipMao commented Oct 6, 2020

Holy moly, I did it right this time! I rebased my branch against develop

@MudkipMao MudkipMao requested a review from zvecr October 6, 2020 22:30
@drashna
Copy link
Member

drashna commented Oct 7, 2020

Holy moly, I did it right this time! I rebased my branch against develop

Glad to hear it! And yeah, the first few times can be .... "fun". After a while, you really git it down. :)

Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

Could you add a GPL2+ compatible license header to all of the c and h files? Including the keymap.c files?

For instance:

/* Copyright %YEAR% %YOUR_NAME%
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

@drashna drashna requested a review from a team October 8, 2020 00:00
keyboards/jacky_studio/s7_elephant/rev1/config.h Outdated Show resolved Hide resolved
keyboards/jacky_studio/s7_elephant/rev1/info.json Outdated Show resolved Hide resolved
keyboards/jacky_studio/s7_elephant/rev1/info.json Outdated Show resolved Hide resolved
keyboards/jacky_studio/s7_elephant/rev2/config.h Outdated Show resolved Hide resolved
keyboards/jacky_studio/s7_elephant/rev2/rules.mk Outdated Show resolved Hide resolved
keyboards/jacky_studio/s7_elephant/rev2/rules.mk Outdated Show resolved Hide resolved
keyboards/jacky_studio/s7_elephant/rev2/info.json Outdated Show resolved Hide resolved
keyboards/jacky_studio/s7_elephant/rev2/info.json Outdated Show resolved Hide resolved
@MudkipMao
Copy link
Contributor Author

What's the current status of this? I had it ready to merge before, but now it's been closed and reopened. If I fix the conflicts, would this be ready to merge again?

@tzarc
Copy link
Member

tzarc commented Nov 28, 2020

We were in the process of merging the develop beach, which was accidentally deleted. We're in the process of reopening all closed PRs -- yours was one of about 80 accidentally closed.

@fauxpark
Copy link
Member

@MudkipMao yes, please rebase this PR, then it should be ready to merge next cycle.

@MudkipMao
Copy link
Contributor Author

I had to do a --force-with-lease to rebase into develop, but it should be ready to go now

@drashna drashna merged commit 73dfc2b into qmk:develop Dec 24, 2020
@beelzebubi beelzebubi mentioned this pull request Jan 24, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking_change Changes that need to wait for a version increment 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.

None yet

6 participants