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

BastardKB: Upstream charybdis/3x5 #23638

Closed
wants to merge 16 commits into from

Conversation

burkfers
Copy link
Contributor

@burkfers burkfers commented Apr 30, 2024

Description

This change aims to upstream several changes accumulated in the BastardKB fork.

The most extensive of these changes is dropping support for all controllers and shields other than v2/splinky_3, which has been flattened into the main keyboard. Older variants have not been sold in kits or prebuilts nor been recommended to self-source for a long time.

The dates GH shows on these commits is misleading as some rewriting of the history was necessary to separate commits by keyboard; The functional changes by @0xcharly have been shipping with kits and prebuilts for months and are well-tested. Changes up to and including 3799cd5 are live downstream.

Care has been taken to not lose changes introduced by #23622 and #23627.

Similar changes for all other BastardKB boards are ready, but not yet submitted to reduce the review burden, as they all follow a similar pattern.

Requesting comments.

The full set of related PRs is:

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 Apr 30, 2024
@drashna
Copy link
Member

drashna commented May 1, 2024

Also, just a heads up, you have a number of keyboard.json files removed. These replace info.json+rules.mk (eg, you only need the keyboard.json instead of those). So I/we would prefer if they were not removed, unless there is a specific reason for removing them.

@burkfers
Copy link
Contributor Author

burkfers commented May 1, 2024

They have been removed as all revisions of the keyboard have been removed entirely - They have been deprecated for a considerable timeframe; Only the main keyboard, in the state that was previously the revision v2/splinky_3 remains.
The top-level (3x5/-level) info.json was amended with the contents of the only revision that remains supported as the legacy-removal was performed downstream on a master-based state, then the DD conversion was performed, and info.json was renamed to keyboard.json to fit the develop state.

Please let me know if the final result is not to your specifications/expectations.

keyboards/bastardkb/charybdis/3x5/rules.mk Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x5/rules.mk Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team June 9, 2024 17:24
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 Jul 25, 2024
@drashna drashna added awaiting review and removed stale Issues or pull requests that have become inactive without resolution. labels Jul 26, 2024
@tzarc
Copy link
Member

tzarc commented Aug 26, 2024

As of August 26, 2024, qmk/qmk_firmware is no longer accepting VIA-enabled keymaps as these have now transitioned to a repository under the VIA team's control.

As you've submitted a PR containing via or VIA-enabled keymap(s), this is your notice that they should be removed from this PR. You should now submit a secondary PR to the VIA QMK Userspace repository with your associated via or VIA-enabled keymaps instead.

@burkfers
Copy link
Contributor Author

The BKB team has decided to stop upstreaming efforts at this time.

@burkfers burkfers closed this Aug 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting review 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