qmk_firmware icon indicating copy to clipboard operation
qmk_firmware copied to clipboard

BastardKB: Upstream charybdis/3x5

Open burkfers opened this issue 9 months ago • 2 comments

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 https://github.com/qmk/qmk_firmware/commit/3799cd57c363939b583e0a22e2548113b0d559ac 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.

Types of Changes

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

Issues Fixed or Closed by This PR

Checklist

  • [X] My code follows the code style of this project: C, Python
  • [X] 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.
  • [X] I have read the CONTRIBUTING document.
  • [ ] I have added tests to cover my changes.
  • [X] I have tested the changes and verified that they work and don't break anything (as well as I can manage).

burkfers avatar Apr 30 '24 11:04 burkfers

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.

drashna avatar May 01 '24 06:05 drashna

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.

burkfers avatar May 01 '24 07:05 burkfers

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[bot] avatar Jul 25 '24 01:07 github-actions[bot]

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.

tzarc avatar Aug 26 '24 10:08 tzarc

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

burkfers avatar Aug 26 '24 13:08 burkfers