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

Add rose75 keyboard #22968

Merged
merged 28 commits into from
Apr 1, 2024
Merged

Add rose75 keyboard #22968

merged 28 commits into from
Apr 1, 2024

Conversation

SmollChungus
Copy link
Contributor

Description

Addition of firmware for rose75 PCB

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 Jan 26, 2024
keyboards/rose75/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/rose75/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/rose75/info.json Outdated Show resolved Hide resolved
keyboards/rose75/config.h Outdated Show resolved Hide resolved
keyboards/rose75/info.json Outdated Show resolved Hide resolved
keyboards/rose75/info.json Outdated Show resolved Hide resolved
keyboards/rose75/readme.md Show resolved Hide resolved
@SmollChungus SmollChungus requested a review from zvecr January 27, 2024 19:23
keyboards/rose75/config.h Outdated Show resolved Hide resolved
keyboards/rose75/config.h Outdated Show resolved Hide resolved
keyboards/rose75/config.h Outdated Show resolved Hide resolved
keyboards/rose75/readme.md Show resolved Hide resolved
keyboards/rose75/rose75.c Outdated Show resolved Hide resolved
@SmollChungus
Copy link
Contributor Author

thanks for checking! removed the config.h from the pr.

@SmollChungus SmollChungus requested a review from waffle87 January 29, 2024 06:53
@SmollChungus
Copy link
Contributor Author

Just noticed I mistakenly targeted QMK:master branch instead of develop, and I can't see a way to change it inside this PR. I will close this PR and target the correct branch in the new PR. Apologies (:

@sigprof
Copy link
Contributor

sigprof commented Jan 30, 2024

Just noticed I mistakenly targeted QMK:master branch instead of develop

Does the code for this keyboard actually depend on some core code that is only in the develop branch?

Adding new keyboards on the master branch is fine. The cases when you need to target the develop branch are:

  • Renaming or moving some previously existing keyboards (this includes the case when you are introducing a rev2 for some board, and need to move the previously existing code into the rev1 subfolder).
  • Doing substantial changes to some existing keyboard even without renaming it (but small bugfixes like fixing some wrong pin or matrix location for some key may be fine to do on the master branch directly).
  • Changing core code (adding new features or modifying existing ones); there might be exceptions for small and obvious bugfixes.
  • Adding a new keyboard which uses some new core feature that is currently available only in the develop branch.

There is some chance that your code fits into the last bullet point, but I don't see anything obvious; if the keyboard code actually works fine in the master branch, you may just target master.

and I can't see a way to change it inside this PR

The GitHub UI for changing the target branch of a PR is not obvious. First, you need to click the Edit button near the top of the page:
image
Then, if the PR is open, the text that shows the target branch changes into a dropdown (here I show an example from another PR which is still open):
image

But if you actually don't need to use the develop branch, you may just reopen this PR again (if you have difficulties with doing that, write a comment here).

@SmollChungus SmollChungus reopened this Jan 30, 2024
Copy link

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 bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Mar 17, 2024
keyboards/rose75/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/rose75/keymaps/via/keymap.c Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Mar 29, 2024
@drashna drashna requested a review from a team March 30, 2024 01:05
keyboards/rose75/readme.md Outdated Show resolved Hide resolved
@waffle87 waffle87 merged commit 73e3053 into qmk:master Apr 1, 2024
3 checks passed
mzyt pushed a commit to mzyt/qmk_firmware that referenced this pull request May 6, 2024
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
girtsf pushed a commit to girtsf/qmk_firmware that referenced this pull request Jun 5, 2024
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
whoisjordangarcia pushed a commit to whoisjordangarcia/qmk_firmware that referenced this pull request Jun 8, 2024
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[email protected]>
nuess0r pushed a commit to nuess0r/qmk_firmware that referenced this pull request Sep 8, 2024
Co-authored-by: Joel Challis <[email protected]>
Co-authored-by: jack <[email protected]>
Co-authored-by: Drashna Jaelre <[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.

6 participants