Skip to content

Add mechlovin9 rev2 PCB #12767

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
Merged
merged 4 commits into from
Aug 17, 2021
Merged

Add mechlovin9 rev2 PCB #12767

merged 4 commits into from
Aug 17, 2021

Conversation

mechlovin
Copy link
Contributor

@mechlovin mechlovin commented May 1, 2021 •
edited
Loading

Description

Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2

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 May 1, 2021
@mechlovin
Copy link
Contributor Author

bump

drashna
drashna approved these changes May 22, 2021
View reviewed changes
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.

Should target develop, I think.

Otherwise, looks fine.

@mechlovin
Copy link
Contributor Author

Should target develop

How do I do it?
Im noob with it, sorry.

@drashna
Copy link
Member

drashna commented Jun 7, 2021

If you edit the title, right below it, it well let you choose a branch to target. Select develop and save it.

You may need to rebase after doing so, but probably not, in this case.

@mechlovin mechlovin changed the base branch from master to develop June 10, 2021 13:58
@mechlovin
Copy link
Contributor Author

Got it, Thank you :D

@drashna
Copy link
Member

drashna commented Jun 16, 2021

This does have a merge conflict now.

@mechlovin mechlovin force-pushed the dev_mechlovin9-rev2 branch from d3a378b to 3df67ed Compare June 16, 2021 05:43
@mechlovin
Copy link
Contributor Author

mechlovin commented Jul 2, 2021 •
edited
Loading

The conflict has been resolved.

@mechlovin mechlovin requested a review from drashna July 2, 2021 03:36
@drashna
Copy link
Member

drashna commented Jul 3, 2021

Looks like this needs a rebase, maybe. It has some additional changes/commits that it shouldn't.

mechlovin added 4 commits July 23, 2021 22:21
@mechlovin
Add mechlovin9 rev2 PCB
d7da906 
Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2
@mechlovin
update
1a8ac29
@mechlovin
change bootloader and bootmagic button
f6d1fd1
@mechlovin
Add mechlovin9 rev2 PCB
85dc67d 
Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2
@mechlovin mechlovin force-pushed the dev_mechlovin9-rev2 branch from 7f87ca5 to 85dc67d Compare July 23, 2021 15:23
@mechlovin
Copy link
Contributor Author

Hi @drashna.
Is there anything else I should do?
Thank you.

@drashna drashna requested a review from a team August 13, 2021 19:43
@tzarc tzarc merged commit 7794e97 into qmk:develop Aug 17, 2021
@mechlovin
Copy link
Contributor Author

Hi @drashna

I should have targeted this to Master. Should I follow this instruction here: https://stackoverflow.com/questions/7161860/how-to-move-the-current-working-branch-to-master-branch-in-git?fbclid=IwAR1eVpktkOBiVj8x3ydwR10WVvjrECheZJkkILdiOzd8QOPukaR1vdp3CvA

Really sorry for the back and forth.

nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
@mechlovin @nhongooi
Add mechlovin9 rev2 PCB (qmk#12767)
c1ec3b5 
* Add mechlovin9 rev2 PCB

Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2

* update

* change bootloader and  bootmagic button

* Add mechlovin9 rev2 PCB

Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@tzarc tzarc tzarc approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mechlovin @drashna @tzarc